Skip to content

Commit 273d638

Browse files
akshaysnguptaakshaysngupta
authored
fix bug in determining default listener frontend (#1538)
1 parent ffd557c commit 273d638

37 files changed

+523
-488
lines changed

‎functional_tests/cookie_name.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
],
119119
"httpListeners": [
120120
{
121-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-e1903c8aa3446b7b3207aec6d6ecba8a",
122-
"name": "fl-e1903c8aa3446b7b3207aec6d6ecba8a",
121+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-452c578b4f742bd7a3927c3caf2b604e",
122+
"name": "fl-452c578b4f742bd7a3927c3caf2b604e",
123123
"properties": {
124124
"frontendIPConfiguration": {
125125
"id": "--front-end-ip-id-1--"
@@ -198,16 +198,16 @@
198198
"redirectConfigurations": [],
199199
"requestRoutingRules": [
200200
{
201-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-e1903c8aa3446b7b3207aec6d6ecba8a",
202-
"name": "rr-e1903c8aa3446b7b3207aec6d6ecba8a",
201+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-452c578b4f742bd7a3927c3caf2b604e",
202+
"name": "rr-452c578b4f742bd7a3927c3caf2b604e",
203203
"properties": {
204204
"httpListener": {
205-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-e1903c8aa3446b7b3207aec6d6ecba8a"
205+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-452c578b4f742bd7a3927c3caf2b604e"
206206
},
207207
"priority": 19500,
208208
"ruleType": "PathBasedRouting",
209209
"urlPathMap": {
210-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/urlPathMaps/url-e1903c8aa3446b7b3207aec6d6ecba8a"
210+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/urlPathMaps/url-452c578b4f742bd7a3927c3caf2b604e"
211211
}
212212
}
213213
}
@@ -221,8 +221,8 @@
221221
"sslCertificates": [],
222222
"urlPathMaps": [
223223
{
224-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/urlPathMaps/url-e1903c8aa3446b7b3207aec6d6ecba8a",
225-
"name": "url-e1903c8aa3446b7b3207aec6d6ecba8a",
224+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/urlPathMaps/url-452c578b4f742bd7a3927c3caf2b604e",
225+
"name": "url-452c578b4f742bd7a3927c3caf2b604e",
226226
"properties": {
227227
"defaultBackendAddressPool": {
228228
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---namespace---hello-world-b-80-bp-80"
@@ -232,7 +232,7 @@
232232
},
233233
"pathRules": [
234234
{
235-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/urlPathMaps/url-e1903c8aa3446b7b3207aec6d6ecba8a/pathRules/pr---namespace-----name--SlashNothingSlashSomething-rule-0-path-1",
235+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/urlPathMaps/url-452c578b4f742bd7a3927c3caf2b604e/pathRules/pr---namespace-----name--SlashNothingSlashSomething-rule-0-path-1",
236236
"name": "pr---namespace-----name--SlashNothingSlashSomething-rule-0-path-1",
237237
"properties": {
238238
"backendAddressPool": {

‎functional_tests/duplicate_ports.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -92,40 +92,40 @@
9292
],
9393
"httpListeners": [
9494
{
95-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-08ba2bb7da9df5927d900fca8ce96ba5",
96-
"name": "fl-08ba2bb7da9df5927d900fca8ce96ba5",
95+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-43577dd217dfc020e151430368b4c910",
96+
"name": "fl-43577dd217dfc020e151430368b4c910",
9797
"properties": {
9898
"frontendIPConfiguration": {
9999
"id": "--front-end-ip-id-1--"
100100
},
101101
"frontendPort": {
102-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/frontendPorts/fp-80"
102+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/frontendPorts/fp-443"
103103
},
104104
"hostNames": [
105105
"foo.baz"
106106
],
107-
"protocol": "Http",
108-
"requireServerNameIndication": false
107+
"protocol": "Https",
108+
"requireServerNameIndication": false,
109+
"sslCertificate": {
110+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/sslCertificates/cert---namespace-----the-name-of-the-secret--"
111+
}
109112
}
110113
},
111114
{
112-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-175bc9385b96d7116527143f35cdfdea",
113-
"name": "fl-175bc9385b96d7116527143f35cdfdea",
115+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-460bda00727325679d31c1f44e618448",
116+
"name": "fl-460bda00727325679d31c1f44e618448",
114117
"properties": {
115118
"frontendIPConfiguration": {
116119
"id": "--front-end-ip-id-1--"
117120
},
118121
"frontendPort": {
119-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/frontendPorts/fp-443"
122+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/frontendPorts/fp-80"
120123
},
121124
"hostNames": [
122125
"foo.baz"
123126
],
124-
"protocol": "Https",
125-
"requireServerNameIndication": false,
126-
"sslCertificate": {
127-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/sslCertificates/cert---namespace-----the-name-of-the-secret--"
128-
}
127+
"protocol": "Http",
128+
"requireServerNameIndication": false
129129
}
130130
}
131131
],
@@ -178,47 +178,47 @@
178178
],
179179
"redirectConfigurations": [
180180
{
181-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/redirectConfigurations/sslr-fl-175bc9385b96d7116527143f35cdfdea",
182-
"name": "sslr-fl-175bc9385b96d7116527143f35cdfdea",
181+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/redirectConfigurations/sslr-fl-43577dd217dfc020e151430368b4c910",
182+
"name": "sslr-fl-43577dd217dfc020e151430368b4c910",
183183
"properties": {
184184
"includePath": true,
185185
"includeQueryString": true,
186186
"redirectType": "Permanent",
187187
"targetListener": {
188-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-175bc9385b96d7116527143f35cdfdea"
188+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-43577dd217dfc020e151430368b4c910"
189189
}
190190
}
191191
}
192192
],
193193
"requestRoutingRules": [
194194
{
195-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-08ba2bb7da9df5927d900fca8ce96ba5",
196-
"name": "rr-08ba2bb7da9df5927d900fca8ce96ba5",
195+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-43577dd217dfc020e151430368b4c910",
196+
"name": "rr-43577dd217dfc020e151430368b4c910",
197197
"properties": {
198+
"backendAddressPool": {
199+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---namespace---hello-world-80-bp-80"
200+
},
201+
"backendHttpSettings": {
202+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/bp---namespace---hello-world-80-80---name--"
203+
},
198204
"httpListener": {
199-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-08ba2bb7da9df5927d900fca8ce96ba5"
205+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-43577dd217dfc020e151430368b4c910"
200206
},
201207
"priority": 19000,
202-
"redirectConfiguration": {
203-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/redirectConfigurations/sslr-fl-175bc9385b96d7116527143f35cdfdea"
204-
},
205208
"ruleType": "Basic"
206209
}
207210
},
208211
{
209-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-175bc9385b96d7116527143f35cdfdea",
210-
"name": "rr-175bc9385b96d7116527143f35cdfdea",
212+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-460bda00727325679d31c1f44e618448",
213+
"name": "rr-460bda00727325679d31c1f44e618448",
211214
"properties": {
212-
"backendAddressPool": {
213-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---namespace---hello-world-80-bp-80"
214-
},
215-
"backendHttpSettings": {
216-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/bp---namespace---hello-world-80-80---name--"
217-
},
218215
"httpListener": {
219-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-175bc9385b96d7116527143f35cdfdea"
216+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-460bda00727325679d31c1f44e618448"
220217
},
221218
"priority": 19005,
219+
"redirectConfiguration": {
220+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/redirectConfigurations/sslr-fl-43577dd217dfc020e151430368b4c910"
221+
},
222222
"ruleType": "Basic"
223223
}
224224
}

‎functional_tests/empty_cluster_with_private_ip.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
],
5555
"httpListeners": [
5656
{
57-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-ac133916d522c571f2d9ef8f3b8a25d3",
58-
"name": "fl-ac133916d522c571f2d9ef8f3b8a25d3",
57+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-22ee2b2b23866544c9beb9eab8459a2b",
58+
"name": "fl-22ee2b2b23866544c9beb9eab8459a2b",
5959
"properties": {
6060
"frontendIPConfiguration": {
6161
"id": "--front-end-ip-id-2--"
@@ -104,8 +104,8 @@
104104
"redirectConfigurations": [],
105105
"requestRoutingRules": [
106106
{
107-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-ac133916d522c571f2d9ef8f3b8a25d3",
108-
"name": "rr-ac133916d522c571f2d9ef8f3b8a25d3",
107+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/requestRoutingRules/rr-22ee2b2b23866544c9beb9eab8459a2b",
108+
"name": "rr-22ee2b2b23866544c9beb9eab8459a2b",
109109
"properties": {
110110
"backendAddressPool": {
111111
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/defaultaddresspool"
@@ -114,7 +114,7 @@
114114
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/defaulthttpsetting"
115115
},
116116
"httpListener": {
117-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-ac133916d522c571f2d9ef8f3b8a25d3"
117+
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/httpListeners/fl-22ee2b2b23866544c9beb9eab8459a2b"
118118
},
119119
"priority": 19500,
120120
"ruleType": "Basic"

0 commit comments

Comments
 (0)