Skip to content

Commit 861fc00

Browse files
TreenhanTreenhan
committed
Addressing comments from Lior
1 parent 1c72eb7 commit 861fc00

9 files changed

+82
-23
lines changed

‎conformance/tests/httproute-redirect-path.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ spec:
7070
path:
7171
type: ReplaceFullPath
7272
replaceFullPath: /replacement-full
73-
statusCode: 301
73+
statusCode: 301

‎conformance/tests/httproute-request-mirror.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,17 @@ var HTTPRouteRequestMirror = suite.ConformanceTest{
6262
Request: http.Request{
6363
Path: "/mirror-and-modify-headers",
6464
Headers: map[string]string{
65-
"X-Header-Remove": "val",
65+
"X-Header-Remove": "remove-val",
66+
"X-Header-Add-Append": "append-val-1",
6667
},
6768
},
6869
ExpectedRequest: &http.ExpectedRequest{
6970
Request: http.Request{
7071
Path: "/mirror-and-modify-headers",
7172
Headers: map[string]string{
72-
"X-Header-Add": "add-appends-values",
73-
"X-Header-Set": "set-overwrites-values",
73+
"X-Header-Add": "header-val-1",
74+
"X-Header-Add-Append": "append-val-1,header-val-2",
75+
"X-Header-Set": "set-overwrites-values",
7476
},
7577
},
7678
AbsentHeaders: []string{"X-Header-Remove"},

‎conformance/tests/httproute-request-mirror.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ spec:
3434
value: set-overwrites-values
3535
add:
3636
- name: X-Header-Add
37-
value: add-appends-values
37+
value: header-val-1
38+
- name: X-Header-Add-Append
39+
value: header-val-2
3840
remove:
3941
- X-Header-Remove
4042
- type: RequestMirror

‎conformance/tests/httproute-response-header-modifier.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,22 +172,24 @@ var HTTPRouteResponseHeaderModifier = suite.ConformanceTest{
172172
Request: http.Request{
173173
Path: "/response-and-request-header-modifiers",
174174
Headers: map[string]string{
175-
"X-Header-Remove": "val",
175+
"X-Header-Remove": "remove-val",
176+
"X-Header-Add-Append": "append-val-1",
176177
},
177178
},
178179
BackendSetResponseHeaders: map[string]string{
179180
"X-Header-Set-2": "set-val-2",
180181
"X-Header-Add-2": "add-val-2",
181182
"X-Header-Remove-2": "remove-val-2",
182183
"Another-Header": "another-header-val",
183-
"X-Header-Remove-1": "val",
184+
"X-Header-Remove-1": "remove-val-1",
184185
},
185186
ExpectedRequest: &http.ExpectedRequest{
186187
Request: http.Request{
187188
Path: "/response-and-request-header-modifiers",
188189
Headers: map[string]string{
189-
"X-Header-Add": "add-appends-values",
190-
"X-Header-Set": "set-overwrites-values",
190+
"X-Header-Add": "header-val-1",
191+
"X-Header-Set": "set-overwrites-values",
192+
"X-Header-Add-Append": "append-val-1,header-val-2",
191193
},
192194
},
193195
AbsentHeaders: []string{"X-Header-Remove"},
@@ -198,7 +200,6 @@ var HTTPRouteResponseHeaderModifier = suite.ConformanceTest{
198200
"X-Header-Set-2": "header-set-2",
199201
"X-Header-Add-1": "header-add-1",
200202
"X-Header-Add-2": "add-val-2,header-add-2",
201-
"X-Header-Add-3": "header-add-3",
202203
"Another-Header": "another-header-val",
203204
},
204205
AbsentHeaders: []string{"X-Header-Remove-1", "X-Header-Remove-2"},

‎conformance/tests/httproute-response-header-modifier.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ spec:
113113
value: header-add-1
114114
- name: X-Header-Add-2
115115
value: header-add-2
116-
- name: X-Header-Add-3
117-
value: header-add-3
118116
remove:
119117
- X-Header-Remove-1
120118
- X-Header-Remove-2
@@ -125,7 +123,9 @@ spec:
125123
value: set-overwrites-values
126124
add:
127125
- name: X-Header-Add
128-
value: add-appends-values
126+
value: header-val-1
127+
- name: X-Header-Add-Append
128+
value: header-val-2
129129
remove:
130130
- X-Header-Remove
131131
backendRefs:

‎conformance/tests/httproute-rewrite-host.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,18 @@ var HTTPRouteRewriteHost = suite.ConformanceTest{
7878
Path: "/rewrite-host-and-modify-headers",
7979
Host: "rewrite.example",
8080
Headers: map[string]string{
81-
"X-Header-Remove": "val",
81+
"X-Header-Remove": "remove-val",
82+
"X-Header-Add-Append": "append-val-1",
8283
},
8384
},
8485
ExpectedRequest: &http.ExpectedRequest{
8586
Request: http.Request{
8687
Path: "/rewrite-host-and-modify-headers",
8788
Host: "test.example.org",
8889
Headers: map[string]string{
89-
"X-Header-Add": "add-appends-values",
90-
"X-Header-Set": "set-overwrites-values",
90+
"X-Header-Add": "header-val-1",
91+
"X-Header-Add-Append": "append-val-1,header-val-2",
92+
"X-Header-Set": "set-overwrites-values",
9193
},
9294
},
9395
AbsentHeaders: []string{"X-Header-Remove"},

‎conformance/tests/httproute-rewrite-host.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ spec:
4141
- name: X-Header-Set
4242
value: set-overwrites-values
4343
add:
44-
- name: X-Header-Add
45-
value: add-appends-values
44+
- name: X-Header-Add
45+
value: header-val-1
46+
- name: X-Header-Add-Append
47+
value: header-val-2
4648
remove:
4749
- X-Header-Remove
4850
backendRefs:
4951
- name: infra-backend-v2
50-
port: 8080
52+
port: 8080

‎conformance/tests/httproute-rewrite-path.go

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,38 @@ var HTTPRouteRewritePath = suite.ConformanceTest{
7474
Request: http.Request{
7575
Path: "/full/rewrite-path-and-modify-headers/test",
7676
Headers: map[string]string{
77-
"X-Header-Remove": "val",
77+
"X-Header-Remove": "remove-val",
78+
"X-Header-Add-Append": "append-val-1",
7879
},
7980
},
8081
ExpectedRequest: &http.ExpectedRequest{
8182
Request: http.Request{
8283
Path: "/test",
8384
Headers: map[string]string{
84-
"X-Header-Add": "add-appends-values",
85-
"X-Header-Set": "set-overwrites-values",
85+
"X-Header-Add": "header-val-1",
86+
"X-Header-Add-Append": "append-val-1,header-val-2",
87+
"X-Header-Set": "set-overwrites-values",
88+
},
89+
},
90+
AbsentHeaders: []string{"X-Header-Remove"},
91+
},
92+
Backend: "infra-backend-v1",
93+
Namespace: ns,
94+
}, {
95+
Request: http.Request{
96+
Path: "/prefix/rewrite-path-and-modify-headers/one",
97+
Headers: map[string]string{
98+
"X-Header-Remove": "remove-val",
99+
"X-Header-Add-Append": "append-val-1",
100+
},
101+
},
102+
ExpectedRequest: &http.ExpectedRequest{
103+
Request: http.Request{
104+
Path: "/prefix/one",
105+
Headers: map[string]string{
106+
"X-Header-Add": "header-val-1",
107+
"X-Header-Add-Append": "append-val-1,header-val-2",
108+
"X-Header-Set": "set-overwrites-values",
86109
},
87110
},
88111
AbsentHeaders: []string{"X-Header-Remove"},

‎conformance/tests/httproute-rewrite-path.yaml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,34 @@ spec:
5050
value: set-overwrites-values
5151
add:
5252
- name: X-Header-Add
53-
value: add-appends-values
53+
value: header-val-1
54+
- name: X-Header-Add-Append
55+
value: header-val-2
56+
remove:
57+
- X-Header-Remove
58+
backendRefs:
59+
- name: infra-backend-v1
60+
port: 8080
61+
- matches:
62+
- path:
63+
type: PathPrefix
64+
value: /prefix/rewrite-path-and-modify-headers
65+
filters:
66+
- type: URLRewrite
67+
urlRewrite:
68+
path:
69+
type: ReplacePrefixMatch
70+
replacePrefixMatch: /prefix
71+
- type: RequestHeaderModifier
72+
requestHeaderModifier:
73+
set:
74+
- name: X-Header-Set
75+
value: set-overwrites-values
76+
add:
77+
- name: X-Header-Add
78+
value: header-val-1
79+
- name: X-Header-Add-Append
80+
value: header-val-2
5481
remove:
5582
- X-Header-Remove
5683
backendRefs:

0 commit comments

Comments
 (0)