Skip to content

Commit 0241709

Browse files
kevin85421kevin85421
committed
Rename AddHeaders to AddHeaderDirectives
1 parent 9d8188d commit 0241709

File tree

3 files changed

+103
-103
lines changed

3 files changed

+103
-103
lines changed

‎internal/mode/static/nginx/config/http/config.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ type Server struct {
1212

1313
// Location holds all configuration for an HTTP location.
1414
type Location struct {
15-
Return *Return
16-
Rewrites []string
17-
Path string
18-
ProxyPass string
19-
HTTPMatchVar string
20-
ProxySetHeaders []Header
21-
AddHeaders []Header
15+
Return *Return
16+
Rewrites []string
17+
Path string
18+
ProxyPass string
19+
HTTPMatchVar string
20+
ProxySetHeaders []Header
21+
AddHeaderDirectives []Header
2222
}
2323

2424
// Header defines a HTTP header to be passed to the proxied server.

‎internal/mode/static/nginx/config/servers.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func updateLocationsForFilters(
247247

248248
rewrites := createRewritesValForRewriteFilter(filters.RequestURLRewrite, path)
249249
proxySetHeaders := generateProxySetHeaders(&matchRule.Filters)
250-
responseAddHeaders := generateAddHeaders(&matchRule.Filters)
250+
addHeaderDirectives := generateAddHeaderDirectives(&matchRule.Filters)
251251
proxyPass := createProxyPass(matchRule.BackendGroup, matchRule.Filters.RequestURLRewrite)
252252
for i := range buildLocations {
253253
if rewrites != nil {
@@ -256,7 +256,7 @@ func updateLocationsForFilters(
256256
}
257257
}
258258
buildLocations[i].ProxySetHeaders = proxySetHeaders
259-
buildLocations[i].AddHeaders = responseAddHeaders
259+
buildLocations[i].AddHeaderDirectives = addHeaderDirectives
260260
buildLocations[i].ProxyPass = proxyPass
261261
}
262262

@@ -489,7 +489,7 @@ func generateProxySetHeaders(filters *dataplane.HTTPFilters) []http.Header {
489489
return append(proxySetHeaders, headers...)
490490
}
491491

492-
func generateAddHeaders(filters *dataplane.HTTPFilters) []http.Header {
492+
func generateAddHeaderDirectives(filters *dataplane.HTTPFilters) []http.Header {
493493
headers := make([]http.Header, len(baseHeaders))
494494
copy(headers, baseHeaders)
495495

‎internal/mode/static/nginx/config/servers_test.go

+93-93
Original file line numberDiff line numberDiff line change
@@ -553,48 +553,48 @@ func TestCreateServers(t *testing.T) {
553553

554554
return []http.Location{
555555
{
556-
Path: "@rule0-route0",
557-
ProxyPass: "http://test_foo_80$request_uri",
558-
ProxySetHeaders: baseHeaders,
559-
AddHeaders: baseHeaders,
556+
Path: "@rule0-route0",
557+
ProxyPass: "http://test_foo_80$request_uri",
558+
ProxySetHeaders: baseHeaders,
559+
AddHeaderDirectives: baseHeaders,
560560
},
561561
{
562-
Path: "@rule0-route1",
563-
ProxyPass: "http://test_foo_80$request_uri",
564-
ProxySetHeaders: baseHeaders,
565-
AddHeaders: baseHeaders,
562+
Path: "@rule0-route1",
563+
ProxyPass: "http://test_foo_80$request_uri",
564+
ProxySetHeaders: baseHeaders,
565+
AddHeaderDirectives: baseHeaders,
566566
},
567567
{
568-
Path: "@rule0-route2",
569-
ProxyPass: "http://test_foo_80$request_uri",
570-
ProxySetHeaders: baseHeaders,
571-
AddHeaders: baseHeaders,
568+
Path: "@rule0-route2",
569+
ProxyPass: "http://test_foo_80$request_uri",
570+
ProxySetHeaders: baseHeaders,
571+
AddHeaderDirectives: baseHeaders,
572572
},
573573
{
574574
Path: "/",
575575
HTTPMatchVar: expectedMatchString(slashMatches),
576576
},
577577
{
578-
Path: "@rule1-route0",
579-
ProxyPass: "http://$test__route1_rule1$request_uri",
580-
ProxySetHeaders: baseHeaders,
581-
AddHeaders: baseHeaders,
578+
Path: "@rule1-route0",
579+
ProxyPass: "http://$test__route1_rule1$request_uri",
580+
ProxySetHeaders: baseHeaders,
581+
AddHeaderDirectives: baseHeaders,
582582
},
583583
{
584584
Path: "/test/",
585585
HTTPMatchVar: expectedMatchString(testMatches),
586586
},
587587
{
588-
Path: "/path-only/",
589-
ProxyPass: "http://invalid-backend-ref$request_uri",
590-
ProxySetHeaders: baseHeaders,
591-
AddHeaders: baseHeaders,
588+
Path: "/path-only/",
589+
ProxyPass: "http://invalid-backend-ref$request_uri",
590+
ProxySetHeaders: baseHeaders,
591+
AddHeaderDirectives: baseHeaders,
592592
},
593593
{
594-
Path: "= /path-only",
595-
ProxyPass: "http://invalid-backend-ref$request_uri",
596-
ProxySetHeaders: baseHeaders,
597-
AddHeaders: baseHeaders,
594+
Path: "= /path-only",
595+
ProxyPass: "http://invalid-backend-ref$request_uri",
596+
ProxySetHeaders: baseHeaders,
597+
AddHeaderDirectives: baseHeaders,
598598
},
599599
{
600600
Path: "/redirect-implicit-port/",
@@ -640,25 +640,25 @@ func TestCreateServers(t *testing.T) {
640640
HTTPMatchVar: expectedMatchString(redirectHeaderMatches),
641641
},
642642
{
643-
Path: "/rewrite/",
644-
Rewrites: []string{"^ /replacement break"},
645-
ProxyPass: "http://test_foo_80",
646-
ProxySetHeaders: rewriteProxySetHeaders,
647-
AddHeaders: baseHeaders,
643+
Path: "/rewrite/",
644+
Rewrites: []string{"^ /replacement break"},
645+
ProxyPass: "http://test_foo_80",
646+
ProxySetHeaders: rewriteProxySetHeaders,
647+
AddHeaderDirectives: baseHeaders,
648648
},
649649
{
650-
Path: "= /rewrite",
651-
Rewrites: []string{"^ /replacement break"},
652-
ProxyPass: "http://test_foo_80",
653-
ProxySetHeaders: rewriteProxySetHeaders,
654-
AddHeaders: baseHeaders,
650+
Path: "= /rewrite",
651+
Rewrites: []string{"^ /replacement break"},
652+
ProxyPass: "http://test_foo_80",
653+
ProxySetHeaders: rewriteProxySetHeaders,
654+
AddHeaderDirectives: baseHeaders,
655655
},
656656
{
657-
Path: "@rule7-route0",
658-
Rewrites: []string{"^/rewrite-with-headers(.*)$ /prefix-replacement$1 break"},
659-
ProxyPass: "http://test_foo_80",
660-
ProxySetHeaders: rewriteProxySetHeaders,
661-
AddHeaders: baseHeaders,
657+
Path: "@rule7-route0",
658+
Rewrites: []string{"^/rewrite-with-headers(.*)$ /prefix-replacement$1 break"},
659+
ProxyPass: "http://test_foo_80",
660+
ProxySetHeaders: rewriteProxySetHeaders,
661+
AddHeaderDirectives: baseHeaders,
662662
},
663663
{
664664
Path: "/rewrite-with-headers/",
@@ -695,16 +695,16 @@ func TestCreateServers(t *testing.T) {
695695
HTTPMatchVar: expectedMatchString(invalidFilterHeaderMatches),
696696
},
697697
{
698-
Path: "= /exact",
699-
ProxyPass: "http://test_foo_80$request_uri",
700-
ProxySetHeaders: baseHeaders,
701-
AddHeaders: baseHeaders,
698+
Path: "= /exact",
699+
ProxyPass: "http://test_foo_80$request_uri",
700+
ProxySetHeaders: baseHeaders,
701+
AddHeaderDirectives: baseHeaders,
702702
},
703703
{
704-
Path: "@rule11-route0",
705-
ProxyPass: "http://test_foo_80$request_uri",
706-
ProxySetHeaders: baseHeaders,
707-
AddHeaders: baseHeaders,
704+
Path: "@rule11-route0",
705+
ProxyPass: "http://test_foo_80$request_uri",
706+
ProxySetHeaders: baseHeaders,
707+
AddHeaderDirectives: baseHeaders,
708708
},
709709
{
710710
Path: "= /test",
@@ -735,7 +735,7 @@ func TestCreateServers(t *testing.T) {
735735
Value: "$connection_upgrade",
736736
},
737737
},
738-
AddHeaders: baseHeaders,
738+
AddHeaderDirectives: baseHeaders,
739739
},
740740
{
741741
Path: "= /proxy-set-headers",
@@ -762,7 +762,7 @@ func TestCreateServers(t *testing.T) {
762762
Value: "$connection_upgrade",
763763
},
764764
},
765-
AddHeaders: baseHeaders,
765+
AddHeaderDirectives: baseHeaders,
766766
},
767767
}
768768
}
@@ -866,16 +866,16 @@ func TestCreateServersConflicts(t *testing.T) {
866866
},
867867
expLocs: []http.Location{
868868
{
869-
Path: "/coffee/",
870-
ProxyPass: "http://test_foo_80$request_uri",
871-
ProxySetHeaders: baseHeaders,
872-
AddHeaders: baseHeaders,
869+
Path: "/coffee/",
870+
ProxyPass: "http://test_foo_80$request_uri",
871+
ProxySetHeaders: baseHeaders,
872+
AddHeaderDirectives: baseHeaders,
873873
},
874874
{
875-
Path: "= /coffee",
876-
ProxyPass: "http://test_bar_80$request_uri",
877-
ProxySetHeaders: baseHeaders,
878-
AddHeaders: baseHeaders,
875+
Path: "= /coffee",
876+
ProxyPass: "http://test_bar_80$request_uri",
877+
ProxySetHeaders: baseHeaders,
878+
AddHeaderDirectives: baseHeaders,
879879
},
880880
createDefaultRootLocation(),
881881
},
@@ -906,16 +906,16 @@ func TestCreateServersConflicts(t *testing.T) {
906906
},
907907
expLocs: []http.Location{
908908
{
909-
Path: "= /coffee",
910-
ProxyPass: "http://test_foo_80$request_uri",
911-
ProxySetHeaders: baseHeaders,
912-
AddHeaders: baseHeaders,
909+
Path: "= /coffee",
910+
ProxyPass: "http://test_foo_80$request_uri",
911+
ProxySetHeaders: baseHeaders,
912+
AddHeaderDirectives: baseHeaders,
913913
},
914914
{
915-
Path: "/coffee/",
916-
ProxyPass: "http://test_bar_80$request_uri",
917-
ProxySetHeaders: baseHeaders,
918-
AddHeaders: baseHeaders,
915+
Path: "/coffee/",
916+
ProxyPass: "http://test_bar_80$request_uri",
917+
ProxySetHeaders: baseHeaders,
918+
AddHeaderDirectives: baseHeaders,
919919
},
920920
createDefaultRootLocation(),
921921
},
@@ -956,16 +956,16 @@ func TestCreateServersConflicts(t *testing.T) {
956956
},
957957
expLocs: []http.Location{
958958
{
959-
Path: "/coffee/",
960-
ProxyPass: "http://test_bar_80$request_uri",
961-
ProxySetHeaders: baseHeaders,
962-
AddHeaders: baseHeaders,
959+
Path: "/coffee/",
960+
ProxyPass: "http://test_bar_80$request_uri",
961+
ProxySetHeaders: baseHeaders,
962+
AddHeaderDirectives: baseHeaders,
963963
},
964964
{
965-
Path: "= /coffee",
966-
ProxyPass: "http://test_baz_80$request_uri",
967-
ProxySetHeaders: baseHeaders,
968-
AddHeaders: baseHeaders,
965+
Path: "= /coffee",
966+
ProxyPass: "http://test_baz_80$request_uri",
967+
ProxySetHeaders: baseHeaders,
968+
AddHeaderDirectives: baseHeaders,
969969
},
970970
createDefaultRootLocation(),
971971
},
@@ -1069,16 +1069,16 @@ func TestCreateLocationsRootPath(t *testing.T) {
10691069
pathRules: getPathRules(false /* rootPath */),
10701070
expLocations: []http.Location{
10711071
{
1072-
Path: "/path-1",
1073-
ProxyPass: "http://test_foo_80$request_uri",
1074-
ProxySetHeaders: baseHeaders,
1075-
AddHeaders: baseHeaders,
1072+
Path: "/path-1",
1073+
ProxyPass: "http://test_foo_80$request_uri",
1074+
ProxySetHeaders: baseHeaders,
1075+
AddHeaderDirectives: baseHeaders,
10761076
},
10771077
{
1078-
Path: "/path-2",
1079-
ProxyPass: "http://test_foo_80$request_uri",
1080-
ProxySetHeaders: baseHeaders,
1081-
AddHeaders: baseHeaders,
1078+
Path: "/path-2",
1079+
ProxyPass: "http://test_foo_80$request_uri",
1080+
ProxySetHeaders: baseHeaders,
1081+
AddHeaderDirectives: baseHeaders,
10821082
},
10831083
{
10841084
Path: "/",
@@ -1093,22 +1093,22 @@ func TestCreateLocationsRootPath(t *testing.T) {
10931093
pathRules: getPathRules(true /* rootPath */),
10941094
expLocations: []http.Location{
10951095
{
1096-
Path: "/path-1",
1097-
ProxyPass: "http://test_foo_80$request_uri",
1098-
ProxySetHeaders: baseHeaders,
1099-
AddHeaders: baseHeaders,
1096+
Path: "/path-1",
1097+
ProxyPass: "http://test_foo_80$request_uri",
1098+
ProxySetHeaders: baseHeaders,
1099+
AddHeaderDirectives: baseHeaders,
11001100
},
11011101
{
1102-
Path: "/path-2",
1103-
ProxyPass: "http://test_foo_80$request_uri",
1104-
ProxySetHeaders: baseHeaders,
1105-
AddHeaders: baseHeaders,
1102+
Path: "/path-2",
1103+
ProxyPass: "http://test_foo_80$request_uri",
1104+
ProxySetHeaders: baseHeaders,
1105+
AddHeaderDirectives: baseHeaders,
11061106
},
11071107
{
1108-
Path: "/",
1109-
ProxyPass: "http://test_foo_80$request_uri",
1110-
ProxySetHeaders: baseHeaders,
1111-
AddHeaders: baseHeaders,
1108+
Path: "/",
1109+
ProxyPass: "http://test_foo_80$request_uri",
1110+
ProxySetHeaders: baseHeaders,
1111+
AddHeaderDirectives: baseHeaders,
11121112
},
11131113
},
11141114
},

0 commit comments

Comments
 (0)