This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new 5f45b63b fix: ScopeQuery should be case sensitive (#1168) (#1188)
5f45b63b is described below
commit 5f45b63b3d3716dd5de9f0288a6dd5c28228c40d
Author: Zack Sun <[email protected]>
AuthorDate: Tue Jul 26 20:16:04 2022 +0800
fix: ScopeQuery should be case sensitive (#1168) (#1188)
---
pkg/kube/translation/apisix_route.go | 2 +-
pkg/kube/translation/apisix_route_test.go | 12 ++++++------
test/e2e/suite-features/route_match_exprs.go | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/kube/translation/apisix_route.go
b/pkg/kube/translation/apisix_route.go
index 7bdfbedc..e951e469 100644
--- a/pkg/kube/translation/apisix_route.go
+++ b/pkg/kube/translation/apisix_route.go
@@ -500,7 +500,7 @@ func (t *translator) translateRouteMatchExprs(nginxVars
[]configv2.ApisixRouteHT
}
switch expr.Subject.Scope {
case _const.ScopeQuery:
- subj = "arg_" + strings.ToLower(expr.Subject.Name)
+ subj = "arg_" + expr.Subject.Name
case _const.ScopeHeader:
name := strings.ToLower(expr.Subject.Name)
name = strings.ReplaceAll(name, "-", "_")
diff --git a/pkg/kube/translation/apisix_route_test.go
b/pkg/kube/translation/apisix_route_test.go
index 720dd59a..cc6af876 100644
--- a/pkg/kube/translation/apisix_route_test.go
+++ b/pkg/kube/translation/apisix_route_test.go
@@ -146,33 +146,33 @@ func TestRouteMatchExpr(t *testing.T) {
assert.Equal(t, "gzip", results[1][2].StrVal)
assert.Len(t, results[2], 3)
- assert.Equal(t, "arg_id", results[2][0].StrVal)
+ assert.Equal(t, "arg_ID", results[2][0].StrVal)
assert.Equal(t, ">", results[2][1].StrVal)
assert.Equal(t, "13", results[2][2].StrVal)
assert.Len(t, results[3], 3)
- assert.Equal(t, "arg_id", results[3][0].StrVal)
+ assert.Equal(t, "arg_ID", results[3][0].StrVal)
assert.Equal(t, "<", results[3][1].StrVal)
assert.Equal(t, "13", results[3][2].StrVal)
assert.Len(t, results[4], 3)
- assert.Equal(t, "arg_id", results[4][0].StrVal)
+ assert.Equal(t, "arg_ID", results[4][0].StrVal)
assert.Equal(t, "~~", results[4][1].StrVal)
assert.Equal(t, ".*\\.php", results[4][2].StrVal)
assert.Len(t, results[5], 3)
- assert.Equal(t, "arg_id", results[5][0].StrVal)
+ assert.Equal(t, "arg_ID", results[5][0].StrVal)
assert.Equal(t, "~*", results[5][1].StrVal)
assert.Equal(t, ".*\\.php", results[5][2].StrVal)
assert.Len(t, results[6], 4)
- assert.Equal(t, "arg_id", results[6][0].StrVal)
+ assert.Equal(t, "arg_ID", results[6][0].StrVal)
assert.Equal(t, "!", results[6][1].StrVal)
assert.Equal(t, "~~", results[6][2].StrVal)
assert.Equal(t, ".*\\.php", results[6][3].StrVal)
assert.Len(t, results[7], 4)
- assert.Equal(t, "arg_id", results[7][0].StrVal)
+ assert.Equal(t, "arg_ID", results[7][0].StrVal)
assert.Equal(t, "!", results[7][1].StrVal)
assert.Equal(t, "~*", results[7][2].StrVal)
assert.Equal(t, ".*\\.php", results[7][3].StrVal)
diff --git a/test/e2e/suite-features/route_match_exprs.go
b/test/e2e/suite-features/route_match_exprs.go
index ffbd09c0..90900b72 100644
--- a/test/e2e/suite-features/route_match_exprs.go
+++ b/test/e2e/suite-features/route_match_exprs.go
@@ -224,13 +224,13 @@ spec:
_ = s.NewAPISIXClient().GET("/ip").
WithHeader("Host", "httpbin.org").
- WithQuery("id", 12).
+ WithQuery("ID", 12).
Expect().
Status(http.StatusOK)
msg := s.NewAPISIXClient().GET("/ip").
WithHeader("Host", "httpbin.org").
- WithQuery("id", 13).
+ WithQuery("ID", 13).
Expect().
Status(http.StatusNotFound).
Body().
