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

Yunhe/cdn 2021 06 01 #8

Merged
merged 16 commits into from
Jul 23, 2021
Merged

Yunhe/cdn 2021 06 01 #8

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8638410
add forwardingProtocol to OriginGroupOverride
yunheMsft Apr 27, 2021
562b77b
added new cache behavior attributes and case transform enum values
yunheMsft Apr 27, 2021
dc9a66e
update cache behavior
yunheMsft Apr 29, 2021
4fdf006
update route and route configuration override rule swagger definition
yunheMsft Jun 14, 2021
df0ce46
update
yunheMsft Jun 17, 2021
a100163
made changes to route and rule to remove EnableCache filed. To disabl…
yunheMsft Jun 22, 2021
cae59e8
Merge remote-tracking branch 'origin/cdn-swagger-2021-06-01' into yun…
yunheMsft Jun 22, 2021
92b93f0
add cache duration to route
yunheMsft Jun 26, 2021
3bcd51d
update routeConfigOverride action
yunheMsft Jul 2, 2021
7a15cdd
update route and action
yunheMsft Jul 7, 2021
e0cba95
update action swagger
yunheMsft Jul 8, 2021
85eec75
update swagger spec
yunheMsft Jul 8, 2021
3a70a3a
Merge branch 'cdn-swagger-2021-06-01' into yunhe/cdn-2021-06-01
yunheMsft Jul 20, 2021
61df2e7
update examples
yunheMsft Jul 21, 2021
94a33b5
update comments
yunheMsft Jul 22, 2021
a92d676
updated examples
yunheMsft Jul 23, 2021
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
39 changes: 33 additions & 6 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5072,14 +5072,10 @@
"description": "A route pattern of the rule. Must not have any * except possibly after the final / at the end of the path."
}
},
"enableCache": {
"description": "A boolean field for enable or disable cache. If enableCache is true, cacheConfiguration cannot be null.",
"type": "boolean"
},
"cacheConfiguration": {
"description": "The caching configuration for this route.",
"description": "The caching configuration for this route. To disable caching, do not provide a cacheConfiguration object.",
"type": "object",
"$ref": "./cdn.json#/definitions/CacheConfiguration"
"$ref": "#/definitions/CacheConfiguration"
},
"forwardingProtocol": {
"description": "Protocol this rule will use when forwarding traffic to backends.",
Expand Down Expand Up @@ -5132,6 +5128,37 @@
}
}
},
"CacheConfiguration": {
"description": "Caching settings for a caching-type route. To disable caching, do not provide a cacheConfiguration object.",
"type": "object",
"properties": {
"queryStringCachingBehavior": {
"description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, ignore specific query strings when caching, cache every request with a unique URL, or cache specific query strings.",
"enum": [
"IgnoreQueryString",
"UseQueryString",
"IgnoreSpecifiedQueryStrings",
"IncludeSpecifiedQueryStrings"
],
"type": "string",
"x-ms-enum": {
"name": "afdQueryStringCachingBehavior",
"modelAsString": true
}
},
"queryParameters": {
"description": "query parameters to include or exclude (comma separated).",
"type": "string"
},
"compressionSettings": {
"description": "compression settings.",
"type": "object",
"items": {
"$ref": "#/definitions/CompressionSettings"
}
}
}
},
"RuleListResult": {
"description": "Result of the request to list rules. It contains a list of rule objects and a URL link to get the next set of results.",
"properties": {
Expand Down
82 changes: 51 additions & 31 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3778,7 +3778,8 @@
"UrlRedirect",
"UrlRewrite",
"UrlSigning",
"OriginGroupOverride"
"OriginGroupOverride",
"RouteConfigurationOverride"
],
"x-ms-enum": {
"name": "DeliveryRuleAction",
Expand Down Expand Up @@ -4224,9 +4225,9 @@
}
}
},
"DeliveryRuleCacheConfigurationAction": {
"description": "Defines the cache configuration action for the delivery rule. Only applicable to AFDX - need to update this later",
"x-ms-discriminator-value": "ModifyCacheConfiguration",
"DeliveryRuleRouteConfigurationOverrideAction": {
"description": "Defines the route configuration override action for the delivery rule. Only applicable to AFDX",
yunheMsft marked this conversation as resolved.
Show resolved Hide resolved
"x-ms-discriminator-value": "RouteConfigurationOverride",
"allOf": [
{
"$ref": "#/definitions/DeliveryRuleAction"
Expand All @@ -4238,41 +4239,73 @@
"properties": {
"parameters": {
"description": "Defines the parameters for the action.",
"$ref": "#/definitions/CacheConfigurationActionParameters"
"$ref": "#/definitions/RouteConfigurationOverrideActionParameters"
}
}
},
"CacheConfigurationActionParameters": {
"description": "Defines the parameters for the cache configuration action. To disable caching, do not provide a cacheConfiguration object.",
"RouteConfigurationOverrideActionParameters": {
"description": "Defines the parameters for the route configuration override action.",
"required": [
"@odata.type"
],
"properties": {
"@odata.type": {
"type": "string",
"enum": [
"#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheConfigurationActionParameters"
"#Microsoft.Azure.Cdn.Models.DeliveryRuleRouteConfigurationOverrideActionParameters"
]
},
"enableCache": {
"description": "A boolean field for enable or disable cache. If enableCache is true, cacheConfiguration cannot be null.",
"type": "boolean"
"originGroupOverride": {
"description": "A reference to the origin group override configuration. Leave empty to use the default origin group on route.",
"type": "object",
"$ref": "#/definitions/OriginGroupOverride"
},
"cacheConfiguration": {
"description": "The caching configuration associated with this rule.",
"description": "The caching configuration associated with this rule. To disable caching, do not provide a cacheConfiguration object.",
"type": "object",
"$ref": "#/definitions/CacheConfiguration"
}
}
},
"OriginGroupOverride": {
"description": "Defines the parameters for the origin group override configuration.",
"required": [
"originGroup"
],
"properties": {
"originGroup": {
"description": "defines the OriginGroup that would override the DefaultOriginGroup on route.",
"type": "object",
"$ref": "#/definitions/ResourceReference"
},
"originPath": {
"description": "A directory path on the origin that AzureFrontDoor can use to retrieve content from, e.g. contoso.cloudapp.net/originpath.",
"type": "string"
},
"forwardingProtocol": {
"description": "Protocol this rule will use when forwarding traffic to backends.",
"type": "object",
"enum": [
"HttpOnly",
"HttpsOnly",
"MatchRequest"
],
"x-ms-enum": {
"name": "ForwardingProtocol",
"modelAsString": true
}
}
}
},
"CacheConfiguration": {
"description": "Caching settings for a caching-type route. To disable caching, do not provide a cacheConfiguration object.",
"type": "object",
"properties": {
"queryStringCachingBehavior": {
"description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.",
"description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, ignore specific query strings when caching, cache every request with a unique URL, or cache specific query strings.",
"enum": [
"IgnoreQueryStrings",
"CacheEveryUniqueUrl",
"IgnoreQueryString",
"UseQueryString",
"IgnoreSpecifiedQueryStrings",
"IncludeSpecifiedQueryStrings"
],
Expand Down Expand Up @@ -4304,22 +4337,9 @@
"type": "string",
"format": "duration"
},
"compressionSettings": {
"description": "settings for compression.",
"type": "object",
"properties": {
"contentTypesToCompress": {
"description": "List of content types on which compression applies. The value should be a valid MIME type.",
"type": "array",
"items": {
"type": "string"
}
},
"isCompressionEnabled": {
"description": "Indicates whether content compression is enabled on AzureFrontDoor. Default value is false. If compression is enabled, content will be served as compressed if user requests for a compressed version. Content won't be compressed on AzureFrontDoor when requested content is smaller than 1 byte or larger than 1 MB.",
"type": "boolean"
}
}
"isCompressionEnabled": {
"description": "Indicates whether content compression is enabled on AzureFrontDoor. Default value is false. If compression is enabled, content will be served as compressed if user requests for a compressed version. Content won't be compressed on AzureFrontDoor when requested content is smaller than 1 byte or larger than 1 MB.",
"type": "boolean"
}
}
},
Expand Down