Skip to content

Commit f6db456

Browse files
authored
fix(conformance-test): HTTPRouteRewriteHost (#2596)
1 parent 0f29ac7 commit f6db456

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM
5252
# gateway-api
5353
GATEAY_API_VERSION ?= v1.3.0
5454
## https://github.com/kubernetes-sigs/gateway-api/blob/v1.3.0/pkg/features/httproute.go
55-
SUPPORTED_EXTENDED_FEATURES = "HTTPRouteDestinationPortMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteRequestMirror,HTTPRouteSchemeRedirect,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,GatewayPort8080"
55+
SUPPORTED_EXTENDED_FEATURES = "HTTPRouteDestinationPortMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteRequestMirror,HTTPRouteSchemeRedirect,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,GatewayPort8080,HTTPRouteHostRewrite"
5656
CONFORMANCE_TEST_REPORT_OUTPUT ?= $(DIR)/apisix-ingress-controller-conformance-report.yaml
5757
## https://github.com/kubernetes-sigs/gateway-api/blob/v1.3.0/conformance/utils/suite/profiles.go
5858
CONFORMANCE_PROFILES ?= GATEWAY-HTTP,GATEWAY-GRPC

internal/adc/translator/httproute.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,19 @@ func (t *Translator) fillPluginFromHTTPRequestHeaderFilter(plugins adctypes.Plug
179179
obj := plugins[pluginName]
180180
var plugin *adctypes.RewriteConfig
181181
if obj == nil {
182-
plugin = &adctypes.RewriteConfig{
183-
Headers: &adctypes.Headers{
184-
Add: make(map[string]string, len(reqHeaderModifier.Add)),
185-
Set: make(map[string]string, len(reqHeaderModifier.Set)),
186-
Remove: make([]string, 0, len(reqHeaderModifier.Remove)),
187-
},
188-
}
182+
plugin = &adctypes.RewriteConfig{}
189183
plugins[pluginName] = plugin
190184
} else {
191185
plugin = obj.(*adctypes.RewriteConfig)
192186
}
187+
if plugin.Headers == nil {
188+
plugin.Headers = &adctypes.Headers{
189+
Add: make(map[string]string, len(reqHeaderModifier.Add)),
190+
Set: make(map[string]string, len(reqHeaderModifier.Set)),
191+
Remove: make([]string, 0, len(reqHeaderModifier.Remove)),
192+
}
193+
}
194+
193195
for _, header := range reqHeaderModifier.Add {
194196
val := plugin.Headers.Add[string(header.Name)]
195197
if val != "" {

0 commit comments

Comments
 (0)