Skip to content

Commit b31db3f

Browse files
committed
address nit comments and add unit tests
1 parent 9083c72 commit b31db3f

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
@@ -1948,3 +1948,71 @@ func TestConvertBackendTLSFromGroup(t *testing.T) {
19481948
})
19491949
}
19501950
}
1951+
1952+
func TestGenerateResponseHeaders(t *testing.T) {
1953+
tests := []struct {
1954+
filters *dataplane.HTTPFilters
1955+
msg string
1956+
expectedHeaders http.ResponseHeaders
1957+
}{
1958+
{
1959+
msg: "no filter set",
1960+
filters: &dataplane.HTTPFilters{
1961+
RequestHeaderModifiers: &dataplane.HTTPHeaderFilter{},
1962+
},
1963+
expectedHeaders: http.ResponseHeaders{},
1964+
},
1965+
{
1966+
msg: "set filters correctly",
1967+
filters: &dataplane.HTTPFilters{
1968+
ResponseHeaderModifiers: &dataplane.HTTPHeaderFilter{
1969+
Add: []dataplane.HTTPHeader{
1970+
{
1971+
Name: "Accept-Encoding",
1972+
Value: "gzip",
1973+
},
1974+
{
1975+
Name: "Authorization",
1976+
Value: "my-auth",
1977+
},
1978+
},
1979+
Set: []dataplane.HTTPHeader{
1980+
{
1981+
Name: "Accept-Encoding",
1982+
Value: "my-new-overwritten-value",
1983+
},
1984+
},
1985+
Remove: []string{"Authorization"},
1986+
},
1987+
},
1988+
expectedHeaders: http.ResponseHeaders{
1989+
Add: []http.Header{
1990+
{
1991+
Name: "Accept-Encoding",
1992+
Value: "gzip",
1993+
},
1994+
{
1995+
Name: "Authorization",
1996+
Value: "my-auth",
1997+
},
1998+
},
1999+
Set: []http.Header{
2000+
{
2001+
Name: "Accept-Encoding",
2002+
Value: "my-new-overwritten-value",
2003+
},
2004+
},
2005+
Remove: []string{"Authorization"},
2006+
},
2007+
},
2008+
}
2009+
2010+
for _, tc := range tests {
2011+
t.Run(tc.msg, func(t *testing.T) {
2012+
g := NewWithT(t)
2013+
2014+
headers := generateResponseHeaders(tc.filters)
2015+
g.Expect(headers).To(Equal(tc.expectedHeaders))
2016+
})
2017+
}
2018+
}

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)