Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server variable #11

Merged
merged 8 commits into from
Jul 27, 2021
Merged

server variable #11

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9ea1da
wip server variable
yunheMsft Jul 9, 2021
f19afb5
Merge branch 'cdn-swagger-2021-06-01' into yunhe/cdn-server-variable
yunheMsft Jul 21, 2021
1fcec33
server-variable udpates
yunheMsft Jul 21, 2021
3c58cd9
server port transform
yunheMsft Jul 21, 2021
2fd25b4
socket address
yunheMsft Jul 21, 2021
0a83af5
update server variable
yunheMsft Jul 22, 2021
ea3d097
resolve comments
yunheMsft Jul 23, 2021
937b119
revert unwanted change
yunheMsft Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
322 changes: 314 additions & 8 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2801,7 +2801,12 @@
"UrlFileName",
"HttpVersion",
"Cookies",
"IsDevice"
"IsDevice",
"SocketAddr",
"ClientPort",
"ServerPort",
"HostName",
"SslProtocol"
],
"x-ms-enum": {
"name": "MatchVariable",
Expand Down Expand Up @@ -3062,6 +3067,96 @@
}
}
},
"DeliveryRuleSocketAddrCondition": {
"description": "Defines the SocketAddr condition for the delivery rule.",
"x-ms-discriminator-value": "SocketAddr",
"allOf": [
{
"$ref": "#/definitions/DeliveryRuleCondition"
}
],
"required": [
"parameters"
],
"properties": {
"parameters": {
"description": "Defines the parameters for the condition.",
"$ref": "#/definitions/SocketAddrMatchConditionParameters"
}
}
},
"DeliveryRuleRequestClientPortCondition": {
"description": "Defines the RequestClientPort condition for the delivery rule.",
"x-ms-discriminator-value": "RequestClientPort",
"allOf": [
{
"$ref": "#/definitions/DeliveryRuleCondition"
}
],
"required": [
"parameters"
],
"properties": {
"parameters": {
"description": "Defines the parameters for the condition.",
"$ref": "#/definitions/RequestClientPortMatchConditionParameters"
}
}
},
"DeliveryRuleServerPortCondition": {
"description": "Defines the ServerPort condition for the delivery rule.",
"x-ms-discriminator-value": "ServerPort",
"allOf": [
{
"$ref": "#/definitions/DeliveryRuleCondition"
}
],
"required": [
"parameters"
],
"properties": {
"parameters": {
"description": "Defines the parameters for the condition.",
"$ref": "#/definitions/ServerPortMatchConditionParameters"
}
}
},
"DeliveryRuleRequestHostNameCondition": {
"description": "Defines the RequestHostName condition for the delivery rule.",
"x-ms-discriminator-value": "RequestHostName",
"allOf": [
{
"$ref": "#/definitions/DeliveryRuleCondition"
}
],
"required": [
"parameters"
],
"properties": {
"parameters": {
"description": "Defines the parameters for the condition.",
"$ref": "#/definitions/RequestHostNameMatchConditionParameters"
}
}
},
"DeliveryRuleSslProtocolCondition": {
"description": "Defines the SslProtocol condition for the delivery rule.",
"x-ms-discriminator-value": "SslProtocol",
"allOf": [
{
"$ref": "#/definitions/DeliveryRuleCondition"
}
],
"required": [
"parameters"
],
"properties": {
"parameters": {
"description": "Defines the parameters for the condition.",
"$ref": "#/definitions/SslProtocolMatchConditionParameters"
}
}
},
"RemoteAddressMatchConditionParameters": {
"description": "Defines the parameters for RemoteAddress match conditions",
"required": [
Expand Down Expand Up @@ -3098,13 +3193,6 @@
"items": {
"type": "string"
}
},
"transforms": {
"description": "List of transforms",
"type": "array",
"items": {
"$ref": "#/definitions/transform"
}
yunheMsft marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
Expand Down Expand Up @@ -3756,6 +3844,182 @@
"Desktop"
]
}
}
}
},
"SocketAddrMatchConditionParameters": {
"description": "Defines the parameters for SocketAddr match conditions",
"required": [
"operator",
"typeName"
],
"properties": {
"typeName": {
"type": "string",
"enum": [
"DeliveryRuleSocketAddrConditionParameters"
]
},
"operator": {
"description": "Describes operator to be matched",
"type": "string",
"enum": [
"Any",
"IPMatch"
yunheMsft marked this conversation as resolved.
Show resolved Hide resolved
],
"x-ms-enum": {
"name": "SocketAddrOperator",
"modelAsString": true
}
},
"negateCondition": {
"description": "Describes if this is negate condition or not",
"type": "boolean"
},
"matchValues": {
"description": "The match value for the condition of the delivery rule",
"type": "array",
"items": {
"type": "string"
}
}
}
},
"RequestClientPortMatchConditionParameters": {
"description": "Defines the parameters for RequestClientPort match conditions",
"required": [
"operator",
"typeName"
],
"properties": {
"typeName": {
"type": "string",
"enum": [
"DeliveryRuleRequestClientPortConditionParameters"
]
},
"operator": {
"description": "Describes operator to be matched",
"type": "string",
"enum": [
"Any",
"Equal",
"Contains",
"BeginsWith",
"EndsWith",
"LessThan",
"LessThanOrEqual",
"GreaterThan",
"GreaterThanOrEqual",
"RegEx"
yunheMsft marked this conversation as resolved.
Show resolved Hide resolved
],
"x-ms-enum": {
"name": "RequestClientPortOperator",
"modelAsString": true
}
},
"negateCondition": {
"description": "Describes if this is negate condition or not",
"type": "boolean"
},
"matchValues": {
"description": "The match value for the condition of the delivery rule",
"type": "array",
"items": {
"type": "string"
}
}
}
},
"ServerPortMatchConditionParameters": {
"description": "Defines the parameters for ServerPort match conditions",
"required": [
"operator",
"typeName"
],
"properties": {
"typeName": {
"type": "string",
"enum": [
"DeliveryRuleServerPortConditionParameters"
]
},
"operator": {
"description": "Describes operator to be matched",
"type": "string",
"enum": [
"Any",
yunheMsft marked this conversation as resolved.
Show resolved Hide resolved
"Equal",
"Contains",
"BeginsWith",
"EndsWith",
"LessThan",
"LessThanOrEqual",
"GreaterThan",
"GreaterThanOrEqual",
"RegEx"
],
"x-ms-enum": {
"name": "ServerPortOperator",
"modelAsString": true
}
},
"negateCondition": {
"description": "Describes if this is negate condition or not",
"type": "boolean"
},
"matchValues": {
"description": "The match value for the condition of the delivery rule",
"type": "array",
"items": {
"type": "string"
}
}
}
},
"RequestHostNameMatchConditionParameters": {
"description": "Defines the parameters for RequestHostName match conditions",
"required": [
"operator",
"typeName"
],
"properties": {
"typeName": {
"type": "string",
"enum": [
"DeliveryRuleRequestHostNameConditionParameters"
]
},
"operator": {
"description": "Describes operator to be matched",
"type": "string",
"enum": [
"Any",
"Equal",
"Contains",
"BeginsWith",
"EndsWith",
"LessThan",
"LessThanOrEqual",
"GreaterThan",
"GreaterThanOrEqual",
"RegEx"
yunheMsft marked this conversation as resolved.
Show resolved Hide resolved
],
"x-ms-enum": {
"name": "RequestHostNameOperator",
"modelAsString": true
}
},
"negateCondition": {
"description": "Describes if this is negate condition or not",
"type": "boolean"
},
"matchValues": {
"description": "The match value for the condition of the delivery rule",
"type": "array",
"items": {
"type": "string"
}
},
"transforms": {
"description": "List of transforms",
Expand All @@ -3766,6 +4030,48 @@
}
}
},
"SslProtocolMatchConditionParameters": {
"description": "Defines the parameters for SslProtocol match conditions",
"required": [
"operator",
"typeName"
],
"properties": {
"typeName": {
"type": "string",
"enum": [
"DeliveryRuleSslProtocolConditionParameters"
]
},
"operator": {
"description": "Describes operator to be matched",
"type": "string",
"enum": [
"Equal"
],
"x-ms-enum": {
"name": "SslProtocolOperator",
"modelAsString": true
}
},
"negateCondition": {
"description": "Describes if this is negate condition or not",
"type": "boolean"
},
"matchValues": {
"description": "The match value for the condition of the delivery rule",
"type": "array",
"items": {
"type": "string",
"enum": [
"TLSv1",
"TLSv1.1",
"TLSv1.2"
]
}
}
}
},
"DeliveryRuleAction": {
"description": "An action for the delivery rule.",
"discriminator": "name",
Expand Down