Skip to content

Commit e4f6129

Browse files
committed
address nit comments and add unit tests
1 parent 3d3670a commit e4f6129

File tree

2 files changed

+70
-2
lines changed

2 files changed

+70
-2
lines changed

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,3 +1975,71 @@ func TestConvertBackendTLSFromGroup(t *testing.T) {
19751975
})
19761976
}
19771977
}
1978+
1979+
func TestGenerateResponseHeaders(t *testing.T) {
1980+
tests := []struct {
1981+
filters *dataplane.HTTPFilters
1982+
msg string
1983+
expectedHeaders http.ResponseHeaders
1984+
}{
1985+
{
1986+
msg: "no filter set",
1987+
filters: &dataplane.HTTPFilters{
1988+
RequestHeaderModifiers: &dataplane.HTTPHeaderFilter{},
1989+
},
1990+
expectedHeaders: http.ResponseHeaders{},
1991+
},
1992+
{
1993+
msg: "set filters correctly",
1994+
filters: &dataplane.HTTPFilters{
1995+
ResponseHeaderModifiers: &dataplane.HTTPHeaderFilter{
1996+
Add: []dataplane.HTTPHeader{
1997+
{
1998+
Name: "Accept-Encoding",
1999+
Value: "gzip",
2000+
},
2001+
{
2002+
Name: "Authorization",
2003+
Value: "my-auth",
2004+
},
2005+
},
2006+
Set: []dataplane.HTTPHeader{
2007+
{
2008+
Name: "Accept-Encoding",
2009+
Value: "my-new-overwritten-value",
2010+
},
2011+
},
2012+
Remove: []string{"Authorization"},
2013+
},
2014+
},
2015+
expectedHeaders: http.ResponseHeaders{
2016+
Add: []http.Header{
2017+
{
2018+
Name: "Accept-Encoding",
2019+
Value: "gzip",
2020+
},
2021+
{
2022+
Name: "Authorization",
2023+
Value: "my-auth",
2024+
},
2025+
},
2026+
Set: []http.Header{
2027+
{
2028+
Name: "Accept-Encoding",
2029+
Value: "my-new-overwritten-value",
2030+
},
2031+
},
2032+
Remove: []string{"Authorization"},
2033+
},
2034+
},
2035+
}
2036+
2037+
for _, tc := range tests {
2038+
t.Run(tc.msg, func(t *testing.T) {
2039+
g := NewWithT(t)
2040+
2041+
headers := generateResponseHeaders(tc.filters)
2042+
g.Expect(headers).To(Equal(tc.expectedHeaders))
2043+
})
2044+
}
2045+
}

internal/mode/static/state/graph/httproute_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,7 +2563,7 @@ func TestValidateFilterResponseHeaderModifier(t *testing.T) {
25632563
},
25642564
},
25652565
expectErrCount: 3,
2566-
name: "invalid response header modifier filter",
2566+
name: "response header modifier filter with disallowed header name",
25672567
},
25682568
{
25692569
validator: createAllValidValidator(),
@@ -2580,7 +2580,7 @@ func TestValidateFilterResponseHeaderModifier(t *testing.T) {
25802580
},
25812581
},
25822582
expectErrCount: 3,
2583-
name: "invalid response header modifier filter",
2583+
name: "response header modifier filter with disallowed header name prefix",
25842584
},
25852585
}
25862586

0 commit comments

Comments
 (0)