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

2020 01 01 updates to rules engine caching behavior #8455

Merged
merged 5 commits into from
Feb 25, 2020
Merged

2020 01 01 updates to rules engine caching behavior #8455

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80037e8
2020 01 01 updates to rules engine caching behavior
aramesh-msft Feb 20, 2020
104d4f5
renamed privateLinkResourceId to privateLinkAlias
MoustafaEid Feb 21, 2020
bc86b28
fix x-nullable usage
aramesh-msft Feb 21, 2020
dfe8397
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
aramesh-msft Feb 24, 2020
e9213c2
Change cacheDuration to "format":"duration"
aramesh-msft Feb 24, 2020
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
19 changes: 13 additions & 6 deletions ...ntdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"priority": 1
},
{
"privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
"privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice [](start = 39, length = 79)

this this a real alias?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ensure that any example private link aliases do not actually exist in production

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a real alias, I generated it as an example

"privateLinkApprovalMessage": "Please approve this request to connect to the Private Link",
"address": "10.0.1.5",
"httpPort": 80,
Expand Down Expand Up @@ -167,7 +167,9 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1"
}
},
"rulesEngine": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1",
"rulesEngine": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1"
},
"enabledState": "Enabled"
}
}
Expand Down Expand Up @@ -216,7 +218,7 @@
"priority": 1
},
{
"privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
"privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a production alias, this was generated to use for the examples

"privateEndpointStatus": "Pending",
"privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
"address": "10.0.1.5",
Expand Down Expand Up @@ -306,7 +308,9 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1"
}
},
"rulesEngine": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1",
"rulesEngine": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1"
},
"enabledState": "Enabled"
}
}
Expand Down Expand Up @@ -355,7 +359,7 @@
"priority": 1
},
{
"privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
"privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

"privateEndpointStatus": "Approved",
"privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
"address": "10.0.1.5",
Expand Down Expand Up @@ -445,6 +449,9 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1"
}
},
"rulesEngine": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1"
},
"enabledState": "Enabled"
}
}
Expand Down Expand Up @@ -493,7 +500,7 @@
"priority": 1
},
{
"privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
"privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

"privateEndpointStatus": "Approved",
"privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
"address": "10.0.1.5",
Expand Down
4 changes: 2 additions & 2 deletions ...frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"priority": 1
},
{
"privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
"privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

"privateEndpointStatus": "Approved",
"privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
"address": "10.0.1.5",
Expand Down Expand Up @@ -138,7 +138,7 @@
],
"rulesEngines": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/routingRules/rulesEngine1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1",
"name": "rulesEngine1",
"properties": {
"rules": [
Expand Down
2 changes: 1 addition & 1 deletion ...rontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"priority": 1
},
{
"privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
"privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

"privateEndpointStatus": "Approved",
"privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
"address": "10.0.1.5",
Expand Down
2 changes: 1 addition & 1 deletion ...tdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorListAll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"priority": 1
},
{
"privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
"privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

"privateEndpointStatus": "Approved",
"privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
"address": "10.0.1.5",
Expand Down
34 changes: 34 additions & 0 deletions ...urce-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,40 @@
]
}
]
},
{
"name": "Rule3",
"priority": 3,
"action": {
"routeConfigurationOverride": {
"@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration",
"customForwardingPath": null,
"forwardingProtocol": "HttpsOnly",
"cacheConfiguration": {
"queryParameterStripDirective": "StripOnly",
"queryParameters": "a=b,p=q",
"dynamicCompression": "Disabled",
"cacheDuration": "1.10:10:09"
},
"backendPool": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1"
}
}
},
"matchConditions": [
{
"rulesEngineMatchVariable": "RequestHeader",
"rulesEngineOperator": "Equal",
"rulesEngineMatchValue": [
"allowoverride"
],
"transforms": [
"Lowercase"
],
"negateCondition": false,
"selector": "Rules-Engine-Route-Forward"
}
]
}
]
}
Expand Down
34 changes: 34 additions & 0 deletions ...esource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,40 @@
]
}
]
},
{
"name": "Rule3",
"priority": 3,
"action": {
"routeConfigurationOverride": {
"@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration",
"customForwardingPath": null,
"forwardingProtocol": "HttpsOnly",
"cacheConfiguration": {
"queryParameterStripDirective": "StripOnly",
"queryParameters": "a=b,p=q",
"dynamicCompression": "Disabled",
"cacheDuration": "1.10:10:09"
},
"backendPool": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1"
}
}
},
"matchConditions": [
{
"rulesEngineMatchVariable": "RequestHeader",
"rulesEngineOperator": "Equal",
"rulesEngineMatchValue": [
"allowoverride"
],
"transforms": [
"Lowercase"
],
"negateCondition": false,
"selector": "Rules-Engine-Route-Forward"
}
]
}
]
}
Expand Down
34 changes: 34 additions & 0 deletions ...source-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,40 @@
]
}
]
},
{
"name": "Rule3",
"priority": 3,
"action": {
"routeConfigurationOverride": {
"@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration",
"customForwardingPath": null,
"forwardingProtocol": "HttpsOnly",
"cacheConfiguration": {
"queryParameterStripDirective": "StripOnly",
"queryParameters": "a=b,p=q",
"dynamicCompression": "Disabled",
"cacheDuration": "1.10:10:09"
},
"backendPool": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1"
}
}
},
"matchConditions": [
{
"rulesEngineMatchVariable": "RequestHeader",
"rulesEngineOperator": "Equal",
"rulesEngineMatchValue": [
"allowoverride"
],
"transforms": [
"Lowercase"
],
"negateCondition": false,
"selector": "Rules-Engine-Route-Forward"
}
]
}
]
}
Expand Down
18 changes: 15 additions & 3 deletions specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/frontdoor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,8 +1237,8 @@
"description": "Location of the backend (IP address or FQDN)",
"type": "string"
},
"privateLinkResourceId": {
"description": "If this backend is private, provide the Private Link resource Id. Populating this optional field indicates that this backend is 'Private'",
"privateLinkAlias": {
"description": "The Alias of the Private Link resource. Populating this optional field indicates that this backend is 'Private'",
"type": "string"
},
"privateEndpointStatus": {
Expand Down Expand Up @@ -1570,14 +1570,21 @@
"description": "Treatment of URL query terms when forming the cache key.",
"enum": [
"StripNone",
"StripAll"
"StripAll",
"StripOnly",
"StripAllExcept"
],
"type": "string",
"x-ms-enum": {
"name": "FrontDoorQuery",
"modelAsString": true
}
},
"queryParameters": {
"description": "query parameters to include or exclude (comma separated).",
"type": "string",
"x-nullable": true
Copy link
Contributor

@johsun-msft johsun-msft Feb 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x-nullable": true [](start = 11, length = 17)

do we need this?

seems like even recently there's problem with x-nullable in autorest
Azure/autorest#3300 #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for letting me know, I removed x-nullable field.

In reply to: 382354208 [](ancestors = 382354208)

},
"dynamicCompression": {
"description": "Whether to use dynamic compression for cached content",
"enum": [
Expand All @@ -1589,6 +1596,11 @@
"name": "DynamicCompressionEnabled",
"modelAsString": true
}
},
"cacheDuration": {
"description": "The duration for which the content needs to be cached. Allowed format is [d.]hh:mm:ss",
"type": "string",
"x-nullable": true
}
}
},
Expand Down