From de566e6f8683b4ef749a226d8c8039ccc4c316b7 Mon Sep 17 00:00:00 2001 From: Chenglong Liu Date: Thu, 13 Jan 2022 15:49:02 +0800 Subject: [PATCH] Fix OBJECT_ADDITIONAL_PROPERTIES --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 2 +- .../examples/AFDOriginGroups_Create.json | 6 +-- .../examples/AFDOriginGroups_Get.json | 2 +- .../AFDOriginGroups_ListByProfile.json | 2 +- .../examples/AFDOriginGroups_Update.json | 4 +- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 2 +- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 45 ++++++++++++++++--- .../examples/AFDOriginGroups_Create.json | 6 +-- .../examples/AFDOriginGroups_Get.json | 2 +- .../AFDOriginGroups_ListByProfile.json | 2 +- .../examples/AFDOriginGroups_Update.json | 4 +- .../2021-06-01/examples/Profiles_Create.json | 3 ++ .../2021-06-01/examples/Profiles_Get.json | 1 + .../2021-06-01/examples/Profiles_List.json | 2 + .../Profiles_ListByResourceGroup.json | 2 + .../2021-06-01/examples/Profiles_Update.json | 2 + .../2021-06-01/examples/Rules_Create.json | 9 ++-- .../stable/2021-06-01/examples/Rules_Get.json | 3 +- .../examples/Rules_ListByRuleSet.json | 3 +- .../2021-06-01/examples/Rules_Update.json | 6 ++- 20 files changed, 80 insertions(+), 28 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index ebbd78d01bf5..b03339d12f64 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -4906,7 +4906,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" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json index 6ad670e4b279..45420f0c7eec 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json @@ -40,7 +40,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -64,7 +64,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -88,7 +88,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Get.json index 0080ca938eb2..8fc52fcb2fad 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Get.json @@ -24,7 +24,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_ListByProfile.json index b84d8582ebbf..c7d5ef091a5f 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_ListByProfile.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_ListByProfile.json @@ -25,7 +25,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Update.json index 7da758e2d2de..450ba2c1b88c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Update.json @@ -40,7 +40,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -64,7 +64,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" 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 66e5f076e76b..ef472634e48e 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 @@ -4944,7 +4944,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" 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 ea3b065c11dd..96e694e58f71 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 @@ -2458,6 +2458,11 @@ "description": "The pricing tier (defines Azure Front Door Standard or Premium or a CDN provider, feature list and rate) of the profile.", "$ref": "#/definitions/Sku" }, + "kind": { + "readOnly": true, + "type": "string", + "description": "Kind of the profile. Used by portal to differentiate traditional CDN profile and new AFD profile." + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/ProfileProperties" @@ -2499,11 +2504,6 @@ "type": "string", "description": "The Id of the frontdoor." }, - "kind": { - "readOnly": true, - "type": "string", - "description": "Kind of the profile. Used by portal to differentiate traditional CDN profile and new AFD profile." - }, "originResponseTimeoutSeconds": { "description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns.", "type": "integer", @@ -3960,6 +3960,13 @@ "Desktop" ] } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -3999,6 +4006,13 @@ "items": { "type": "string" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -4046,6 +4060,13 @@ "items": { "type": "string" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -4093,6 +4114,13 @@ "items": { "type": "string" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -4185,6 +4213,13 @@ "items": { "$ref": "#/definitions/SslProtocol" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Create.json index 915140606596..83cd9cb1c918 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Create.json @@ -40,7 +40,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -64,7 +64,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -88,7 +88,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Get.json index 2f6bc37113a3..63f30d206530 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Get.json @@ -24,7 +24,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_ListByProfile.json index 26b6125e3df9..5f98a31bf0e6 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_ListByProfile.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_ListByProfile.json @@ -25,7 +25,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Update.json index 30364403f4b0..53a97b7f47be 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Update.json @@ -40,7 +40,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -67,7 +67,7 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, + "responseBasedAFDOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Create.json index 385a94fecee1..2c8fb87eb2ff 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Create.json @@ -22,6 +22,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Creating", "resourceState": "Creating" @@ -38,6 +39,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Creating", "resourceState": "Creating" @@ -54,6 +56,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Creating", "resourceState": "Creating" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Get.json index 68fd69fe199c..77d398162829 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Get.json @@ -16,6 +16,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Succeeded", "resourceState": "Active" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_List.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_List.json index 6166d158d908..5a1d3bc92ad2 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_List.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_List.json @@ -16,6 +16,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Succeeded", "resourceState": "Active" @@ -30,6 +31,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Succeeded", "resourceState": "Active" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_ListByResourceGroup.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_ListByResourceGroup.json index 91e119850997..552f315b7ba3 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_ListByResourceGroup.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_ListByResourceGroup.json @@ -17,6 +17,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Succeeded", "resourceState": "Active" @@ -31,6 +32,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Succeeded", "resourceState": "Active" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Update.json index 57fa380ab7d5..d7b7f662d0f2 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Update.json @@ -23,6 +23,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Succeeded", "resourceState": "Active" @@ -44,6 +45,7 @@ "sku": { "name": "Premium_AzureFrontDoor" }, + "kind": "frontdoor", "properties": { "provisioningState": "Succeeded", "resourceState": "Active" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json index 08ce135a26b3..531d9452fc8a 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json @@ -53,7 +53,8 @@ "matchValues": [ "GET" ], - "negateCondition": false + "negateCondition": false, + "transforms": [] } } ], @@ -87,7 +88,8 @@ "matchValues": [ "GET" ], - "negateCondition": false + "negateCondition": false, + "transforms": [] } } ], @@ -121,7 +123,8 @@ "matchValues": [ "GET" ], - "negateCondition": false + "negateCondition": false, + "transforms": [] } } ], diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json index 48026509ca10..84cc44a48e16 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json @@ -24,7 +24,8 @@ "matchValues": [ "GET" ], - "negateCondition": false + "negateCondition": false, + "transforms": [] } } ], diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json index 4e6993b32ba0..1e8fe226038b 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json @@ -25,7 +25,8 @@ "matchValues": [ "GET" ], - "negateCondition": false + "negateCondition": false, + "transforms": [] } } ], diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json index 5174f8bb9e41..bbd527cb03c9 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json @@ -40,7 +40,8 @@ "matchValues": [ "GET" ], - "negateCondition": false + "negateCondition": false, + "transforms": [] } } ], @@ -77,7 +78,8 @@ "matchValues": [ "GET" ], - "negateCondition": false + "negateCondition": false, + "transforms": [] } } ],