Skip to content

Commit 3e33d26

Browse files
fix(conformance-test): HTTPRouteRewriteHost (#2596) (#301)
(cherry picked from commit f6db45615cf9fdb3928d26cce5307243973c7b83) Co-authored-by: AlinsRan <[email protected]>
1 parent b5e8e66 commit 3e33d26

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
@@ -59,7 +59,7 @@ GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM
5959
# gateway-api
6060
GATEAY_API_VERSION ?= v1.3.0
6161
## https://github.com/kubernetes-sigs/gateway-api/blob/v1.3.0/pkg/features/httproute.go
62-
SUPPORTED_EXTENDED_FEATURES = "HTTPRouteDestinationPortMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteRequestMirror,HTTPRouteSchemeRedirect,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,GatewayPort8080"
62+
SUPPORTED_EXTENDED_FEATURES = "HTTPRouteDestinationPortMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteRequestMirror,HTTPRouteSchemeRedirect,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,GatewayPort8080,HTTPRouteHostRewrite"
6363
CONFORMANCE_TEST_REPORT_OUTPUT ?= $(DIR)/apisix-ingress-controller-conformance-report.yaml
6464
## https://github.com/kubernetes-sigs/gateway-api/blob/v1.3.0/conformance/utils/suite/profiles.go
6565
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
@@ -182,17 +182,19 @@ func (t *Translator) fillPluginFromHTTPRequestHeaderFilter(plugins adctypes.Plug
182182
obj := plugins[pluginName]
183183
var plugin *adctypes.RewriteConfig
184184
if obj == nil {
185-
plugin = &adctypes.RewriteConfig{
186-
Headers: &adctypes.Headers{
187-
Add: make(map[string]string, len(reqHeaderModifier.Add)),
188-
Set: make(map[string]string, len(reqHeaderModifier.Set)),
189-
Remove: make([]string, 0, len(reqHeaderModifier.Remove)),
190-
},
191-
}
185+
plugin = &adctypes.RewriteConfig{}
192186
plugins[pluginName] = plugin
193187
} else {
194188
plugin = obj.(*adctypes.RewriteConfig)
195189
}
190+
if plugin.Headers == nil {
191+
plugin.Headers = &adctypes.Headers{
192+
Add: make(map[string]string, len(reqHeaderModifier.Add)),
193+
Set: make(map[string]string, len(reqHeaderModifier.Set)),
194+
Remove: make([]string, 0, len(reqHeaderModifier.Remove)),
195+
}
196+
}
197+
196198
for _, header := range reqHeaderModifier.Add {
197199
val := plugin.Headers.Add[string(header.Name)]
198200
if val != "" {

0 commit comments

Comments
 (0)