From 9a2bf2d0512338fdf7bc97bbaf2a4fcdd5a2ade5 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Fri, 5 Nov 2021 11:32:54 -0700 Subject: [PATCH 01/18] fix incompatiable names --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json | 2 +- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d540294215c8..3922fdaadfa8 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 @@ -5197,7 +5197,7 @@ ], "type": "string", "x-ms-enum": { - "name": "afdQueryStringCachingBehavior", + "name": "QueryStringCachingBehavior", "modelAsString": true } }, 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 c99a3a883b7a..bd1d26a58da8 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 @@ -4323,7 +4323,7 @@ ], "type": "string", "x-ms-enum": { - "name": "ruleQueryStringCachingBehavior", + "name": "QueryStringCachingBehavior", "modelAsString": true } }, From 556f3d7aaa02e0315c09ea6c5131d7f315ba0333 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Fri, 5 Nov 2021 12:38:30 -0700 Subject: [PATCH 02/18] Revert "fix incompatiable names" This reverts commit 9a2bf2d0512338fdf7bc97bbaf2a4fcdd5a2ade5. --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json | 2 +- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3922fdaadfa8..d540294215c8 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 @@ -5197,7 +5197,7 @@ ], "type": "string", "x-ms-enum": { - "name": "QueryStringCachingBehavior", + "name": "afdQueryStringCachingBehavior", "modelAsString": true } }, 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 bd1d26a58da8..c99a3a883b7a 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 @@ -4323,7 +4323,7 @@ ], "type": "string", "x-ms-enum": { - "name": "QueryStringCachingBehavior", + "name": "ruleQueryStringCachingBehavior", "modelAsString": true } }, From ba8ad5686829977f630ce7695099827c9d65be48 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Fri, 5 Nov 2021 12:58:29 -0700 Subject: [PATCH 03/18] change CacheConfiguration naming to AfdCacheConfiguration --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d540294215c8..421e7863ead4 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 @@ -5130,7 +5130,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/AfdCacheConfiguration" }, "forwardingProtocol": { "description": "Protocol this rule will use when forwarding traffic to backends.", @@ -5183,7 +5183,7 @@ } } }, - "CacheConfiguration": { + "AfdCacheConfiguration": { "description": "Caching settings for a caching-type route. To disable caching, do not provide a cacheConfiguration object.", "type": "object", "properties": { From 60ea2cd80f2e883ead311ddf25bab174ea8a5453 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Fri, 5 Nov 2021 19:40:19 -0700 Subject: [PATCH 04/18] AfdCacheConfiguration -> AfdRouteCacheConfiguration, fix type for SDK issue --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 4 ++-- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 421e7863ead4..edd0847adf92 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 @@ -5130,7 +5130,7 @@ "cacheConfiguration": { "description": "The caching configuration for this route. To disable caching, do not provide a cacheConfiguration object.", "type": "object", - "$ref": "#/definitions/AfdCacheConfiguration" + "$ref": "#/definitions/AfdRouteCacheConfiguration" }, "forwardingProtocol": { "description": "Protocol this rule will use when forwarding traffic to backends.", @@ -5183,7 +5183,7 @@ } } }, - "AfdCacheConfiguration": { + "AfdRouteCacheConfiguration": { "description": "Caching settings for a caching-type route. To disable caching, do not provide a cacheConfiguration object.", "type": "object", "properties": { 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 c99a3a883b7a..131fa14ae0ae 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 @@ -4296,7 +4296,7 @@ }, "forwardingProtocol": { "description": "Protocol this rule will use when forwarding traffic to backends.", - "type": "object", + "type": "string", "enum": [ "HttpOnly", "HttpsOnly", From 35e078c3dcae747c91a25541f2a5d38767679a85 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Mon, 8 Nov 2021 01:00:56 -0800 Subject: [PATCH 05/18] add format field to integer types --- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 131fa14ae0ae..8b811b0b5adb 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 @@ -2764,7 +2764,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", @@ -4411,6 +4412,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, @@ -4419,6 +4421,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, @@ -4431,12 +4434,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 }, @@ -4510,6 +4515,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 }, @@ -4727,6 +4733,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, @@ -4735,6 +4742,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, @@ -4747,12 +4755,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 }, @@ -4873,6 +4883,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 }, @@ -4919,6 +4930,7 @@ "probeIntervalInSeconds": { "description": "The number of seconds between health probes.Default is 240sec.", "type": "integer", + "format": "int32", "maximum": 255, "minimum": 1 } @@ -4943,6 +4955,7 @@ "responseBasedFailoverThresholdPercentage": { "description": "The percentage of failed requests in the sample where failover should trigger.", "type": "integer", + "format": "int32", "maximum": 100, "minimum": 0 }, @@ -4961,12 +4974,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 } @@ -5581,7 +5596,8 @@ }, "prefixLength": { "description": "The length of the prefix of the ip address.", - "type": "integer" + "type": "integer", + "format": "int32" } } }, From 3390db55484320ee1d0111eb4f1880943d8a2a36 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Mon, 8 Nov 2021 12:59:40 -0800 Subject: [PATCH 06/18] Add format field to integer types --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json | 2 ++ .../stable/2021-06-01/cdnwebapplicationfirewall.json | 1 + 2 files changed, 3 insertions(+) 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 8b811b0b5adb..f6e5874e0f3e 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 @@ -5446,11 +5446,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." } 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..ef4ecb7ef9c4 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 @@ -713,6 +713,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, From 24773f3d6c092fd4faad46a56a724e9ed9850922 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Mon, 8 Nov 2021 15:24:10 -0800 Subject: [PATCH 07/18] IsCompressionEnabled -> isCompressionEnabled --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f6e5874e0f3e..bf77b6087dec 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 @@ -4332,7 +4332,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": [ From a74e4facd3770eabf278bfc8bf56c9e9fd4522ef Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Mon, 8 Nov 2021 16:49:07 -0800 Subject: [PATCH 08/18] responseBasedAFDOriginErrorDetectionSettings -> responseBasedAfdOriginErrorDetectionSettings --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 edd0847adf92..05972d44b0d0 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 @@ -4973,7 +4973,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" From 6477b4596d5882ef721ba61b8f606abf068033b0 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Mon, 8 Nov 2021 17:47:13 -0800 Subject: [PATCH 09/18] use camel casing for resource type --- .../stable/2021-06-01/cdnwebapplicationfirewall.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ef4ecb7ef9c4..d27a61ec3f35 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" @@ -271,7 +271,7 @@ "x-ms-long-running-operation": false } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Cdn/CdnWebApplicationFirewallManagedRuleSets": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Cdn/cdnWebApplicationFirewallManagedRuleSets": { "get": { "tags": [ "WebApplicationFirewallManagedRuleSets" From 03273dd0c8e2997d6719772a58e1b15a9d2f7eee Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Tue, 9 Nov 2021 02:45:54 -0800 Subject: [PATCH 10/18] Add default response to delete operation --- .../stable/2021-06-01/cdnwebapplicationfirewall.json | 6 ++++++ 1 file changed, 6 insertions(+) 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 d27a61ec3f35..2c48cced5b75 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 @@ -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": { From e90ea755655e366cf765b7bb603810ca35841c24 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Fri, 19 Nov 2021 18:43:02 -0800 Subject: [PATCH 11/18] Update x-ms-name MatchVariable -> WafMatchVariable --- .../stable/2021-06-01/cdnwebapplicationfirewall.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2c48cced5b75..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 @@ -622,7 +622,7 @@ "PostArgs" ], "x-ms-enum": { - "name": "MatchVariable", + "name": "WafMatchVariable", "modelAsString": true } }, From 8d89c2e0048af06f7a15ef5025ee6ea9a9f7bebe Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Sun, 21 Nov 2021 18:24:41 -0800 Subject: [PATCH 12/18] Update Error Response to conform to spec --- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) 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 bf77b6087dec..35bf52951a30 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 @@ -5790,15 +5790,21 @@ "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": { - "code": { - "description": "Error code.", - "readOnly": true, - "type": "string" - }, - "message": { - "description": "Error message indicating why the operation failed.", - "readOnly": true, - "type": "string" + "error": { + "type": "object", + "description": "The error object.", + "properties": { + "code": { + "description": "Error code.", + "readOnly": true, + "type": "string" + }, + "message": { + "description": "Error message indicating why the operation failed.", + "readOnly": true, + "type": "string" + } + } } } } From c3fa8fe0d5c212f8cfc3ac992bb608b63e28b398 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Sun, 21 Nov 2021 18:37:54 -0800 Subject: [PATCH 13/18] Update Error Response with additional fields --- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-) 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 35bf52951a30..fb88d067a3f9 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 @@ -5787,26 +5787,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": { - "type": "object", "description": "The error object.", - "properties": { - "code": { - "description": "Error code.", - "readOnly": true, - "type": "string" - }, - "message": { - "description": "Error message indicating why the operation failed.", - "readOnly": true, - "type": "string" - } - } + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "ErrorDetail": { + "description": "The error detail.", + "type": "object", + "properties": { + "code": { + "readOnly": true, + "type": "string", + "description": "The error code." + }, + "message": { + "readOnly": true, + "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": { From 7a84359eeabd0775857482c9625ecb81521a25f0 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Sun, 21 Nov 2021 18:45:41 -0800 Subject: [PATCH 14/18] Update reference to error field in ErrorResponse --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 05972d44b0d0..3ef9c983e4df 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 @@ -5360,7 +5360,7 @@ "properties": { "error": { "description": "The error object.", - "$ref": "./cdn.json#/definitions/ErrorResponse" + "$ref": "./cdn.json#/definitions/ErrorDetail" } } }, From cfc028b8f39411c9bf019984bf98ec3f39dd1926 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Sun, 21 Nov 2021 19:43:04 -0800 Subject: [PATCH 15/18] Fix semantics, validations, typos --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 3 +-- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-) 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 60cd4066d073..307a1edebc78 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" 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 d718c4505dbf..ad7c70730ad3 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 @@ -2603,14 +2603,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": { @@ -5498,7 +5491,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": { From 304b32fc7d86765e36dc41845047f37a2e5e9585 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Sun, 21 Nov 2021 19:57:20 -0800 Subject: [PATCH 16/18] Use camel casing and add 200 response code --- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 ad7c70730ad3..afb37aacbc81 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." }, @@ -4551,7 +4554,7 @@ "type": "string", "description": "Resource ID." }, - "IsActive": { + "isActive": { "type": "boolean", "description": "Whether the resource is active or inactive" } From 06323352a51152ec7195cfabde39815a5a963489 Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Sun, 21 Nov 2021 20:11:40 -0800 Subject: [PATCH 17/18] Add remaining 200 response for delete and conform to operation spec --- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 afb37aacbc81..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 @@ -754,6 +754,9 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted and the operation will complete asynchronously." }, @@ -1447,6 +1450,9 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted and the operation will complete asynchronously." }, @@ -1776,6 +1782,9 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted and the operation will complete asynchronously." }, @@ -5519,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": { From 260d57be2a1dba4b41e9c96830b124ea64f6ac3f Mon Sep 17 00:00:00 2001 From: Jorin Mejia Date: Mon, 22 Nov 2021 18:19:14 -0800 Subject: [PATCH 18/18] Add parent resource name in child resource --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 51 ++++++++++++++++++- .../examples/SecurityPolicies_Create.json | 12 ++--- .../examples/SecurityPolicies_Get.json | 3 +- .../SecurityPolicies_ListByProfile.json | 3 +- .../examples/SecurityPolicies_Patch.json | 9 ++-- 5 files changed, 58 insertions(+), 20 deletions(-) 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 307a1edebc78..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 @@ -4213,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", @@ -4320,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": [ @@ -4465,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": [ @@ -4556,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" @@ -4745,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.", @@ -4790,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", @@ -4955,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" @@ -5087,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", @@ -5271,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", 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" + "/*" ] } ]