feat: optimize transformer go wasm plugin (#712)

test/e2e/conformance/tests/go-wasm-transformer.go

@@ -113,27 +113,216 @@ var WasmPluginsTransformer = suite.ConformanceTest{
 			},
 			{
 				Meta: http.AssertionMeta{
-					TestCaseName:    "case 4: request body transformer",
+					TestCaseName:    "case 3: req&resp bothway header&query transformer",
+					TargetBackend:   "infra-backend-v1",
+					TargetNamespace: "higress-conformance-infra",
+				},
+				Request: http.AssertionRequest{
+					ActualRequest: http.Request{
+						Host: "foo3.com",
+						Path: "/get/index.html?k1=v11&k1=v12&k2=v2",
+						Headers: map[string]string{
+							"X-remove":        "exist",
+							"X-not-renamed":   "test",
+							"X-replace":       "not-replaced",
+							"X-dedupe-first":  "1,2,3",
+							"X-dedupe-last":   "a,b,c",
+							"X-dedupe-unique": "1,2,3,3,2,1",
+						},
+					},
+					ExpectedRequest: &http.ExpectedRequest{
+						Request: http.Request{
+							Host: "foo3.com",
+							Path: "/get/index.html?k2-new=v2-new&k3=v31&k3=v32&k4=v31",
+							Headers: map[string]string{
+								"X-renamed":       "test",
+								"X-replace":       "replaced",
+								"X-add-append":    "add,append", // header with same name
+								"X-map":           "add,append",
+								"X-dedupe-first":  "1",
+								"X-dedupe-last":   "c",
+								"X-dedupe-unique": "1,2,3",
+							},
+						},
+						AbsentHeaders: []string{"X-remove"},
+					},
+				},
+				Response: http.AssertionResponse{
+					AdditionalResponseHeaders: map[string]string{
+						"X-remove":      "exist",
+						"X-not-renamed": "test",
+						"X-replace":     "not-replaced",
+					},
+					ExpectedResponse: http.Response{
+						StatusCode: 200,
+						Headers: map[string]string{
+							"X-renamed":    "test",
+							"X-replace":    "replace-get",           // regexp matches path and replace "replace-$1"
+							"X-add-append": "add-foo3,append-index", // regexp matches host and replace "add-$1"
+							"X-map":        "add-foo3,append-index",
+						},
+						AbsentHeaders: []string{"X-remove"},
+					},
+				},
+			},
+			{
+				Meta: http.AssertionMeta{
+					TestCaseName:    "case 4: request transformer with arbitary order",
 					TargetBackend:   "infra-backend-v1",
 					TargetNamespace: "higress-conformance-infra",
 				},
 				Request: http.AssertionRequest{
 					ActualRequest: http.Request{
 						Host: "foo4.com",
+						Path: "/get?k1=v11&k1=v12",
+						Headers: map[string]string{
+							"X-dedupe-first":  "1,2,3",
+							"X-dedupe-last":   "a,b,c",
+							"X-dedupe-unique": "1,2,3,3,2,1",
+						},
+					},
+					ExpectedRequest: &http.ExpectedRequest{
+						Request: http.Request{
+							Host: "foo4.com",
+							Path: "/get?k2=v11&k2=v22&k3-new=v31",
+							Headers: map[string]string{
+								"X-add-append":            "add",
+								"X-map-dedupe-first":      "1,append",
+								"X-dedupe-last":           "X-dedupe-last-replaced",
+								"X-dedupe-unique-renamed": "1,2,3",
+							},
+						},
+						AbsentHeaders: []string{"X-dedupe-first"},
+					},
+				},
+				Response: http.AssertionResponse{
+					ExpectedResponse: http.Response{
+						StatusCode: 200,
+					},
+				},
+			},
+
+			{
+				Meta: http.AssertionMeta{
+					TestCaseName:    "case 5: response transformer with arbitary order",
+					TargetBackend:   "infra-backend-v1",
+					TargetNamespace: "higress-conformance-infra",
+				},
+				Request: http.AssertionRequest{
+					ActualRequest: http.Request{
+						Host: "foo5.com",
+						Path: "/get/index.html",
+					},
+					ExpectedRequest: &http.ExpectedRequest{
+						Request: http.Request{
+							Host: "foo5.com",
+							Path: "/get/index.html",
+						},
+					},
+				},
+				Response: http.AssertionResponse{
+					AdditionalResponseHeaders: map[string]string{
+						"X-remove":      "exist",
+						"X-not-renamed": "test",
+						"X-replace":     "not-replaced",
+					},
+					ExpectedResponse: http.Response{
+						StatusCode: 200,
+						Headers: map[string]string{
+							"X-renamed":    "test",
+							"X-replace":    "replace-get",           // regexp matches path and replace "replace-$1"
+							"X-add-append": "add-foo5,append-index", // regexp matches host and replace "add-$1"
+							"X-map":        "add-foo5",
+						},
+						AbsentHeaders: []string{"X-remove"},
+					},
+				},
+			},
+
+			{
+				Meta: http.AssertionMeta{
+					TestCaseName:    "case 6: request transformer, map from query to header",
+					TargetBackend:   "infra-backend-v1",
+					TargetNamespace: "higress-conformance-infra",
+				},
+				Request: http.AssertionRequest{
+					ActualRequest: http.Request{
+						Host:    "foo6.com",
+						Path:    "/get?kmap=vmap",
+						Headers: map[string]string{},
+					},
+					ExpectedRequest: &http.ExpectedRequest{
+						Request: http.Request{
+							Host: "foo6.com",
+							Path: "/get?kmap=vmap",
+							Headers: map[string]string{
+								"X-map": "vmap",
+							},
+						},
+
+					},
+				},
+				Response: http.AssertionResponse{
+					ExpectedResponse: http.Response{
+
+						StatusCode: 200,
+					},
+				},
+			},
+			{
+				Meta: http.AssertionMeta{
+					TestCaseName:    "case 7: request transformer, map from header to query",
+					TargetBackend:   "infra-backend-v1",
+					TargetNamespace: "higress-conformance-infra",
+				},
+				Request: http.AssertionRequest{
+					ActualRequest: http.Request{
+						Host: "foo7.com",
+						Path: "/get",
+						Headers: map[string]string{
+							"X-map": "vmap",
+						},
+					},
+					ExpectedRequest: &http.ExpectedRequest{
+						Request: http.Request{
+							Host: "foo7.com",
+							Path: "/get?kmap=vmap",
+							Headers: map[string]string{
+								"X-map": "vmap",
+							},
+						},
+					},
+				},
+				Response: http.AssertionResponse{
+					ExpectedResponse: http.Response{
+						StatusCode: 200,
+					},
+				},
+			},
+			{
+				Meta: http.AssertionMeta{
+					TestCaseName:    "case 8: request body transformer",
+					TargetBackend:   "infra-backend-v1",
+					TargetNamespace: "higress-conformance-infra",
+				},
+				Request: http.AssertionRequest{
+					ActualRequest: http.Request{
+						Host: "foo8.com",
 						Path: "/post",
 						// TODO(Uncle-Justice) dedupe, replace的body插件逻辑有问题，暂跳过测试
 						Method: "POST",
 						Body: []byte(`
 						{
 							"X-removed":["v1", "v2"],
-							"X-not-renamed":["v1"]
+							"X-not-renamed":["v1"],
+							"X-to-be-mapped":["v1", "v2"]
 						}
 						`),
 						ContentType: http.ContentTypeApplicationJson,
 					},
 					ExpectedRequest: &http.ExpectedRequest{
 						Request: http.Request{
-							Host: "foo4.com",
+							Host: "foo8.com",
 							Path: "/post",
 							// TODO(Uncle-Justice) dedupe, replace的body插件逻辑有问题，暂跳过测试
 							Method:      "POST",
@@ -142,7 +331,8 @@ var WasmPluginsTransformer = suite.ConformanceTest{
 							{
 								"X-renamed":["v1"],
 								"X-add-append":["add","append"],
-								"X-map":["add","append"]
+								"X-to-be-mapped":["v1", "v2"],
+								"X-map":["v1", "v2"]
 							}
 						`),
 						},
@@ -156,21 +346,22 @@ var WasmPluginsTransformer = suite.ConformanceTest{
 			},
 			{
 				Meta: http.AssertionMeta{
-					TestCaseName:    "case 5: response json body transformer",
+					TestCaseName:    "case 9: response json body transformer",
 					TargetBackend:   "infra-backend-echo-body-v1",
 					TargetNamespace: "higress-conformance-infra",
 					CompareTarget:   http.CompareTargetResponse,
 				},
 				Request: http.AssertionRequest{
 					ActualRequest: http.Request{
-						Host: "foo5.com",
+						Host: "foo9.com",
 						Path: "/post",
 						// TODO(Uncle-Justice) dedupe, replace的body插件逻辑有问题，暂跳过测试
 						Method: "POST",
 						Body: []byte(`
 						{
 							"X-removed":["v1", "v2"],
-							"X-not-renamed":["v1"]
+							"X-not-renamed":["v1"],
+							"X-to-be-mapped":["v1", "v2"]
 						}
 						`),
 						ContentType: http.ContentTypeApplicationJson,
@@ -184,7 +375,8 @@ var WasmPluginsTransformer = suite.ConformanceTest{
 						{
 							"X-renamed":["v1"],
 							"X-add-append":["add","append"],
-							"X-map":["add","append"]
+							"X-to-be-mapped":["v1", "v2"],
+							"X-map":["v1", "v2"]
 						}
 						`),
 					},

test/e2e/conformance/tests/go-wasm-transformer.yaml

@@ -56,7 +56,28 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-  name: wasmplugin-transform-request-body
+  name: wasmplugin-transform-bothway-header-and-query
+  namespace: higress-conformance-infra
+spec:
+  ingressClassName: higress
+  rules:
+    - host: "foo3.com"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: infra-backend-v1
+                port:
+                  number: 8080                  
+---
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+  name: wasmplugin-transform-request-arbitary-rule-order
   namespace: higress-conformance-infra
 spec:
   ingressClassName: higress
@@ -76,12 +97,94 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-  name: wasmplugin-transform-response-body
+  name: wasmplugin-transform-response-arbitary-rule-order
   namespace: higress-conformance-infra
 spec:
   ingressClassName: higress
   rules:
     - host: "foo5.com"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: infra-backend-v1
+                port:
+                  number: 8080                  
+---
+---
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+  name: wasmplugin-transform-request-map-from-querys-to-headers
+  namespace: higress-conformance-infra
+spec:
+  ingressClassName: higress
+  rules:
+    - host: "foo6.com"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: infra-backend-v1
+                port:
+                  number: 8080                  
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+  name: wasmplugin-transform-request-map-from-headers-to-querys
+  namespace: higress-conformance-infra
+spec:
+  ingressClassName: higress
+  rules:
+    - host: "foo7.com"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: infra-backend-v1
+                port:
+                  number: 8080                  
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+  name: wasmplugin-transform-request-body
+  namespace: higress-conformance-infra
+spec:
+  ingressClassName: higress
+  rules:
+    - host: "foo8.com"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: infra-backend-v1
+                port:
+                  number: 8080
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+  name: wasmplugin-transform-response-body
+  namespace: higress-conformance-infra
+spec:
+  ingressClassName: higress
+  rules:
+    - host: "foo9.com"
       http:
         paths:
           - pathType: Prefix
@@ -104,8 +207,7 @@ spec:
         - higress-conformance-infra/wasmplugin-transform-request
       configDisable: false
       config:
-          type: request
-          rules:
+          reqRules:
             - operate: remove
               headers:
                 - key: X-remove
@@ -113,18 +215,18 @@ spec:
                 - key: k1
             - operate: rename
               headers:
-                - key: X-not-renamed
-                  value: X-renamed
+                - oldKey: X-not-renamed
+                  newKey: X-renamed
               querys:
-                - key: k2
-                  value: k2-new
+                - oldKey: k2
+                  newKey: k2-new
             - operate: replace
               headers:
                 - key: X-replace
-                  value: replaced
+                  newValue: replaced
               querys:
                 - key: k2-new
-                  value: v2-new
+                  newValue: v2-new
             - operate: add
               headers:
                 - key: X-add-append
@@ -135,46 +237,45 @@ spec:
             - operate: append
               headers:
                 - key: X-add-append
-                  value: append
+                  appendValue: append
               querys:
                 - key: k3
-                  value: v32
+                  appendValue: v32
             - operate: map
               headers:
-                - key: X-add-append
-                  value: X-map
+                - fromKey: X-add-append
+                  toKey: X-map
               querys:
-                - key: k3
-                  value: k4
+                - fromKey: k3
+                  toKey: k4
             - operate: dedupe
               headers:
                 - key: X-dedupe-first
-                  value: RETAIN_FIRST
+                  strategy: RETAIN_FIRST
                 - key: X-dedupe-last
-                  value: RETAIN_LAST
+                  strategy: RETAIN_LAST
                 - key: X-dedupe-unique
-                  value: RETAIN_UNIQUE
+                  strategy: RETAIN_UNIQUE
               querys:
                 - key: k4
-                  value: RETAIN_FIRST
+                  strategy: RETAIN_FIRST
 
     - ingress:
         - higress-conformance-infra/wasmplugin-transform-response-header-and-query
       configDisable: false
       config:
-        type: response
-        rules:
+        respRules:
           - operate: remove
             headers:
               - key: X-remove
           - operate: rename
             headers:
-              - key: X-not-renamed
-                value: X-renamed
+              - oldKey: X-not-renamed
+                newKey: X-renamed
           - operate: replace
             headers:
               - key: X-replace
-                value: replace-$1
+                newValue: replace-$1
                 path_pattern: ^.*?\/(\w+)[\?]{0,1}.*$
           - operate: add
             headers:
@@ -184,29 +285,234 @@ spec:
           - operate: append
             headers:
               - key: X-add-append
-                value: append-$1
+                appendValue: append-$1
                 path_pattern: ^\/get\/(.*)\.html$
           - operate: map
+            headers:
+              - fromKey: X-add-append
+                toKey: X-map
+
+    - ingress:
+        - higress-conformance-infra/wasmplugin-transform-bothway-header-and-query
+      configDisable: false
+      config:
+        reqRules:
+          - operate: remove
+            headers:
+              - key: X-remove
+            querys:
+              - key: k1
+          - operate: rename
+            headers:
+              - oldKey: X-not-renamed
+                newKey: X-renamed
+            querys:
+              - oldKey: k2
+                newKey: k2-new
+          - operate: replace
+            headers:
+              - key: X-replace
+                newValue: replaced
+            querys:
+              - key: k2-new
+                newValue: v2-new
+          - operate: add
             headers:
               - key: X-add-append
-                value: X-map
+                value: add
+            querys:
+              - key: k3
+                value: v31
+          - operate: append
+            headers:
+              - key: X-add-append
+                appendValue: append
+            querys:
+              - key: k3
+                appendValue: v32
+          - operate: map
+            headers:
+              - fromKey: X-add-append
+                toKey: X-map
+            querys:
+              - fromKey: k3
+                toKey: k4
+          - operate: dedupe
+            headers:
+              - key: X-dedupe-first
+                strategy: RETAIN_FIRST
+              - key: X-dedupe-last
+                strategy: RETAIN_LAST
+              - key: X-dedupe-unique
+                strategy: RETAIN_UNIQUE
+            querys:
+              - key: k4
+                strategy: RETAIN_FIRST
+
+        respRules:
+          - operate: remove
+            headers:
+              - key: X-remove
+          - operate: rename
+            headers:
+              - oldKey: X-not-renamed
+                newKey: X-renamed
+          - operate: replace
+            headers:
+              - key: X-replace
+                newValue: replace-$1
+                path_pattern: ^.*?\/(\w+)[\?]{0,1}.*$
+          - operate: add
+            headers:
+              - key: X-add-append
+                value: add-$1
+                host_pattern: ^(.*)\.com$
+          - operate: append
+            headers:
+              - key: X-add-append
+                appendValue: append-$1
+                path_pattern: ^\/get\/(.*)\.html(.*)$
+          - operate: map
+            headers:
+              - fromKey: X-add-append
+                toKey: X-map
+
+    - ingress:
+        - higress-conformance-infra/wasmplugin-transform-request-arbitary-rule-order
+      configDisable: false
+      config:
+        reqRules:
+          - operate: dedupe
+            headers:
+              - key: X-dedupe-first
+                strategy: RETAIN_FIRST
+              - key: X-dedupe-last
+                strategy: RETAIN_LAST
+              - key: X-dedupe-unique
+                strategy: RETAIN_UNIQUE
+            querys:
+              - key: k1
+                strategy: RETAIN_FIRST
+
+          - operate: map
+            headers:
+              - fromKey: X-dedupe-first
+                toKey: X-map-dedupe-first
+            querys:
+              - fromKey: k1
+                toKey: k2
+
+          - operate: append
+            headers:
+              - key: X-map-dedupe-first
+                appendValue: append
+            querys:
+              - key: k2
+                appendValue: v22
+
+          - operate: add
+            headers:
+              - key: X-add-append
+                value: add
+            querys:
+              - key: k3
+                value: v31
+
+          - operate: replace
+            headers:
+              - key: X-dedupe-last
+                newValue: X-dedupe-last-replaced
+                
+          - operate: rename
+            headers:
+              - oldKey: X-dedupe-unique
+                newKey: X-dedupe-unique-renamed
+            querys:
+              - oldKey: k3
+                newKey: k3-new
+
+          - operate: remove
+            headers:
+              - key: X-dedupe-first
+            querys:
+              - key: k1
+          
+
+
+    - ingress:
+        - higress-conformance-infra/wasmplugin-transform-response-arbitary-rule-order
+      configDisable: false
+      config:
+        respRules:
+          - operate: remove
+            headers:
+              - key: X-remove
+          - operate: rename
+            headers:
+              - oldKey: X-not-renamed
+                newKey: X-renamed
+          - operate: replace
+            headers:
+              - key: X-replace
+                newValue: replace-$1
+                path_pattern: ^.*?\/(\w+)[\?]{0,1}.*$
+          - operate: add
+            headers:
+              - key: X-add-append
+                value: add-$1
+                host_pattern: ^(.*)\.com$
+          - operate: map
+            headers:
+              - fromKey: X-add-append
+                toKey: X-map
+          - operate: append
+            headers:
+              - key: X-add-append
+                appendValue: append-$1
+                path_pattern: ^\/get\/(.*)\.html$
+
+    - ingress:
+        - higress-conformance-infra/wasmplugin-transform-request-map-from-querys-to-headers
+      configDisable: false
+      config:
+          reqRules:
+            - operate: map
+              mapSource: querys
+              headers:
+                - fromKey: kmap
+                  toKey: X-map
+              querys:
+                - fromKey: k3
+                  toKey: k4
+
+    - ingress:
+        - higress-conformance-infra/wasmplugin-transform-request-map-from-headers-to-querys
+      configDisable: false
+      config:
+          reqRules:
+            - operate: map
+              mapSource: headers
+              querys:
+                # 映射来源为headers时，fromKey的匹配不区分大小写
+                - fromKey: X-map
+                  toKey: kmap
+
     - ingress:
         - higress-conformance-infra/wasmplugin-transform-request-body
       configDisable: false
       config:
-          type: request
-          rules:
+          reqRules:
             - operate: remove
               body:
                 - key: X-removed
             - operate: rename
               body:
-                - key: X-not-renamed
-                  value: X-renamed
+                - oldKey: X-not-renamed
+                  newKey: X-renamed
             - operate: replace
               body:
                 - key: X-replace
-                  value: replaced
+                  newValue: replaced
             - operate: add
               body:
                 - key: X-add-append
@@ -214,36 +520,35 @@ spec:
             - operate: append
               body:
                 - key: X-add-append
-                  value: append
+                  appendValue: append
             - operate: map
               body:
-                - key: X-add-append
-                  value: X-map
+                - fromKey: X-to-be-mapped
+                  toKey: X-map
             - operate: dedupe
               body:
                 - key: X-dedupe-first
-                  value: RETAIN_FIRST
+                  strategy: RETAIN_FIRST
                 - key: X-dedupe-last
-                  value: RETAIN_LAST
+                  strategy: RETAIN_LAST
                 - key: X-dedupe-unique
-                  value: RETAIN_UNIQUE
+                  strategy: RETAIN_UNIQUE
     - ingress:
         - higress-conformance-infra/wasmplugin-transform-response-body
       configDisable: false
       config:
-          type: response
-          rules:
+          respRules:
             - operate: remove
               body:
                 - key: X-removed
             - operate: rename
               body:
-                - key: X-not-renamed
-                  value: X-renamed
+                - oldKey: X-not-renamed
+                  newKey: X-renamed
             - operate: replace
               body:
                 - key: X-replace
-                  value: replaced
+                  newValue: replaced
             - operate: add
               body:
                 - key: X-add-append
@@ -251,17 +556,17 @@ spec:
             - operate: append
               body:
                 - key: X-add-append
-                  value: append
+                  appendValue: append
             - operate: map
               body:
-                - key: X-add-append
-                  value: X-map
+                - fromKey: X-to-be-mapped
+                  toKey: X-map
             - operate: dedupe
               body:
                 - key: X-dedupe-first
-                  value: RETAIN_FIRST
+                  strategy: RETAIN_FIRST
                 - key: X-dedupe-last
-                  value: RETAIN_LAST
+                  strategy: RETAIN_LAST
                 - key: X-dedupe-unique
-                  value: RETAIN_UNIQUE
+                  strategy: RETAIN_UNIQUE
   url: file:///opt/plugins/wasm-go/extensions/transformer/plugin.wasm