fix: ScopeQuery should be case sensitive (#1168) (#1188)

apache · Jul 26, 2022 · 5f45b63 · 5f45b63
1 parent af03e7a
commit 5f45b63
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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().