From 4a18181af340404149c5f7a4ba74a0eadbc2f3f2 Mon Sep 17 00:00:00 2001 From: Bo Zhang Date: Fri, 11 Mar 2022 21:13:56 +0800 Subject: [PATCH 1/2] [CDN][2021-06-01] Remove unsupported properties for Azure Front Door Standard/Premium GA --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 9 +-- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 61 ------------------- .../examples/AFDOriginGroups_Create.json | 3 - .../examples/AFDOriginGroups_Get.json | 1 - .../AFDOriginGroups_ListByProfile.json | 1 - .../examples/AFDOriginGroups_Update.json | 2 - 6 files changed, 3 insertions(+), 74 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 b55af008caf5..4eb9c76a4ee8 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 @@ -4151,7 +4151,9 @@ "Rejected", "TimedOut", "PendingRevalidation", - "Approved" + "Approved", + "RefreshingValidationToken", + "InternalError" ], "type": "string", "x-ms-enum": { @@ -5009,11 +5011,6 @@ "maximum": 50, "minimum": 0 }, - "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" - }, "sessionAffinityState": { "description": "Whether to allow session affinity on this host. Valid options are 'Enabled' or 'Disabled'", "enum": [ 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 614004a8e412..d41c6d5845f8 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 @@ -2490,10 +2490,6 @@ "modelAsString": true } }, - "identity": { - "description": "Managed service identity.", - "$ref": "#/definitions/ManagedServiceIdentity" - }, "provisioningState": { "readOnly": true, "description": "Provisioning status of the profile.", @@ -2513,59 +2509,6 @@ } } }, - "ManagedServiceIdentity": { - "description": "Managed service identity.", - "type": "object", - "properties": { - "type": { - "description": "Type of managed service identity.", - "enum": [ - "SystemAssigned", - "UserAssigned", - "SystemAssigned, UserAssigned", - "None" - ], - "type": "string", - "x-ms-enum": { - "name": "ManagedServiceIdentityType", - "modelAsString": true - } - }, - "tenantId": { - "description": "Tenant of managed service identity.", - "type": "string", - "readOnly": true - }, - "principalId": { - "description": "Principal Id of managed service identity.", - "type": "string", - "readOnly": true - }, - "userAssignedIdentities": { - "description": "The list of user assigned identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}", - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/userAssignedIdentity" - } - } - } - }, - "userAssignedIdentity": { - "description": "User Assigned identity.", - "type": "object", - "properties": { - "principalId": { - "description": "Principal Id of user assigned identity", - "type": "string", - "readOnly": true - }, - "clientId": { - "description": "Client Id of user assigned identity", - "type": "string", - "readOnly": true - } - } - }, "ProfileListResult": { "description": "Result of the request to list profiles. It contains a list of profile objects and a URL link to get the next set of results.", "properties": { @@ -2611,10 +2554,6 @@ "format": "int32", "minimum": 16, "exclusiveMinimum": false - }, - "identity": { - "description": "Managed service identity.", - "$ref": "#/definitions/ManagedServiceIdentity" } } }, 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..e55a181b46aa 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,6 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -64,7 +63,6 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -88,7 +86,6 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "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..270c45753aa0 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,6 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "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..39e2d4e95126 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,6 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "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..0352e36052bb 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,6 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -67,7 +66,6 @@ "probeProtocol": "Http", "probeIntervalInSeconds": 10 }, - "responseBasedAfdOriginErrorDetectionSettings": null, "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" From c94d14c5e36c4111064c1dce771107cb28673817 Mon Sep 17 00:00:00 2001 From: Bo Zhang Date: Mon, 14 Mar 2022 20:23:21 +0800 Subject: [PATCH 2/2] Add default value for enforceCertificateNameCheck --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json | 3 ++- 1 file changed, 2 insertions(+), 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 4eb9c76a4ee8..b97906510860 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 @@ -4891,7 +4891,8 @@ }, "enforceCertificateNameCheck": { "description": "Whether to enable certificate name check at origin level", - "type": "boolean" + "type": "boolean", + "default": true } } },