Skip to content

Commit 5ae31ff

Browse files
AlinsRanbackport-bot[bot]
authored andcommitted
fix(conformance-test): HTTPRouteQueryParamMatching (#2598)
(cherry picked from commit a368e2876cdfa80e5ffda3565e28cda53e28f370)
1 parent 6b98bdb commit 5ae31ff

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@ 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+
<<<<<<< HEAD
6263
SUPPORTED_EXTENDED_FEATURES = "HTTPRouteDestinationPortMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteRequestMirror,HTTPRouteSchemeRedirect,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,GatewayPort8080"
64+
=======
65+
SUPPORTED_EXTENDED_FEATURES = "HTTPRouteDestinationPortMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteRequestMirror,HTTPRouteSchemeRedirect,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,GatewayPort8080,HTTPRouteHostRewrite,HTTPRouteQueryParamMatching"
66+
>>>>>>> a368e287 (fix(conformance-test): HTTPRouteQueryParamMatching (#2598))
6367
CONFORMANCE_TEST_REPORT_OUTPUT ?= $(DIR)/apisix-ingress-controller-conformance-report.yaml
6468
## https://github.com/kubernetes-sigs/gateway-api/blob/v1.3.0/conformance/utils/suite/profiles.go
6569
CONFORMANCE_PROFILES ?= GATEWAY-HTTP,GATEWAY-GRPC

internal/adc/translator/httproute.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ func (t *Translator) translateGatewayHTTPRouteMatch(match *gatewayv1.HTTPRouteMa
736736
for _, query := range match.QueryParams {
737737
var this []adctypes.StringOrSlice
738738
this = append(this, adctypes.StringOrSlice{
739-
StrVal: "arg_" + strings.ToLower(fmt.Sprintf("%v", query.Name)),
739+
StrVal: "arg_" + fmt.Sprintf("%v", query.Name),
740740
})
741741

742742
queryType := gatewayv1.QueryParamMatchExact
@@ -775,7 +775,6 @@ func (t *Translator) translateGatewayHTTPRouteMatch(match *gatewayv1.HTTPRouteMa
775775
}
776776

777777
func HeaderMatchToVars(matchType, name, value string) ([]adctypes.StringOrSlice, error) {
778-
name = strings.ToLower(name)
779778
name = strings.ReplaceAll(name, "-", "_")
780779

781780
var this []adctypes.StringOrSlice

0 commit comments

Comments
 (0)