diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 0f1b7814833d..4778e42afae1 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -484,7 +484,6 @@ "responses": { "202": { "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously. Please poll the targeted custom domain and check the 'validationProperties' field for the new validation token values." - } }, "default": { "description": "CDN error response describing why the operation failed.", @@ -4178,7 +4177,7 @@ "Unknown", "Submitting", "Pending", - "Rejected," + "Rejected", "TimedOut", "PendingRevalidation", "Approved" @@ -4214,6 +4213,11 @@ "AFDDomainUpdatePropertiesParameters": { "description": "The JSON object that contains the properties of the domain to create.", "properties": { + "profileName" : { + "description": "The name of the profile which holds the domain.", + "type": "string", + "readOnly": true + }, "tlsSettings": { "description": "The configuration specifying how to enable HTTPS for the domain - using AzureFrontDoor managed certificate or user's own certificate. If not specified, enabling ssl uses AzureFrontDoor managed certificate by default.", "type": "object", @@ -4321,6 +4325,11 @@ ], "type": "object", "properties": { + "profileName" : { + "description": "The name of the profile which holds the security policy.", + "type": "string", + "readOnly": true + }, "type": { "description": "The type of the Security policy to create.", "enum": [ @@ -4466,6 +4475,11 @@ "AFDEndpointPropertiesUpdateParameters": { "description": "The JSON object containing endpoint update parameters.", "properties": { + "profileName" : { + "description": "The name of the profile which holds the endpoint.", + "type": "string", + "readOnly": true + }, "enabledState": { "description": "Whether to enable use of this rule. Permitted values are 'Enabled' or 'Disabled'", "enum": [ @@ -4557,6 +4571,11 @@ } ], "properties": { + "profileName" : { + "description": "The name of the profile which holds the secret.", + "type": "string", + "readOnly": true + }, "parameters": { "description": "object which contains secret parameters", "$ref": "#/definitions/SecretParameters" @@ -4746,7 +4765,14 @@ { "$ref": "#/definitions/AFDStateProperties" } - ] + ], + "properties": { + "profileName" : { + "description": "The name of the profile which holds the rule set.", + "type": "string", + "readOnly": true + } + } }, "AFDOrigin": { "description": "CDN origin is the source of the content being delivered via CDN. When the edge nodes represented by an endpoint do not have the requested content cached, they attempt to fetch it from one or more of the configured origins.", @@ -4791,6 +4817,11 @@ "AFDOriginUpdatePropertiesParameters": { "description": "The JSON object that contains the properties of the origin.", "properties": { + "originGroupName": { + "description": "The name of the origin group which contains this origin.", + "type": "string", + "readOnly": true + }, "azureOrigin": { "description": "Resource reference to the Azure origin resource.", "type": "object", @@ -4956,6 +4987,11 @@ "AFDOriginGroupUpdatePropertiesParameters": { "description": "The JSON object that contains the properties of the origin group.", "properties": { + "profileName" : { + "description": "The name of the profile which holds the origin group.", + "type": "string", + "readOnly": true + }, "loadBalancingSettings": { "description": "Load balancing settings for a backend pool", "$ref": "#/definitions/LoadBalancingSettingsParameters" @@ -4972,7 +5008,7 @@ "maximum": 50, "minimum": 0 }, - "responseBasedAFDOriginErrorDetectionSettings": { + "responseBasedAfdOriginErrorDetectionSettings": { "description": "The JSON object that contains the properties to determine origin health using real requests/responses. This property is currently not supported.", "type": "object", "$ref": "./cdn.json#/definitions/ResponseBasedOriginErrorDetectionParameters" @@ -5088,6 +5124,11 @@ "RouteUpdatePropertiesParameters": { "description": "The JSON object that contains the properties of the domain to create.", "properties": { + "endpointName": { + "description": "The name of the endpoint which holds the route.", + "type": "string", + "readOnly": true + }, "customDomains": { "description": "Domains referenced by this endpoint.", "type": "array", @@ -5129,7 +5170,7 @@ "cacheConfiguration": { "description": "The caching configuration for this route. To disable caching, do not provide a cacheConfiguration object.", "type": "object", - "$ref": "#/definitions/CacheConfiguration" + "$ref": "#/definitions/AfdRouteCacheConfiguration" }, "forwardingProtocol": { "description": "Protocol this rule will use when forwarding traffic to backends.", @@ -5182,7 +5223,7 @@ } } }, - "CacheConfiguration": { + "AfdRouteCacheConfiguration": { "description": "Caching settings for a caching-type route. To disable caching, do not provide a cacheConfiguration object.", "type": "object", "properties": { @@ -5272,8 +5313,13 @@ } }, "RuleUpdatePropertiesParameters": { - "description": "The JSON object that contains the properties of the domain to create.", + "description": "The JSON object that contains the properties of the rule to update.", "properties": { + "ruleSetName": { + "description": "The name of the rule set containing the rule.", + "type": "string", + "readOnly": true + }, "order": { "description": "The order in which the rules are applied for the endpoint. Possible values {0,1,2,3,………}. A rule with a lesser order will be applied before a rule with a greater order. Rule with order 0 is a special rule. It does not require any condition and actions listed in it will always be applied.", "type": "integer", @@ -5359,7 +5405,7 @@ "properties": { "error": { "description": "The error object.", - "$ref": "./cdn.json#/definitions/ErrorResponse" + "$ref": "./cdn.json#/definitions/ErrorDetail" } } }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json index 1fff8928eb8a..3fa157383e71 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json @@ -316,6 +316,9 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously." }, @@ -751,6 +754,9 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted and the operation will complete asynchronously." }, @@ -1444,6 +1450,9 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted and the operation will complete asynchronously." }, @@ -1773,6 +1782,9 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted and the operation will complete asynchronously." }, @@ -2603,14 +2615,7 @@ "type": "array", "readOnly": true, "items": { - "hostName": { - "description": "The host name of the custom domain. Must be a domain name.", - "type": "string" - }, - "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" - } + "$ref": "#/definitions/CustomDomain" } }, "resourceState": { @@ -2779,7 +2784,8 @@ }, "order": { "description": "The order in which the rules are applied for the endpoint. Possible values {0,1,2,3,………}. A rule with a lesser order will be applied before a rule with a greater order. Rule with order 0 is a special rule. It does not require any condition and actions listed in it will always be applied.", - "type": "integer" + "type": "integer", + "format": "int32" }, "conditions": { "description": "A list of conditions that must be matched for the actions to be executed", @@ -4311,7 +4317,7 @@ }, "forwardingProtocol": { "description": "Protocol this rule will use when forwarding traffic to backends.", - "type": "object", + "type": "string", "enum": [ "HttpOnly", "HttpsOnly", @@ -4346,7 +4352,7 @@ "description": "query parameters to include or exclude (comma separated).", "type": "string" }, - "IsCompressionEnabled": { + "isCompressionEnabled": { "description": "Indicates whether content compression is enabled. 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": "string", "enum": [ @@ -4426,6 +4432,7 @@ "httpPort": { "description": "The value of the HTTP port. Must be between 1 and 65535.", "type": "integer", + "format": "int32", "maximum": 65535, "exclusiveMaximum": false, "minimum": 1, @@ -4434,6 +4441,7 @@ "httpsPort": { "description": "The value of the HTTPS port. Must be between 1 and 65535.", "type": "integer", + "format": "int32", "maximum": 65535, "exclusiveMaximum": false, "minimum": 1, @@ -4446,12 +4454,14 @@ "priority": { "description": "Priority of origin in given origin group for load balancing. Higher priorities will not be used for load balancing if any lower priority origin is healthy.Must be between 1 and 5.", "type": "integer", + "format": "int32", "maximum": 5, "minimum": 1 }, "weight": { "description": "Weight of the origin in given origin group for load balancing. Must be between 1 and 1000", "type": "integer", + "format": "int32", "maximum": 1000, "minimum": 1 }, @@ -4525,6 +4535,7 @@ "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": { "description": "Time in minutes to shift the traffic to the endpoint gradually when an unhealthy endpoint comes healthy or a new endpoint is added. Default is 10 mins. This property is currently not supported.", "type": "integer", + "format": "int32", "maximum": 50, "minimum": 0 }, @@ -4552,7 +4563,7 @@ "type": "string", "description": "Resource ID." }, - "IsActive": { + "isActive": { "type": "boolean", "description": "Whether the resource is active or inactive" } @@ -4756,6 +4767,7 @@ "httpPort": { "description": "The value of the HTTP port. Must be between 1 and 65535.", "type": "integer", + "format": "int32", "maximum": 65535, "exclusiveMaximum": false, "minimum": 1, @@ -4764,6 +4776,7 @@ "httpsPort": { "description": "The value of the HTTPS port. Must be between 1 and 65535.", "type": "integer", + "format": "int32", "maximum": 65535, "exclusiveMaximum": false, "minimum": 1, @@ -4776,12 +4789,14 @@ "priority": { "description": "Priority of origin in given origin group for load balancing. Higher priorities will not be used for load balancing if any lower priority origin is healthy.Must be between 1 and 5", "type": "integer", + "format": "int32", "maximum": 5, "minimum": 1 }, "weight": { "description": "Weight of the origin in given origin group for load balancing. Must be between 1 and 1000", "type": "integer", + "format": "int32", "maximum": 1000, "minimum": 1 }, @@ -4902,6 +4917,7 @@ "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": { "description": "Time in minutes to shift the traffic to the endpoint gradually when an unhealthy endpoint comes healthy or a new endpoint is added. Default is 10 mins. This property is currently not supported.", "type": "integer", + "format": "int32", "maximum": 50, "minimum": 0 }, @@ -4948,6 +4964,7 @@ "probeIntervalInSeconds": { "description": "The number of seconds between health probes.Default is 240sec.", "type": "integer", + "format": "int32", "maximum": 255, "minimum": 1 } @@ -4972,6 +4989,7 @@ "responseBasedFailoverThresholdPercentage": { "description": "The percentage of failed requests in the sample where failover should trigger.", "type": "integer", + "format": "int32", "maximum": 100, "minimum": 0 }, @@ -4990,12 +5008,14 @@ "begin": { "description": "The inclusive start of the http status code range.", "type": "integer", + "format": "int32", "maximum": 999, "minimum": 100 }, "end": { "description": "The inclusive end of the http status code range.", "type": "integer", + "format": "int32", "maximum": 999, "minimum": 100 } @@ -5460,11 +5480,13 @@ }, "currentValue": { "type": "integer", + "format": "int32", "readOnly": true, "description": "Actual value of usage on the specified resource type." }, "limit": { "type": "integer", + "format": "int32", "readOnly": true, "description": "Quota of the specified resource type." } @@ -5481,7 +5503,7 @@ "modelAsString": false } }, - "OperationListResult": { + "OperationsListResult": { "description": "Result of the request to list CDN operations. It contains a list of operations and a URL link to get the next set of results.", "properties": { "value": { @@ -5506,6 +5528,10 @@ "readOnly": true, "type": "string" }, + "isDataAction": { + "description": "Indicates whether the operation is a data action", + "type": "boolean" + }, "display": { "description": "The object that represents the operation.", "properties": { @@ -5761,7 +5787,8 @@ }, "prefixLength": { "description": "The length of the prefix of the ip address.", - "type": "integer" + "type": "integer", + "format": "int32" } } }, @@ -5949,20 +5976,68 @@ } }, "ErrorResponse": { + "title": "Error response", "description": "Error response indicates CDN service is not able to process the incoming request. The reason is provided in the error message.", "type": "object", + "properties": { + "error": { + "description": "The error object.", + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "ErrorDetail": { + "description": "The error detail.", + "type": "object", "properties": { "code": { - "description": "Error code.", "readOnly": true, - "type": "string" + "type": "string", + "description": "The error code." }, "message": { - "description": "Error message indicating why the operation failed.", "readOnly": true, - "type": "string" + "type": "string", + "description": "The error message." + }, + "target": { + "readOnly": true, + "type": "string", + "description": "The error target." + }, + "details": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDetail" + }, + "description": "The error details." + }, + "additionalInfo": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorAdditionalInfo" + }, + "description": "The error additional info." } } + }, + "ErrorAdditionalInfo": { + "type": "object", + "properties": { + "type": { + "readOnly": true, + "type": "string", + "description": "The additional info type." + }, + "info": { + "readOnly": true, + "type": "object", + "description": "The additional info." + } + }, + "description": "The resource management error additional info." } }, "parameters": { diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdnwebapplicationfirewall.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdnwebapplicationfirewall.json index 6983ad6cc1ab..27e15be59b4f 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdnwebapplicationfirewall.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdnwebapplicationfirewall.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/CdnWebApplicationFirewallPolicies": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/cdnWebApplicationFirewallPolicies": { "get": { "tags": [ "WebApplicationFirewallPolicies" @@ -76,7 +76,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/CdnWebApplicationFirewallPolicies/{policyName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/cdnWebApplicationFirewallPolicies/{policyName}": { "get": { "tags": [ "WebApplicationFirewallPolicies" @@ -261,6 +261,12 @@ }, "204": { "description": "No Content. The request has been accepted but the policy was not found." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./cdn.json#/definitions/ErrorResponse" + } } }, "x-ms-examples": { @@ -271,7 +277,7 @@ "x-ms-long-running-operation": false } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Cdn/CdnWebApplicationFirewallManagedRuleSets": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Cdn/cdnWebApplicationFirewallManagedRuleSets": { "get": { "tags": [ "WebApplicationFirewallManagedRuleSets" @@ -616,7 +622,7 @@ "PostArgs" ], "x-ms-enum": { - "name": "MatchVariable", + "name": "WafMatchVariable", "modelAsString": true } }, @@ -713,6 +719,7 @@ "anomalyScore": { "description": "Verizon only : If the rule set supports anomaly detection mode, this describes the threshold for blocking requests.", "type": "integer", + "format": "int32", "maximum": 20, "exclusiveMaximum": false, "minimum": 0, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Create.json index cfd7f3477995..37239c181c3f 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Create.json @@ -23,8 +23,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] @@ -55,8 +54,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] @@ -88,8 +86,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] @@ -121,8 +118,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Get.json index cbbbb1486343..a170fd150955 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Get.json @@ -29,8 +29,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_ListByProfile.json index 0bc94c44c0a4..048f562d1227 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_ListByProfile.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_ListByProfile.json @@ -30,8 +30,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Patch.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Patch.json index 39ab331f91a2..f6d3c70d7e45 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Patch.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/SecurityPolicies_Patch.json @@ -22,8 +22,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] @@ -53,8 +52,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ] @@ -86,8 +84,7 @@ } ], "patternsToMatch": [ - "/images", - "/videos" + "/*" ] } ]