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 e2979667b60f..ebbd78d01bf5 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 @@ -4779,9 +4779,7 @@ "sharedPrivateLinkResource": { "description": "The properties of the private link resource for private origin.", "type": "object", - "items": { - "$ref": "#/definitions/SharedPrivateLinkResourceProperties" - } + "$ref": "#/definitions/SharedPrivateLinkResourceProperties" }, "enabledState": { "description": "Whether to enable health probes to be made against backends defined under backendPools. Health probes can only be disabled if there is a single enabled backend in single enabled backend pool.", @@ -5065,9 +5063,7 @@ "compressionSettings": { "description": "compression settings.", "type": "object", - "items": { - "$ref": "#/definitions/CompressionSettings" - } + "$ref": "#/definitions/CompressionSettings" }, "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.", 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 9c4c4813f70f..92e5b0e0643d 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 @@ -2856,12 +2856,12 @@ "type": "string" }, { - "name": "securityPolicyProperties", + "name": "securityPolicyUpdateProperties", "in": "body", "description": "Security policy update properties", "required": true, "schema": { - "$ref": "#/definitions/SecurityPolicyProperties" + "$ref": "#/definitions/SecurityPolicyUpdateParameters" } }, { @@ -4228,6 +4228,7 @@ }, "SecurityPolicyProperties": { "description": "The json object that contains properties required to create a security policy", + "type": "object", "allOf": [ { "$ref": "#/definitions/AFDStateProperties" @@ -4241,11 +4242,31 @@ }, "parameters": { "description": "object which contains security policy parameters", - "$ref": "#/definitions/SecurityPolicyParameters" + "$ref": "#/definitions/SecurityPolicyPropertiesParameters" + } + } + }, + "SecurityPolicyUpdateParameters": { + "description": "The JSON object containing security policy update parameters.", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecurityPolicyUpdateProperties" } } }, - "SecurityPolicyParameters": { + "SecurityPolicyUpdateProperties": { + "description": "The json object that contains properties required to update a security policy", + "type": "object", + "properties": { + "parameters": { + "description": "object which contains security policy parameters", + "$ref": "#/definitions/SecurityPolicyPropertiesParameters" + } + } + }, + "SecurityPolicyPropertiesParameters": { "description": "The json object containing security policy parameters", "discriminator": "type", "required": [ @@ -4272,7 +4293,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/SecurityPolicyParameters" + "$ref": "#/definitions/SecurityPolicyPropertiesParameters" } ], "properties": { @@ -4414,14 +4435,6 @@ "name": "EnabledState", "modelAsString": true } - }, - "originResponseTimeoutSeconds": { - "description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns.", - "type": "integer", - "format": "int32", - "minimum": 16, - "maximum": 240, - "exclusiveMinimum": false } } }, 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 7c43a6e50939..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", @@ -2521,6 +2521,8 @@ "description": "Type of managed service identity.", "enum": [ "SystemAssigned", + "UserAssigned", + "SystemAssigned, UserAssigned", "None" ], "type": "string", @@ -2538,6 +2540,29 @@ "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 } } }, @@ -3935,6 +3960,13 @@ "Desktop" ] } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -3974,6 +4006,13 @@ "items": { "type": "string" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -4021,6 +4060,13 @@ "items": { "type": "string" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -4068,6 +4114,13 @@ "items": { "type": "string" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -4160,6 +4213,13 @@ "items": { "$ref": "#/definitions/SslProtocol" } + }, + "transforms": { + "description": "List of transforms", + "type": "array", + "items": { + "$ref": "#/definitions/transform" + } } } }, @@ -4732,8 +4792,7 @@ }, "cacheDuration": { "description": "The duration for which the content needs to be cached. Allowed format is [d.]hh:mm:ss", - "type": "string", - "format": "duration" + "type": "string" } } }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Create.json index 460c137c2e9e..90752bc39076 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Create.json @@ -9,7 +9,6 @@ "tags": {}, "location": "CentralUs", "properties": { - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled" } } @@ -24,7 +23,6 @@ "location": "CentralUs", "properties": { "hostName": "endpoint1.azureedge.net", - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled", "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -40,7 +38,6 @@ "location": "CentralUs", "properties": { "hostName": "endpoint1.azureedge.net", - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled", "provisioningState": "Creating", "deploymentStatus": "NotStarted" @@ -56,7 +53,6 @@ "location": "CentralUs", "properties": { "hostName": "endpoint1.azureedge.net", - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled", "provisioningState": "Creating", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Get.json index d91eb0c48237..41ca4afad024 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Get.json @@ -16,7 +16,6 @@ "location": "CentralUs", "properties": { "hostName": "endpoint1.azureedge.net", - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled", "provisioningState": "Succeeded", "deploymentStatus": "Succeeded" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_ListByProfile.json index 2a391cfe47e2..3237c166b64e 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_ListByProfile.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_ListByProfile.json @@ -17,7 +17,6 @@ "location": "CentralUs", "properties": { "hostName": "endpoint1.azureedge.net", - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled", "provisioningState": "Succeeded", "deploymentStatus": "Succeeded" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Update.json index a1df44524d3e..b8d6964c7f90 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Update.json @@ -8,7 +8,6 @@ "endpointUpdateProperties": { "tags": {}, "properties": { - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled" } } @@ -23,7 +22,6 @@ "location": "WestCentralUs", "properties": { "hostName": "endpoint1.azureedge.net", - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled", "provisioningState": "Succeeded", "deploymentStatus": "InProgress" @@ -42,7 +40,6 @@ "location": "WestCentralUs", "properties": { "hostName": "endpoint1.azureedge.net", - "originResponseTimeoutSeconds": 30, "enabledState": "Enabled", "provisioningState": "Updating", "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": [] } } ], 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 49d4564ade9b..12697bfa1cd2 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 @@ -5,27 +5,29 @@ "resourceGroupName": "RG", "profileName": "profile1", "securityPolicyName": "securityPolicy1", - "securityPolicyProperties": { - "parameters": { - "type": "WebApplicationFirewall", - "wafPolicy": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest" - }, - "associations": [ - { - "domains": [ - { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1" - }, - { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2" - } - ], - "patternsToMatch": [ - "/*" - ] - } - ] + "securityPolicyUpdateProperties": { + "properties": { + "parameters": { + "type": "WebApplicationFirewall", + "wafPolicy": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest" + }, + "associations": [ + { + "domains": [ + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1" + }, + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2" + } + ], + "patternsToMatch": [ + "/*" + ] + } + ] + } } } },