diff --git a/schemas/2020-09-01/Microsoft.Cdn.json b/schemas/2020-09-01/Microsoft.Cdn.json index 89393c93e7..87cc9479e4 100644 --- a/schemas/2020-09-01/Microsoft.Cdn.json +++ b/schemas/2020-09-01/Microsoft.Cdn.json @@ -1024,9 +1024,15 @@ "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" }, "sharedPrivateLinkResource": { - "type": "object", - "properties": {}, - "description": "The properties of the private link resource for private origin." + "oneOf": [ + { + "$ref": "#/definitions/SharedPrivateLinkResourceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Shared Private Link Resource to use when connecting to a private origin." }, "weight": { "oneOf": [ @@ -1199,6 +1205,37 @@ }, "description": "Defines CDN web application firewall policy properties." }, + "CompressionSettings": { + "type": "object", + "properties": { + "contentTypesToCompress": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of content types on which compression applies. The value should be a valid MIME type." + }, + "isCompressionEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether content compression is enabled on AzureFrontDoor. Default value is false. 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." + } + }, + "description": "settings for compression." + }, "CookiesMatchConditionParameters": { "type": "object", "properties": { @@ -4890,9 +4927,15 @@ "type": "object", "properties": { "compressionSettings": { - "type": "object", - "properties": {}, - "description": "compression settings." + "oneOf": [ + { + "$ref": "#/definitions/CompressionSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "settings for compression." }, "customDomains": { "oneOf": [ @@ -5250,6 +5293,53 @@ ], "description": "The json object containing security policy waf parameters" }, + "SharedPrivateLinkResourceProperties": { + "type": "object", + "properties": { + "groupId": { + "type": "string", + "description": "The group id from the provider of resource the shared private link resource is for." + }, + "privateLink": { + "oneOf": [ + { + "$ref": "#/definitions/ResourceReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Reference to another resource." + }, + "privateLinkLocation": { + "type": "string", + "description": "The location of the shared private link resource" + }, + "requestMessage": { + "type": "string", + "description": "The request message for requesting approval of the shared private link resource." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected", + "Timeout" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Status of the shared private link resource. Can be Pending, Approved, Rejected, Disconnected, or Timeout." + } + }, + "description": "Describes the properties of an existing Shared Private Link Resource to use when connecting to a private origin." + }, "Sku": { "type": "object", "properties": { diff --git a/schemas/2021-06-01/Microsoft.Cdn.json b/schemas/2021-06-01/Microsoft.Cdn.json index 30d196d79c..574b729f63 100644 --- a/schemas/2021-06-01/Microsoft.Cdn.json +++ b/schemas/2021-06-01/Microsoft.Cdn.json @@ -886,19 +886,6 @@ } ], "description": "Whether to enable use of this rule. Permitted values are 'Enabled' or 'Disabled'." - }, - "originResponseTimeoutSeconds": { - "oneOf": [ - { - "type": "integer", - "minimum": 16, - "maximum": 240 - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns." } }, "description": "The JSON object that contains the properties required to create an endpoint." @@ -1149,7 +1136,6 @@ }, "cacheDuration": { "type": "string", - "format": "duration", "description": "The duration for which the content needs to be cached. Allowed format is [d.]hh:mm:ss" }, "isCompressionEnabled": { @@ -1394,6 +1380,28 @@ ], "description": "Describes operator to be matched." }, + "transforms": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string", + "enum": [ + "Lowercase", + "Uppercase", + "Trim", + "UrlDecode", + "UrlEncode", + "RemoveNulls" + ] + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of transforms" + }, "typeName": { "oneOf": [ { @@ -3307,6 +3315,28 @@ ], "description": "Describes operator to be matched" }, + "transforms": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string", + "enum": [ + "Lowercase", + "Uppercase", + "Trim", + "UrlDecode", + "UrlEncode", + "RemoveNulls" + ] + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of transforms" + }, "typeName": { "oneOf": [ { @@ -3574,6 +3604,8 @@ "type": "string", "enum": [ "SystemAssigned", + "UserAssigned", + "SystemAssigned, UserAssigned", "None" ] }, @@ -3582,6 +3614,21 @@ } ], "description": "Type of managed service identity." + }, + "userAssignedIdentities": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/UserAssignedIdentity" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "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}" } }, "description": "Managed service identity." @@ -5785,23 +5832,13 @@ }, "description": "The JSON object that contains the properties of the Secret to create." }, - "SecurityPolicyParameters": { - "type": "object", - "oneOf": [ - { - "$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters" - } - ], - "properties": {}, - "description": "The json object containing security policy parameters" - }, "SecurityPolicyProperties": { "type": "object", "properties": { "parameters": { "oneOf": [ { - "$ref": "#/definitions/SecurityPolicyParameters" + "$ref": "#/definitions/SecurityPolicyPropertiesParameters" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -5812,6 +5849,16 @@ }, "description": "The json object that contains properties required to create a security policy" }, + "SecurityPolicyPropertiesParameters": { + "type": "object", + "oneOf": [ + { + "$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters" + } + ], + "properties": {}, + "description": "The json object containing security policy parameters" + }, "SecurityPolicyWebApplicationFirewallAssociation": { "type": "object", "properties": { @@ -5937,6 +5984,28 @@ ], "description": "Describes operator to be matched." }, + "transforms": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string", + "enum": [ + "Lowercase", + "Uppercase", + "Trim", + "UrlDecode", + "UrlEncode", + "RemoveNulls" + ] + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of transforms" + }, "typeName": { "oneOf": [ { @@ -6032,6 +6101,28 @@ ], "description": "Describes operator to be matched." }, + "transforms": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string", + "enum": [ + "Lowercase", + "Uppercase", + "Trim", + "UrlDecode", + "UrlEncode", + "RemoveNulls" + ] + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of transforms" + }, "typeName": { "oneOf": [ { @@ -6099,6 +6190,28 @@ ], "description": "Describes operator to be matched" }, + "transforms": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string", + "enum": [ + "Lowercase", + "Uppercase", + "Trim", + "UrlDecode", + "UrlEncode", + "RemoveNulls" + ] + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of transforms" + }, "typeName": { "oneOf": [ { @@ -6735,6 +6848,11 @@ "paramName" ], "description": "Defines how to identify a parameter for a specific purpose e.g. expires" + }, + "UserAssignedIdentity": { + "type": "object", + "properties": {}, + "description": "User Assigned identity." } } } \ No newline at end of file