Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[CDN] Copy changes from API version 2019-04-15 into 2019-06-15-preview. #7442

Merged
merged 8 commits into from
Nov 28, 2019
Merged

[CDN] Copy changes from API version 2019-04-15 into 2019-06-15-preview. #7442

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0de44da
Copy changes from CDN version 2019-04-15 into 2019-06-15-preview.
Oct 9, 2019
b54f02f
Update ActionType
sushantsingh Jun 14, 2019
42c23d8
Add range for priority
sushantsingh Jun 25, 2019
5349f52
Fix cdnwebapplicationfirewall.json syntax.
Nov 4, 2019
29260c8
Add transforms to CDN WAF MatchConditions
Nov 7, 2019
0539321
Sync latest changes from CDN 2019-04-15 to 2019-06-15-preview
Nov 21, 2019
f3a418f
Fix CDN WAF examples for updated API version 2019-06-15-preview.
Nov 22, 2019
c8c1844
Add transforms examples for CDN API version
Nov 26, 2019
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
257 changes: 254 additions & 3 deletions specification/cdn/resource-manager/Microsoft.Cdn/preview/2019-06-15-preview/cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2250,7 +2250,6 @@
"description": "A rule that specifies a set of actions and conditions",
"type": "object",
"required": [
"name",
"order",
"actions"
],
Expand Down Expand Up @@ -2301,6 +2300,8 @@
"UrlPath",
"UrlFileExtension",
"UrlFileName",
"HttpVersion",
"Cookies",
"IsDevice"
],
"x-ms-enum": {
Expand Down Expand Up @@ -2508,6 +2509,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",
Expand Down Expand Up @@ -3093,6 +3130,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": [
Expand Down Expand Up @@ -3154,9 +3287,11 @@
"type": "string",
"enum": [
"CacheExpiration",
"CacheKeyQueryString",
"ModifyRequestHeader",
"ModifyResponseHeader",
"UrlRedirect"
"UrlRedirect",
"UrlRewrite"
],
"x-ms-enum": {
"name": "DeliveryRuleAction",
Expand Down Expand Up @@ -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. 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 destination path for be used in the rewrite. This will overwrite the source pattern ",
"type": "string"
},
"preserveUnmatchedPath": {
"description": "If True, the remaining path after the source pattern will be appended to the new destination path. ",
"type": "boolean"
}
}
},
"DeliveryRuleRequestHeaderAction": {
"description": "Defines the request header action for the delivery rule.",
"x-ms-discriminator-value": "ModifyRequestHeader",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -3758,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
}
}
}
},
Expand Down Expand Up @@ -4281,7 +4531,8 @@
"Custom_Verizon",
"Standard_Akamai",
"Standard_ChinaCdn",
"Standard_Microsoft"
"Standard_Microsoft",
"Premium_ChinaCdn"
],
"type": "string",
"x-ms-enum": {
Expand Down
Loading