Skip to content

[CDN] Add stable API version 2019-06-15 based on 2019-06-15-preview #8573

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 26, 2020
Merged

[CDN] Add stable API version 2019-06-15 based on 2019-06-15-preview #8573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ed2eee
Add missing "SocketAddr" match variable to CDN WAF preview API version
fore5fire Mar 2, 2020
f67ff05
Use enum for CDN WAF defaultCustomBlockResponseStatus to allow only v…
fore5fire Mar 2, 2020
0586f63
Add CDN api version 2019-06-15
fore5fire Mar 2, 2020
ae84ad2
Fix CDN 2019-06-15 and 2019-06-15-preview defaultCustomBlockResponseS…
fore5fire Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .../resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdnwebapplicationfirewall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,13 @@
"defaultCustomBlockResponseStatusCode": {
"description": "If the action type is block, this field defines the default customer overridable http response status code.",
"type": "integer",
"maximum": 599,
"exclusiveMaximum": false,
"minimum": 200,
"exclusiveMinimum": false
"enum": [
200,
403,
405,
406,
429
]
},
"defaultCustomBlockResponseBody": {
"description": "If the action type is block, customer can override the response body. The body must be specified in base64 encoding.",
Expand Down Expand Up @@ -599,7 +602,7 @@
"type": "string",
"enum": [
"RemoteAddr",
"Country",
"SocketAddr",
Copy link
Contributor

@mmyyrroonn mmyyrroonn Mar 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the change for preview version?

Copy link
Contributor Author

@fore5fire fore5fire Mar 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is for both the preview and stable versions. Removing Country is not a breaking change because Country was originally added by mistake and was never supported by our service. SocketAddr is needed for our public preview, so we're including it in the preview version as well as stable.

"RequestMethod",
"RequestHeader",
"RequestUri",
Expand All @@ -614,7 +617,7 @@
}
},
"selector": {
"description": "Selector can used to match a specific key for QueryString, RequestUri, RequestHeaders or RequestBody.",
"description": "Selector can used to match a specific key for QueryString, Cookies, RequestHeader or PostArgs.",
"type": "string"
},
"operator": {
Expand Down
4 changes: 2 additions & 2 deletions ...n/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafListPolicies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 429,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down Expand Up @@ -154,7 +154,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 429,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down
4 changes: 2 additions & 2 deletions ...dn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPatchPolicy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 403,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down Expand Up @@ -159,7 +159,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 403,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down
8 changes: 4 additions & 4 deletions ...ce-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyCreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"properties": {
"policySettings": {
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 200,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down Expand Up @@ -134,7 +134,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 200,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down Expand Up @@ -263,7 +263,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 200,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down Expand Up @@ -392,7 +392,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 200,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down
2 changes: 1 addition & 1 deletion .../cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/examples/WafPolicyGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"enabledState": "Enabled",
"mode": "Prevention",
"defaultRedirectUrl": "http://www.bing.com",
"defaultCustomBlockResponseStatusCode": 499,
"defaultCustomBlockResponseStatusCode": 429,
"defaultCustomBlockResponseBody": "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
},
"rateLimitRules": {
Expand Down
Loading