Skip to content

Commit d6eddf6

Browse files
yunheMsftyunheMsft
authored
server variable (Azure#11)
* wip server variable * server-variable udpates * server port transform * socket address * update server variable * resolve comments * revert unwanted change
1 parent 7424889 commit d6eddf6

File tree

1 file changed

+314
-8
lines changed
  • specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01

1 file changed

+314
-8
lines changed

‎specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json‎

Lines changed: 314 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2801,7 +2801,12 @@
28012801
"UrlFileName",
28022802
"HttpVersion",
28032803
"Cookies",
2804-
"IsDevice"
2804+
"IsDevice",
2805+
"SocketAddr",
2806+
"ClientPort",
2807+
"ServerPort",
2808+
"HostName",
2809+
"SslProtocol"
28052810
],
28062811
"x-ms-enum": {
28072812
"name": "MatchVariable",
@@ -3062,6 +3067,96 @@
30623067
}
30633068
}
30643069
},
3070+
"DeliveryRuleSocketAddrCondition": {
3071+
"description": "Defines the SocketAddr condition for the delivery rule.",
3072+
"x-ms-discriminator-value": "SocketAddr",
3073+
"allOf": [
3074+
{
3075+
"$ref": "#/definitions/DeliveryRuleCondition"
3076+
}
3077+
],
3078+
"required": [
3079+
"parameters"
3080+
],
3081+
"properties": {
3082+
"parameters": {
3083+
"description": "Defines the parameters for the condition.",
3084+
"$ref": "#/definitions/SocketAddrMatchConditionParameters"
3085+
}
3086+
}
3087+
},
3088+
"DeliveryRuleRequestClientPortCondition": {
3089+
"description": "Defines the RequestClientPort condition for the delivery rule.",
3090+
"x-ms-discriminator-value": "RequestClientPort",
3091+
"allOf": [
3092+
{
3093+
"$ref": "#/definitions/DeliveryRuleCondition"
3094+
}
3095+
],
3096+
"required": [
3097+
"parameters"
3098+
],
3099+
"properties": {
3100+
"parameters": {
3101+
"description": "Defines the parameters for the condition.",
3102+
"$ref": "#/definitions/RequestClientPortMatchConditionParameters"
3103+
}
3104+
}
3105+
},
3106+
"DeliveryRuleServerPortCondition": {
3107+
"description": "Defines the ServerPort condition for the delivery rule.",
3108+
"x-ms-discriminator-value": "ServerPort",
3109+
"allOf": [
3110+
{
3111+
"$ref": "#/definitions/DeliveryRuleCondition"
3112+
}
3113+
],
3114+
"required": [
3115+
"parameters"
3116+
],
3117+
"properties": {
3118+
"parameters": {
3119+
"description": "Defines the parameters for the condition.",
3120+
"$ref": "#/definitions/ServerPortMatchConditionParameters"
3121+
}
3122+
}
3123+
},
3124+
"DeliveryRuleRequestHostNameCondition": {
3125+
"description": "Defines the RequestHostName condition for the delivery rule.",
3126+
"x-ms-discriminator-value": "RequestHostName",
3127+
"allOf": [
3128+
{
3129+
"$ref": "#/definitions/DeliveryRuleCondition"
3130+
}
3131+
],
3132+
"required": [
3133+
"parameters"
3134+
],
3135+
"properties": {
3136+
"parameters": {
3137+
"description": "Defines the parameters for the condition.",
3138+
"$ref": "#/definitions/RequestHostNameMatchConditionParameters"
3139+
}
3140+
}
3141+
},
3142+
"DeliveryRuleSslProtocolCondition": {
3143+
"description": "Defines the SslProtocol condition for the delivery rule.",
3144+
"x-ms-discriminator-value": "SslProtocol",
3145+
"allOf": [
3146+
{
3147+
"$ref": "#/definitions/DeliveryRuleCondition"
3148+
}
3149+
],
3150+
"required": [
3151+
"parameters"
3152+
],
3153+
"properties": {
3154+
"parameters": {
3155+
"description": "Defines the parameters for the condition.",
3156+
"$ref": "#/definitions/SslProtocolMatchConditionParameters"
3157+
}
3158+
}
3159+
},
30653160
"RemoteAddressMatchConditionParameters": {
30663161
"description": "Defines the parameters for RemoteAddress match conditions",
30673162
"required": [
@@ -3098,13 +3193,6 @@
30983193
"items": {
30993194
"type": "string"
31003195
}
3101-
},
3102-
"transforms": {
3103-
"description": "List of transforms",
3104-
"type": "array",
3105-
"items": {
3106-
"$ref": "#/definitions/transform"
3107-
}
31083196
}
31093197
}
31103198
},
@@ -3756,6 +3844,182 @@
37563844
"Desktop"
37573845
]
37583846
}
3847+
}
3848+
}
3849+
},
3850+
"SocketAddrMatchConditionParameters": {
3851+
"description": "Defines the parameters for SocketAddr match conditions",
3852+
"required": [
3853+
"operator",
3854+
"typeName"
3855+
],
3856+
"properties": {
3857+
"typeName": {
3858+
"type": "string",
3859+
"enum": [
3860+
"DeliveryRuleSocketAddrConditionParameters"
3861+
]
3862+
},
3863+
"operator": {
3864+
"description": "Describes operator to be matched",
3865+
"type": "string",
3866+
"enum": [
3867+
"Any",
3868+
"IPMatch"
3869+
],
3870+
"x-ms-enum": {
3871+
"name": "SocketAddrOperator",
3872+
"modelAsString": true
3873+
}
3874+
},
3875+
"negateCondition": {
3876+
"description": "Describes if this is negate condition or not",
3877+
"type": "boolean"
3878+
},
3879+
"matchValues": {
3880+
"description": "The match value for the condition of the delivery rule",
3881+
"type": "array",
3882+
"items": {
3883+
"type": "string"
3884+
}
3885+
}
3886+
}
3887+
},
3888+
"RequestClientPortMatchConditionParameters": {
3889+
"description": "Defines the parameters for RequestClientPort match conditions",
3890+
"required": [
3891+
"operator",
3892+
"typeName"
3893+
],
3894+
"properties": {
3895+
"typeName": {
3896+
"type": "string",
3897+
"enum": [
3898+
"DeliveryRuleRequestClientPortConditionParameters"
3899+
]
3900+
},
3901+
"operator": {
3902+
"description": "Describes operator to be matched",
3903+
"type": "string",
3904+
"enum": [
3905+
"Any",
3906+
"Equal",
3907+
"Contains",
3908+
"BeginsWith",
3909+
"EndsWith",
3910+
"LessThan",
3911+
"LessThanOrEqual",
3912+
"GreaterThan",
3913+
"GreaterThanOrEqual",
3914+
"RegEx"
3915+
],
3916+
"x-ms-enum": {
3917+
"name": "RequestClientPortOperator",
3918+
"modelAsString": true
3919+
}
3920+
},
3921+
"negateCondition": {
3922+
"description": "Describes if this is negate condition or not",
3923+
"type": "boolean"
3924+
},
3925+
"matchValues": {
3926+
"description": "The match value for the condition of the delivery rule",
3927+
"type": "array",
3928+
"items": {
3929+
"type": "string"
3930+
}
3931+
}
3932+
}
3933+
},
3934+
"ServerPortMatchConditionParameters": {
3935+
"description": "Defines the parameters for ServerPort match conditions",
3936+
"required": [
3937+
"operator",
3938+
"typeName"
3939+
],
3940+
"properties": {
3941+
"typeName": {
3942+
"type": "string",
3943+
"enum": [
3944+
"DeliveryRuleServerPortConditionParameters"
3945+
]
3946+
},
3947+
"operator": {
3948+
"description": "Describes operator to be matched",
3949+
"type": "string",
3950+
"enum": [
3951+
"Any",
3952+
"Equal",
3953+
"Contains",
3954+
"BeginsWith",
3955+
"EndsWith",
3956+
"LessThan",
3957+
"LessThanOrEqual",
3958+
"GreaterThan",
3959+
"GreaterThanOrEqual",
3960+
"RegEx"
3961+
],
3962+
"x-ms-enum": {
3963+
"name": "ServerPortOperator",
3964+
"modelAsString": true
3965+
}
3966+
},
3967+
"negateCondition": {
3968+
"description": "Describes if this is negate condition or not",
3969+
"type": "boolean"
3970+
},
3971+
"matchValues": {
3972+
"description": "The match value for the condition of the delivery rule",
3973+
"type": "array",
3974+
"items": {
3975+
"type": "string"
3976+
}
3977+
}
3978+
}
3979+
},
3980+
"RequestHostNameMatchConditionParameters": {
3981+
"description": "Defines the parameters for RequestHostName match conditions",
3982+
"required": [
3983+
"operator",
3984+
"typeName"
3985+
],
3986+
"properties": {
3987+
"typeName": {
3988+
"type": "string",
3989+
"enum": [
3990+
"DeliveryRuleRequestHostNameConditionParameters"
3991+
]
3992+
},
3993+
"operator": {
3994+
"description": "Describes operator to be matched",
3995+
"type": "string",
3996+
"enum": [
3997+
"Any",
3998+
"Equal",
3999+
"Contains",
4000+
"BeginsWith",
4001+
"EndsWith",
4002+
"LessThan",
4003+
"LessThanOrEqual",
4004+
"GreaterThan",
4005+
"GreaterThanOrEqual",
4006+
"RegEx"
4007+
],
4008+
"x-ms-enum": {
4009+
"name": "RequestHostNameOperator",
4010+
"modelAsString": true
4011+
}
4012+
},
4013+
"negateCondition": {
4014+
"description": "Describes if this is negate condition or not",
4015+
"type": "boolean"
4016+
},
4017+
"matchValues": {
4018+
"description": "The match value for the condition of the delivery rule",
4019+
"type": "array",
4020+
"items": {
4021+
"type": "string"
4022+
}
37594023
},
37604024
"transforms": {
37614025
"description": "List of transforms",
@@ -3766,6 +4030,48 @@
37664030
}
37674031
}
37684032
},
4033+
"SslProtocolMatchConditionParameters": {
4034+
"description": "Defines the parameters for SslProtocol match conditions",
4035+
"required": [
4036+
"operator",
4037+
"typeName"
4038+
],
4039+
"properties": {
4040+
"typeName": {
4041+
"type": "string",
4042+
"enum": [
4043+
"DeliveryRuleSslProtocolConditionParameters"
4044+
]
4045+
},
4046+
"operator": {
4047+
"description": "Describes operator to be matched",
4048+
"type": "string",
4049+
"enum": [
4050+
"Equal"
4051+
],
4052+
"x-ms-enum": {
4053+
"name": "SslProtocolOperator",
4054+
"modelAsString": true
4055+
}
4056+
},
4057+
"negateCondition": {
4058+
"description": "Describes if this is negate condition or not",
4059+
"type": "boolean"
4060+
},
4061+
"matchValues": {
4062+
"description": "The match value for the condition of the delivery rule",
4063+
"type": "array",
4064+
"items": {
4065+
"type": "string",
4066+
"enum": [
4067+
"TLSv1",
4068+
"TLSv1.1",
4069+
"TLSv1.2"
4070+
]
4071+
}
4072+
}
4073+
}
4074+
},
37694075
"DeliveryRuleAction": {
37704076
"description": "An action for the delivery rule.",
37714077
"discriminator": "name",

0 commit comments

Comments
 (0)