From 0de44da9b1e94522f29109165a4fbaeac17ca07f Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Wed, 9 Oct 2019 13:27:31 -0700 Subject: [PATCH 1/8] Copy changes from CDN version 2019-04-15 into 2019-06-15-preview. --- .../preview/2019-06-15-preview/cdn.json | 239 +++++++++++++++++- 1 file changed, 238 insertions(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json index 3080deedf48a..96ad656dae31 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json @@ -2301,6 +2301,8 @@ "UrlPath", "UrlFileExtension", "UrlFileName", + "HttpVersion", + "Cookies", "IsDevice" ], "x-ms-enum": { @@ -2508,6 +2510,42 @@ } } }, + "DeliveryRuleHttpVersionCondition": { + "description": "Defines the HttpVersion condition for the delivery rule.", + "x-ms-discriminator-value": "HttpVersion", + "allOf": [ + { + "$ref": "#/definitions/DeliveryRuleCondition" + } + ], + "required": [ + "parameters" + ], + "properties": { + "parameters": { + "description": "Defines the parameters for the condition.", + "$ref": "#/definitions/HttpVersionMatchConditionParameters" + } + } + }, + "DeliveryRuleCookiesCondition": { + "description": "Defines the Cookies condition for the delivery rule.", + "x-ms-discriminator-value": "Cookies", + "allOf": [ + { + "$ref": "#/definitions/DeliveryRuleCondition" + } + ], + "required": [ + "parameters" + ], + "properties": { + "parameters": { + "description": "Defines the parameters for the condition.", + "$ref": "#/definitions/CookiesMatchConditionParameters" + } + } + }, "DeliveryRuleIsDeviceCondition": { "description": "Defines the IsDevice condition for the delivery rule.", "x-ms-discriminator-value": "IsDevice", @@ -3093,6 +3131,102 @@ } } }, + "HttpVersionMatchConditionParameters": { + "description": "Defines the parameters for HttpVersion match conditions", + "required": [ + "operator", + "matchValues", + "@odata.type" + ], + "properties": { + "@odata.type": { + "type": "string", + "enum": [ + "#Microsoft.Azure.Cdn.Models.DeliveryRuleHttpVersionConditionParameters" + ] + }, + "operator": { + "description": "Describes operator to be matched", + "type": "string", + "enum": [ + "Equal" + ], + "x-ms-enum": { + "name": "HttpVersionOperator", + "modelAsString": true + } + }, + "negateCondition": { + "description": "Describes if this is negate condition or not", + "type": "boolean" + }, + "matchValues": { + "description": "The match value for the condition of the delivery rule", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "CookiesMatchConditionParameters": { + "description": "Defines the parameters for Cookies match conditions", + "required": [ + "operator", + "matchValues", + "selector", + "@odata.type" + ], + "properties": { + "@odata.type": { + "type": "string", + "enum": [ + "#Microsoft.Azure.Cdn.Models.DeliveryRuleCookiesConditionParameters" + ] + }, + "selector": { + "description": "Name of Cookies to be matched", + "type": "string" + }, + "operator": { + "description": "Describes operator to be matched", + "type": "string", + "enum": [ + "Any", + "Equal", + "Contains", + "BeginsWith", + "EndsWith", + "LessThan", + "LessThanOrEqual", + "GreaterThan", + "GreaterThanOrEqual" + ], + "x-ms-enum": { + "name": "CookiesOperator", + "modelAsString": true + } + }, + "negateCondition": { + "description": "Describes if this is negate condition or not", + "type": "boolean" + }, + "matchValues": { + "description": "The match value for the condition of the delivery rule", + "type": "array", + "items": { + "type": "string" + } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } + } + } + }, "IsDeviceMatchConditionParameters": { "description": "Defines the parameters for IsDevice match conditions", "required": [ @@ -3156,7 +3290,8 @@ "CacheExpiration", "ModifyRequestHeader", "ModifyResponseHeader", - "UrlRedirect" + "UrlRedirect", + "UrlRewrite" ], "x-ms-enum": { "name": "DeliveryRuleAction", @@ -3241,6 +3376,52 @@ } } }, + "UrlRewriteAction": { + "description": "Defines the url rewrite action for the delivery rule.", + "x-ms-discriminator-value": "UrlRewrite", + "allOf": [ + { + "$ref": "#/definitions/DeliveryRuleAction" + } + ], + "required": [ + "parameters" + ], + "properties": { + "parameters": { + "description": "Defines the parameters for the action.", + "$ref": "#/definitions/UrlRewriteActionParameters" + } + } + }, + "UrlRewriteActionParameters": { + "description": "Defines the parameters for the url rewrite action.", + "required": [ + "sourcePattern", + "destination", + "@odata.type" + ], + "properties": { + "@odata.type": { + "type": "string", + "enum": [ + "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlRewriteActionParameters" + ] + }, + "sourcePattern": { + "description": "define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched.", + "type": "string" + }, + "destination": { + "description": "Define the relative URL to which the above requests will be rewritten by.", + "type": "string" + }, + "preserveUnmatchedPath": { + "description": "Whether to preserve unmatched path. Default value is true.", + "type": "boolean" + } + } + }, "DeliveryRuleRequestHeaderAction": { "description": "Defines the request header action for the delivery rule.", "x-ms-discriminator-value": "ModifyRequestHeader", @@ -3377,6 +3558,58 @@ } } }, + "DeliveryRuleCacheKeyQueryStringAction": { + "description": "Defines the cache-key query string action for the delivery rule.", + "x-ms-discriminator-value": "CacheKeyQueryString", + "allOf": [ + { + "$ref": "#/definitions/DeliveryRuleAction" + } + ], + "required": [ + "parameters" + ], + "properties": { + "parameters": { + "description": "Defines the parameters for the action.", + "$ref": "#/definitions/CacheKeyQueryStringActionParameters" + } + } + }, + "CacheKeyQueryStringActionParameters": { + "description": "Defines the parameters for the cache-key query string action.", + "required": [ + "queryStringBehavior", + "@odata.type" + ], + "properties": { + "@odata.type": { + "type": "string", + "enum": [ + "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheKeyQueryStringBehaviorActionParameters" + ] + }, + "queryStringBehavior": { + "description": "Caching behavior for the requests", + "type": "string", + "enum": [ + "Include", + "IncludeAll", + "Exclude", + "ExcludeAll" + ], + "x-ms-enum": { + "name": "queryStringBehavior", + "modelAsString": true + } + }, + "queryParameters": { + "description": "query parameters to include or exclude (comma separated).", + "type": "string", + "x-nullable": true + } + } + }, "transform": { "description": "Describes what transforms are applied before matching", "type": "string", @@ -3694,6 +3927,10 @@ "modelAsString": true } }, + "customHttpsParameters": { + "description": "Certificate parameters for securing custom HTTPS", + "$ref": "#/definitions/CustomDomainHttpsParameters" + }, "validationData": { "description": "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.", "type": "string" From b54f02f7c1530e952b823d57136145f4b35b12ac Mon Sep 17 00:00:00 2001 From: sushantsingh Date: Thu, 13 Jun 2019 20:06:34 -0700 Subject: [PATCH 2/8] Update ActionType Removed some unused fields from ActionType --- .../cdnwebapplicationfirewall.json | 60 ++++++------------- 1 file changed, 17 insertions(+), 43 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json index 3cc5fc232038..ace851f70304 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json @@ -844,52 +844,26 @@ }, "ActionType": { "description": "Defines the action to take on rule match.", - "required": [ - "actionType" + "type": "string", + "enum": [ + "Allow", + "Block", + "Log", + "Redirect" ], - "properties": { - "actionType": { - "description": "Describes type of action.", - "type": "string", - "enum": [ - "Allow", - "Block", - "Log", - "Redirect" - ], - "x-ms-enum": { - "name": "action", - "modelAsString": true - } - }, - "redirectUrl": { - "description": "If action type is redirect, this field represents URL to be re-directed.", - "type": "string" - }, - "customBlockResponseStatusCode": { - "description": "If the action type is block, customer can override the response status code.", - "type": "integer", - "maximum": 599, - "exclusiveMaximum": false, - "minimum": 200, - "exclusiveMinimum": false - }, - "customBlockResponseBody": { - "description": "If the action type is block, customer can override the response body. The body must be specified in base64 encoding.", - "type": "string", - "pattern": "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$" - } + "x-ms-enum": { + "name": "ActionType", + "modelAsString": true } - } - }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Azure Subscription ID.", - "required": true, - "type": "string" }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Azure Subscription ID.", + "required": true, + "type": "string" + }, "ApiVersionParameter": { "name": "api-version", "in": "query", From 42c23d88405f5b77b7430194be09d00494591922 Mon Sep 17 00:00:00 2001 From: sushantsingh Date: Mon, 24 Jun 2019 18:05:24 -0700 Subject: [PATCH 3/8] Add range for priority --- .../2019-06-15-preview/cdnwebapplicationfirewall.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json index ace851f70304..fb5ad9d51cf8 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json @@ -526,7 +526,11 @@ }, "priority": { "description": "Defines in what order this rule be evaluated in the overall list of custom rules", - "type": "integer" + "type": "integer", + "maximum": 1000, + "exclusiveMaximum": false, + "minimum": 0, + "exclusiveMinimum": false }, "matchConditions": { "description": "List of match conditions.", From 5349f52f9bc0a9caae3e9ba2defc163c22a3d8e8 Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Mon, 4 Nov 2019 11:40:34 -0800 Subject: [PATCH 4/8] Fix cdnwebapplicationfirewall.json syntax. --- .../cdnwebapplicationfirewall.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json index fb5ad9d51cf8..e3af87dc0c4c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json @@ -859,15 +859,16 @@ "name": "ActionType", "modelAsString": true } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Azure Subscription ID.", + "required": true, + "type": "string" }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Azure Subscription ID.", - "required": true, - "type": "string" - }, "ApiVersionParameter": { "name": "api-version", "in": "query", From 29260c8ef9eca1b101cb9de20fda9c576637dbfb Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Thu, 7 Nov 2019 13:29:30 -0800 Subject: [PATCH 5/8] Add transforms to CDN WAF MatchConditions --- .../cdnwebapplicationfirewall.json | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json index e3af87dc0c4c..35e012f2be8e 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json @@ -649,9 +649,32 @@ "items": { "type": "string" } + }, + "transforms": { + "description": "List of transforms.", + "type": "array", + "items": { + "$ref": "#/definitions/TransformType" + } } } }, + "TransformType": { + "description": "Describes what transforms were applied before matching.", + "type": "string", + "enum": [ + "Lowercase", + "Uppercase", + "Trim", + "UrlDecode", + "UrlEncode", + "RemoveNulls" + ], + "x-ms-enum": { + "name": "TransformType", + "modelAsString": true + } + }, "ManagedRuleSetList": { "description": "Defines the list of managed rule sets for the policy.", "properties": { From 05393216e4ed62e704d2a1dae890a3f9f1645ed5 Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Wed, 20 Nov 2019 17:05:36 -0800 Subject: [PATCH 6/8] Sync latest changes from CDN 2019-04-15 to 2019-06-15-preview --- .../preview/2019-06-15-preview/cdn.json | 24 +++++++++++++++---- .../cdnwebapplicationfirewall.json | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json index 96ad656dae31..0296a87d5be4 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json @@ -2250,7 +2250,6 @@ "description": "A rule that specifies a set of actions and conditions", "type": "object", "required": [ - "name", "order", "actions" ], @@ -3288,6 +3287,7 @@ "type": "string", "enum": [ "CacheExpiration", + "CacheKeyQueryString", "ModifyRequestHeader", "ModifyResponseHeader", "UrlRedirect", @@ -3409,15 +3409,15 @@ ] }, "sourcePattern": { - "description": "define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched.", + "description": "define a request URI pattern that identifies the type of requests that may be rewritten. Currently, source pattern uses a prefix-based match. To match all URL paths, use \"/\" as the source pattern value. To match only the root directory and re-write this path, use the origin path field", "type": "string" }, "destination": { - "description": "Define the relative URL to which the above requests will be rewritten by.", + "description": "Define the destination path for be used in the rewrite. This will overwrite the source pattern ", "type": "string" }, "preserveUnmatchedPath": { - "description": "Whether to preserve unmatched path. Default value is true.", + "description": "If True, the remaining path after the source pattern will be appended to the new destination path. ", "type": "boolean" } } @@ -3995,6 +3995,19 @@ "name": "ProtocolType", "modelAsString": true } + }, + "minimumTlsVersion": { + "description": "TLS protocol version that will be used for Https", + "enum": [ + "None", + "TLS10", + "TLS12" + ], + "type": "string", + "x-ms-enum": { + "name": "minimumTlsVersion", + "modelAsString": false + } } } }, @@ -4518,7 +4531,8 @@ "Custom_Verizon", "Standard_Akamai", "Standard_ChinaCdn", - "Standard_Microsoft" + "Standard_Microsoft", + "Premium_ChinaCdn" ], "type": "string", "x-ms-enum": { diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json index 35e012f2be8e..a00cb37d490d 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json @@ -388,7 +388,7 @@ "description": "Describes managed rules inside the policy.", "$ref": "#/definitions/ManagedRuleSetList" }, - "cdnEndpointLinks": { + "endpointLinks": { "description": "Describes Azure CDN endpoints associated with this Web Application Firewall policy.", "type": "array", "readOnly": true, @@ -530,7 +530,7 @@ "maximum": 1000, "exclusiveMaximum": false, "minimum": 0, - "exclusiveMinimum": false + "exclusiveMinimum": false }, "matchConditions": { "description": "List of match conditions.", From f3a418f2706bb4f17cca2c8597ebaf68eb6d7917 Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Fri, 22 Nov 2019 11:10:25 -0800 Subject: [PATCH 7/8] Fix CDN WAF examples for updated API version 2019-06-15-preview. --- .../2019-06-15-preview/examples/WafListPolicies.json | 4 ++-- .../preview/2019-06-15-preview/examples/WafPatchPolicy.json | 4 ++-- .../examples/WafPolicyCreateOrUpdate.json | 6 +++--- .../preview/2019-06-15-preview/examples/WafPolicyGet.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json index 2ea63522500c..2ebd67705276 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json @@ -108,7 +108,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint1" }, @@ -218,7 +218,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint3" } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json index cc8a4d747642..04fd95e56acf 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json @@ -111,7 +111,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint1" }, @@ -223,7 +223,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint1" }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json index 76cce169ba38..b1fb1e910db1 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json @@ -198,7 +198,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint1" }, @@ -310,7 +310,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint1" }, @@ -422,7 +422,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint1" }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json index dcce780502a9..f08ef15833c0 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json @@ -107,7 +107,7 @@ } ] }, - "cdnEndpointLinks": [ + "endpointLinks": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cdn/profiles/profile1/endpoints/testEndpoint1" }, From c8c18448b661eade6901a130cc13b430ef98deab Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Tue, 26 Nov 2019 10:14:20 -0800 Subject: [PATCH 8/8] Add transforms examples for CDN API version 2019-06-15-preview. Merge updates to CDN examples from API version 2019-04-15 to 2019-06-15-preview. --- ...tomDomains_EnableCustomHttpsUsingBYOC.json | 4 +- ...CustomHttpsUsingCDNManagedCertificate.json | 4 +- .../examples/WafListPolicies.json | 33 +++++++++ .../examples/WafPatchPolicy.json | 34 ++++++++++ .../examples/WafPolicyCreateOrUpdate.json | 68 +++++++++++++++++++ .../examples/WafPolicyGet.json | 17 +++++ 6 files changed, 156 insertions(+), 4 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json index 7ebebadbf6cd..9949c2eb025f 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json @@ -6,11 +6,11 @@ "profileName": "profile1", "endpointName": "endpoint1", "customDomainName": "www-someDomain-net", - "customDomainHttpsParameters": { + "customHttpsParameters": { "certificateSource": "AzureKeyVault", "protocolType": "ServerNameIndication", "certificateSourceParameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.KeyVaultCertificateSourceParameters", + "OData.type": "#Microsoft.Azure.Cdn.Models.KeyVaultCertificateSourceParameters", "subscriptionId": "subid", "resourceGroupName": "RG", "vaultName": "kv", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json index f84f85ff1637..5f22b681148a 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json @@ -6,11 +6,11 @@ "profileName": "profile1", "endpointName": "endpoint1", "customDomainName": "www-someDomain-net", - "customDomainHttpsParameters": { + "customHttpsParameters": { "certificateSource": "Cdn", "protocolType": "ServerNameIndication", "certificateSourceParameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.CdnCertificateSourceParameters", + "OData.type": "#Microsoft.Azure.Cdn.Models.CdnCertificateSourceParameters", "certificateType": "Shared" } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json index 2ebd67705276..6b5c2b894cd2 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json @@ -44,6 +44,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -66,6 +67,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -75,9 +77,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" @@ -154,6 +171,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -176,6 +194,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -188,6 +207,20 @@ "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json index 04fd95e56acf..f2511b72fd82 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json @@ -47,6 +47,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -69,6 +70,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -78,9 +80,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" @@ -159,6 +176,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -181,6 +199,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -190,9 +209,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json index b1fb1e910db1..3ce2f5a82cac 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json @@ -29,6 +29,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -51,6 +52,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -60,9 +62,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" @@ -134,6 +151,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -156,6 +174,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -165,9 +184,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" @@ -246,6 +280,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -268,6 +303,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -277,9 +313,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" @@ -358,6 +409,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -380,6 +432,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -389,9 +442,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json index f08ef15833c0..3cfd8e73d78c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json @@ -43,6 +43,7 @@ "selector": null, "operator": "IPMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "192.168.1.0/24", "10.0.0.0/24" @@ -65,6 +66,7 @@ "selector": null, "operator": "GeoMatch", "negateCondition": false, + "transforms": [], "matchValue": [ "CH" ] @@ -74,9 +76,24 @@ "selector": "UserAgent", "operator": "Contains", "negateCondition": false, + "transforms": [], "matchValue": [ "windows" ] + }, + { + "matchVariable": "QueryString", + "selector": "search", + "operator": "Contains", + "negateCondition": false, + "transforms": [ + "UrlDecode", + "Lowercase" + ], + "matchValue": [ + "" + ] } ], "action": "Block"