Skip to content

Commit 3de225c

Browse files
SDKAutomarkcowlChenglong LiuBo ZhangSINADELL
committed
CodeGen from PR 17278 in Azure/azure-rest-api-specs
Cdn swagger 2021 06 01 fix (#17278) * Add blockchain to latest profile * Add additional types * [CDN] Fix incorrect type for compressionSettings and SharedPrivateLinkResourceProperties * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Update SecurityPolicy patch operation * Removing originResponseTimeoutSeconds from endpoint level * Fix the afdendpoint example * Fix the cacheDuration format * Adding user assigned identity to managed identity * Fix the typo and example * Fix OBJECT_ADDITIONAL_PROPERTIES * Revert responseBasedAFDOriginErrorDetectionSettings Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com> Co-authored-by: Chenglong Liu <chengll@microsoft.com> Co-authored-by: Bo Zhang <bzhan@microsoft.com> Co-authored-by: SINADELL <SINADELL@SINADELL-DEV7> Co-authored-by: Sindhuri <sindhuri.nadella@gmail.com> Co-authored-by: AJ Brown <ajbrown@microsoft.com>
1 parent 109fd9f commit 3de225c

File tree

2 files changed

+239
-31
lines changed

2 files changed

+239
-31
lines changed

‎schemas/2020-09-01/Microsoft.Cdn.json‎

Lines changed: 96 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,9 +1024,15 @@
10241024
"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"
10251025
},
10261026
"sharedPrivateLinkResource": {
1027-
"type": "object",
1028-
"properties": {},
1029-
"description": "The properties of the private link resource for private origin."
1027+
"oneOf": [
1028+
{
1029+
"$ref": "#/definitions/SharedPrivateLinkResourceProperties"
1030+
},
1031+
{
1032+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1033+
}
1034+
],
1035+
"description": "Describes the properties of an existing Shared Private Link Resource to use when connecting to a private origin."
10301036
},
10311037
"weight": {
10321038
"oneOf": [
@@ -1199,6 +1205,37 @@
11991205
},
12001206
"description": "Defines CDN web application firewall policy properties."
12011207
},
1208+
"CompressionSettings": {
1209+
"type": "object",
1210+
"properties": {
1211+
"contentTypesToCompress": {
1212+
"oneOf": [
1213+
{
1214+
"type": "array",
1215+
"items": {
1216+
"type": "string"
1217+
}
1218+
},
1219+
{
1220+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1221+
}
1222+
],
1223+
"description": "List of content types on which compression applies. The value should be a valid MIME type."
1224+
},
1225+
"isCompressionEnabled": {
1226+
"oneOf": [
1227+
{
1228+
"type": "boolean"
1229+
},
1230+
{
1231+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1232+
}
1233+
],
1234+
"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."
1235+
}
1236+
},
1237+
"description": "settings for compression."
1238+
},
12021239
"CookiesMatchConditionParameters": {
12031240
"type": "object",
12041241
"properties": {
@@ -4890,9 +4927,15 @@
48904927
"type": "object",
48914928
"properties": {
48924929
"compressionSettings": {
4893-
"type": "object",
4894-
"properties": {},
4895-
"description": "compression settings."
4930+
"oneOf": [
4931+
{
4932+
"$ref": "#/definitions/CompressionSettings"
4933+
},
4934+
{
4935+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4936+
}
4937+
],
4938+
"description": "settings for compression."
48964939
},
48974940
"customDomains": {
48984941
"oneOf": [
@@ -5250,6 +5293,53 @@
52505293
],
52515294
"description": "The json object containing security policy waf parameters"
52525295
},
5296+
"SharedPrivateLinkResourceProperties": {
5297+
"type": "object",
5298+
"properties": {
5299+
"groupId": {
5300+
"type": "string",
5301+
"description": "The group id from the provider of resource the shared private link resource is for."
5302+
},
5303+
"privateLink": {
5304+
"oneOf": [
5305+
{
5306+
"$ref": "#/definitions/ResourceReference"
5307+
},
5308+
{
5309+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
5310+
}
5311+
],
5312+
"description": "Reference to another resource."
5313+
},
5314+
"privateLinkLocation": {
5315+
"type": "string",
5316+
"description": "The location of the shared private link resource"
5317+
},
5318+
"requestMessage": {
5319+
"type": "string",
5320+
"description": "The request message for requesting approval of the shared private link resource."
5321+
},
5322+
"status": {
5323+
"oneOf": [
5324+
{
5325+
"type": "string",
5326+
"enum": [
5327+
"Pending",
5328+
"Approved",
5329+
"Rejected",
5330+
"Disconnected",
5331+
"Timeout"
5332+
]
5333+
},
5334+
{
5335+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
5336+
}
5337+
],
5338+
"description": "Status of the shared private link resource. Can be Pending, Approved, Rejected, Disconnected, or Timeout."
5339+
}
5340+
},
5341+
"description": "Describes the properties of an existing Shared Private Link Resource to use when connecting to a private origin."
5342+
},
52535343
"Sku": {
52545344
"type": "object",
52555345
"properties": {

‎schemas/2021-06-01/Microsoft.Cdn.json‎

Lines changed: 143 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -886,19 +886,6 @@
886886
}
887887
],
888888
"description": "Whether to enable use of this rule. Permitted values are 'Enabled' or 'Disabled'."
889-
},
890-
"originResponseTimeoutSeconds": {
891-
"oneOf": [
892-
{
893-
"type": "integer",
894-
"minimum": 16,
895-
"maximum": 240
896-
},
897-
{
898-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
899-
}
900-
],
901-
"description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns."
902889
}
903890
},
904891
"description": "The JSON object that contains the properties required to create an endpoint."
@@ -1149,7 +1136,6 @@
11491136
},
11501137
"cacheDuration": {
11511138
"type": "string",
1152-
"format": "duration",
11531139
"description": "The duration for which the content needs to be cached. Allowed format is [d.]hh:mm:ss"
11541140
},
11551141
"isCompressionEnabled": {
@@ -1394,6 +1380,28 @@
13941380
],
13951381
"description": "Describes operator to be matched."
13961382
},
1383+
"transforms": {
1384+
"oneOf": [
1385+
{
1386+
"type": "array",
1387+
"items": {
1388+
"type": "string",
1389+
"enum": [
1390+
"Lowercase",
1391+
"Uppercase",
1392+
"Trim",
1393+
"UrlDecode",
1394+
"UrlEncode",
1395+
"RemoveNulls"
1396+
]
1397+
}
1398+
},
1399+
{
1400+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1401+
}
1402+
],
1403+
"description": "List of transforms"
1404+
},
13971405
"typeName": {
13981406
"oneOf": [
13991407
{
@@ -3307,6 +3315,28 @@
33073315
],
33083316
"description": "Describes operator to be matched"
33093317
},
3318+
"transforms": {
3319+
"oneOf": [
3320+
{
3321+
"type": "array",
3322+
"items": {
3323+
"type": "string",
3324+
"enum": [
3325+
"Lowercase",
3326+
"Uppercase",
3327+
"Trim",
3328+
"UrlDecode",
3329+
"UrlEncode",
3330+
"RemoveNulls"
3331+
]
3332+
}
3333+
},
3334+
{
3335+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3336+
}
3337+
],
3338+
"description": "List of transforms"
3339+
},
33103340
"typeName": {
33113341
"oneOf": [
33123342
{
@@ -3574,6 +3604,8 @@
35743604
"type": "string",
35753605
"enum": [
35763606
"SystemAssigned",
3607+
"UserAssigned",
3608+
"SystemAssigned, UserAssigned",
35773609
"None"
35783610
]
35793611
},
@@ -3582,6 +3614,21 @@
35823614
}
35833615
],
35843616
"description": "Type of managed service identity."
3617+
},
3618+
"userAssignedIdentities": {
3619+
"oneOf": [
3620+
{
3621+
"type": "object",
3622+
"additionalProperties": {
3623+
"$ref": "#/definitions/UserAssignedIdentity"
3624+
},
3625+
"properties": {}
3626+
},
3627+
{
3628+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3629+
}
3630+
],
3631+
"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}"
35853632
}
35863633
},
35873634
"description": "Managed service identity."
@@ -5785,23 +5832,13 @@
57855832
},
57865833
"description": "The JSON object that contains the properties of the Secret to create."
57875834
},
5788-
"SecurityPolicyParameters": {
5789-
"type": "object",
5790-
"oneOf": [
5791-
{
5792-
"$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters"
5793-
}
5794-
],
5795-
"properties": {},
5796-
"description": "The json object containing security policy parameters"
5797-
},
57985835
"SecurityPolicyProperties": {
57995836
"type": "object",
58005837
"properties": {
58015838
"parameters": {
58025839
"oneOf": [
58035840
{
5804-
"$ref": "#/definitions/SecurityPolicyParameters"
5841+
"$ref": "#/definitions/SecurityPolicyPropertiesParameters"
58055842
},
58065843
{
58075844
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -5812,6 +5849,16 @@
58125849
},
58135850
"description": "The json object that contains properties required to create a security policy"
58145851
},
5852+
"SecurityPolicyPropertiesParameters": {
5853+
"type": "object",
5854+
"oneOf": [
5855+
{
5856+
"$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters"
5857+
}
5858+
],
5859+
"properties": {},
5860+
"description": "The json object containing security policy parameters"
5861+
},
58155862
"SecurityPolicyWebApplicationFirewallAssociation": {
58165863
"type": "object",
58175864
"properties": {
@@ -5937,6 +5984,28 @@
59375984
],
59385985
"description": "Describes operator to be matched."
59395986
},
5987+
"transforms": {
5988+
"oneOf": [
5989+
{
5990+
"type": "array",
5991+
"items": {
5992+
"type": "string",
5993+
"enum": [
5994+
"Lowercase",
5995+
"Uppercase",
5996+
"Trim",
5997+
"UrlDecode",
5998+
"UrlEncode",
5999+
"RemoveNulls"
6000+
]
6001+
}
6002+
},
6003+
{
6004+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
6005+
}
6006+
],
6007+
"description": "List of transforms"
6008+
},
59406009
"typeName": {
59416010
"oneOf": [
59426011
{
@@ -6032,6 +6101,28 @@
60326101
],
60336102
"description": "Describes operator to be matched."
60346103
},
6104+
"transforms": {
6105+
"oneOf": [
6106+
{
6107+
"type": "array",
6108+
"items": {
6109+
"type": "string",
6110+
"enum": [
6111+
"Lowercase",
6112+
"Uppercase",
6113+
"Trim",
6114+
"UrlDecode",
6115+
"UrlEncode",
6116+
"RemoveNulls"
6117+
]
6118+
}
6119+
},
6120+
{
6121+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
6122+
}
6123+
],
6124+
"description": "List of transforms"
6125+
},
60356126
"typeName": {
60366127
"oneOf": [
60376128
{
@@ -6099,6 +6190,28 @@
60996190
],
61006191
"description": "Describes operator to be matched"
61016192
},
6193+
"transforms": {
6194+
"oneOf": [
6195+
{
6196+
"type": "array",
6197+
"items": {
6198+
"type": "string",
6199+
"enum": [
6200+
"Lowercase",
6201+
"Uppercase",
6202+
"Trim",
6203+
"UrlDecode",
6204+
"UrlEncode",
6205+
"RemoveNulls"
6206+
]
6207+
}
6208+
},
6209+
{
6210+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
6211+
}
6212+
],
6213+
"description": "List of transforms"
6214+
},
61026215
"typeName": {
61036216
"oneOf": [
61046217
{
@@ -6735,6 +6848,11 @@
67356848
"paramName"
67366849
],
67376850
"description": "Defines how to identify a parameter for a specific purpose e.g. expires"
6851+
},
6852+
"UserAssignedIdentity": {
6853+
"type": "object",
6854+
"properties": {},
6855+
"description": "User Assigned identity."
67386856
}
67396857
}
67406858
}

0 commit comments

Comments
 (0)