mirror of
https://github.com/alibaba/higress.git
synced 2026-05-11 06:17:26 +08:00
feat: optimize transformer go wasm plugin (#712)
This commit is contained in:
@@ -5,15 +5,16 @@
|
||||
# 配置字段
|
||||
|
||||
| 名称 | 数据类型 | 填写要求 | 默认值 | 描述 |
|
||||
| -------- | -------- | -------- | -------- | -------- |
|
||||
| type | string | 必填,可选值为 `request`, `response` | - | 指定转换器类型 |
|
||||
| rules | array of object | 选填 | - | 指定转换操作类型以及请求/响应头、请求查询参数、请求/响应体参数的转换规则 |
|
||||
| :----: | :----: | :----: | :----: | -------- |
|
||||
| reqRules | string | 选填,reqRules和respRules至少填一个 | - | 请求转换器配置,指定转换操作类型以及请求头、请求查询参数、请求体的转换规则 |
|
||||
| respRules | string | 选填,reqRules和respRules至少填一个 | - | 响应转换器配置,指定转换操作类型以及响应头、响应体的转换规则 |
|
||||
|
||||
`rules`中每一项的配置字段说明如下:
|
||||
`reqRules`和`respRules`中每一项的配置字段说明如下:
|
||||
|
||||
| 名称 | 数据类型 | 填写要求 | 默认值 | 描述 |
|
||||
| -------- | -------- | -------- | -------- | -------- |
|
||||
| :----: | :----: | :----: | :----: | -------- |
|
||||
| operate | string | 必填,可选值为 `remove`, `rename`, `replace`, `add`, `append`, `map`, `dedupe` | - | 指定转换操作类型,支持的操作类型有删除 (remove)、重命名 (rename)、更新 (replace)、添加 (add)、追加 (append)、映射 (map)、去重 (dedupe),当存在多项不同类型的转换规则时,按照上述操作类型顺序依次执行 |
|
||||
| mapSource | string | 选填,可选值为`headers`, `querys`,`body` | - | 仅在operate为`map`时有效。指定映射来源,若不填该字段,则默认映射来源为自身 |
|
||||
| headers | array of object | 选填 | - | 指定请求/响应头转换规则 |
|
||||
| querys | array of object | 选填 | - | 指定请求查询参数转换规则 |
|
||||
| body | array of object | 选填 | - | 指定请求/响应体参数转换规则,请求体转换允许 content-type 为 `application/json`, `application/x-www-form-urlencoded`, `multipart/form-data`;响应体转换仅允许 content-type 为 `application/json` |
|
||||
@@ -21,9 +22,20 @@
|
||||
`headers`, `querys`, `body`中每一项的配置字段说明如下:
|
||||
|
||||
| 名称 | 数据类型 | 填写要求 | 默认值 | 描述 |
|
||||
| -------- | -------- | -------- | -------- |---------------------------------------------------|
|
||||
| key | string | 选填 | - | 指定键,详见[转换操作类型](#转换操作类型) |
|
||||
| value | string | 选填 | - | 指定值,详见[转换操作类型](#转换操作类型) |
|
||||
| :----: | :----: | :----: | -------- |---------------------------------------------------|
|
||||
| key | string | 选填 | - | 在operate为`remove`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| oldKey | string | 选填 | - |在operate为`rename`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| newKey | string | 选填 | - | 在operate为`rename`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| key | string | 选填 | - | 在operate为`replace`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| newValue | string | 选填 | - | 在operate为`replace`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| key | string | 选填 | - | 在operate为`add`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| value | string | 选填 | - | 在operate为`add`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| key | string | 选填 | - | 在operate为`append`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| appendValue | string | 选填 | - | 在operate为`append`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| fromKey | string | 选填 | - | 在operate为`map`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| toKey | string | 选填 | - | 在operate为`map`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| key | string | 选填 | - | 在operate为`dedupe`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| strategy | string | 选填 | - | 在operate为`dedupe`时使用,用法详见[转换操作类型](#转换操作类型) |
|
||||
| value_type | string | 选填,可选值为 `object`, `boolean`, `number`, `string` | string | 当`content-type: application/json`时,该字段指定请求/响应体参数的值类型 |
|
||||
| host_pattern | string | 选填 | - | 指定请求主机名匹配规则,当转换操作类型为 `replace`, `add`, `append` 时有效 |
|
||||
| path_pattern | string | 选填 | - | 指定请求路径匹配规则,当转换操作类型为 `replace`, `add`, `append` 时有效 |
|
||||
@@ -32,8 +44,8 @@
|
||||
|
||||
* `request transformer` 支持以下转换对象:请求头部、请求查询参数、请求体(application/json, application/x-www-form-urlencoded, multipart/form-data)
|
||||
* `response transformer` 支持以下转换对象:响应头部、响应体(application/json)
|
||||
|
||||
* 转换操作类型的执行顺序:remove → rename → replace → add → append → map → dedupe
|
||||
* 插件支持双向转换能力,即单个插件能够完成对请求和响应都做转换
|
||||
* 转换操作类型的执行顺序,为配置文件中编写的顺序,如:remove → rename → replace → add → append → map → dedupe或者dedupe → map → append → add → replace → rename → remove等
|
||||
* 当转换对象为 headers 时,` key` 不区分大小写;当为 headers 且为 `rename`, `map` 操作时,`value` 也不区分大小写(因为此时该字段具有 key 含义);而 querys 和 body 的 `key`, `value` 字段均区分大小写
|
||||
* `value_type` 仅对 content-type 为 application/json 的请求/响应体有效
|
||||
* `host_pattern` 和 `path_pathern` 支持 [RE2 语法](https://pkg.go.dev/regexp/syntax),仅对 `replace`, `add`, `append` 操作有效,且在一项转换规则中两者只能选填其一,若均填写,则 `host_pattern` 生效,而 `path_pattern` 失效
|
||||
@@ -43,7 +55,7 @@
|
||||
# 转换操作类型
|
||||
|
||||
| 操作类型 | key 字段含义 | value 字段含义 | 描述 |
|
||||
| ------------- | ----------------- |-----| ------------------------------------------------------------ |
|
||||
| :----: | :----: | :----: | ------------------------------------------------------------ |
|
||||
| 删除 remove | 目标 key |无需设置| 若存在指定的 `key`,则删除;否则无操作 |
|
||||
| 重命名 rename | 目标 oldKey |新的 key 名称 newKey| 若存在指定的 `oldKey:value`,则将其键名重命名为 `newKey`,得到 `newKey:value`;否则无操作 |
|
||||
| 更新 replace | 目标 key |新的 value 值 newValue| 若存在指定的 `key:value`,则将其 value 更新为 `newValue`,得到 `key:newValue`;否则无操作 |
|
||||
@@ -62,19 +74,18 @@
|
||||
### 转换请求头部
|
||||
|
||||
```yaml
|
||||
type: request
|
||||
rules:
|
||||
reqRules:
|
||||
- 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: replaced
|
||||
newValue: replaced
|
||||
- operate: add
|
||||
headers:
|
||||
- key: X-add-append
|
||||
@@ -83,20 +94,20 @@ rules:
|
||||
- operate: append
|
||||
headers:
|
||||
- key: X-add-append
|
||||
value: path-$1
|
||||
appendValue: path-$1
|
||||
path_pattern: ^.*?\/(\w+)[\?]{0,1}.*$
|
||||
- operate: map
|
||||
headers:
|
||||
- key: X-add-append
|
||||
value: X-map
|
||||
- fromKey: X-add-append
|
||||
toKey: X-map
|
||||
- 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
|
||||
```
|
||||
|
||||
发送请求
|
||||
@@ -131,19 +142,18 @@ $ curl -v console.higress.io/get -H 'host: foo.bar.com' \
|
||||
### 转换请求查询参数
|
||||
|
||||
```yaml
|
||||
type: request
|
||||
rules:
|
||||
reqRules:
|
||||
- operate: remove
|
||||
querys:
|
||||
- key: k1
|
||||
- operate: rename
|
||||
querys:
|
||||
- key: k2
|
||||
value: k2-new
|
||||
- oldKey: k2
|
||||
newKey: k2-new
|
||||
- operate: replace
|
||||
querys:
|
||||
- key: k2-new
|
||||
value: v2-new
|
||||
newValue: v2-new
|
||||
- operate: add
|
||||
querys:
|
||||
- key: k3
|
||||
@@ -152,15 +162,15 @@ rules:
|
||||
- operate: append
|
||||
querys:
|
||||
- key: k3
|
||||
value: v32
|
||||
appendValue: v32
|
||||
- operate: map
|
||||
querys:
|
||||
- key: k3
|
||||
value: k4
|
||||
- fromKey: k3
|
||||
toKey: k4
|
||||
- operate: dedupe
|
||||
querys:
|
||||
- key: k4
|
||||
value: RETAIN_FIRST
|
||||
strategy: RETAIN_FIRST
|
||||
```
|
||||
|
||||
发送请求
|
||||
@@ -186,19 +196,18 @@ $ curl -v "console.higress.io/get?k1=v11&k1=v12&k2=v2"
|
||||
### 转换请求体
|
||||
|
||||
```yaml
|
||||
type: request
|
||||
rules:
|
||||
reqRules:
|
||||
- operate: remove
|
||||
body:
|
||||
- key: a1
|
||||
- operate: rename
|
||||
body:
|
||||
- key: a2
|
||||
value: a2-new
|
||||
- oldKey: a2
|
||||
newKey: a2-new
|
||||
- operate: replace
|
||||
body:
|
||||
- key: a3
|
||||
value: t3-new
|
||||
newValue: t3-new
|
||||
value_type: string
|
||||
- operate: add
|
||||
body:
|
||||
@@ -208,17 +217,17 @@ rules:
|
||||
- operate: append
|
||||
body:
|
||||
- key: a1-new
|
||||
value: t1-$1-append
|
||||
appendValue: t1-$1-append
|
||||
value_type: string
|
||||
host_pattern: ^(.*)\.com$
|
||||
- operate: map
|
||||
body:
|
||||
- key: a1-new
|
||||
value: a4
|
||||
- fromKey: a1-new
|
||||
toKey: a4
|
||||
- operate: dedupe
|
||||
body:
|
||||
- key: a4
|
||||
value: RETAIN_FIRST
|
||||
strategy: RETAIN_FIRST
|
||||
```
|
||||
|
||||
发送请求:
|
||||
@@ -313,8 +322,7 @@ $ curl -v -X POST console.higress.io/post -H 'host: foo.bar.com' \
|
||||
1.通常情况下,指定的 key 中含有 `.` 表示嵌套含义,如下:
|
||||
|
||||
```yaml
|
||||
type: response
|
||||
rules:
|
||||
respRules:
|
||||
- operate: add
|
||||
body:
|
||||
- key: foo.bar
|
||||
@@ -339,8 +347,7 @@ $ curl -v console.higress.io/get
|
||||
> 当使用双引号括住字符串时使用 `\\.` 进行转义
|
||||
|
||||
```yaml
|
||||
type: response
|
||||
rules:
|
||||
respRules:
|
||||
- operate: add
|
||||
body:
|
||||
- key: foo\.bar
|
||||
@@ -378,8 +385,7 @@ $ curl -v console.higress.io/get
|
||||
1.移除 `user` 第一个元素:
|
||||
|
||||
```yaml
|
||||
type: request
|
||||
rules:
|
||||
reqRules:
|
||||
- operate: remove
|
||||
body:
|
||||
- key: users.0
|
||||
@@ -409,12 +415,11 @@ $ curl -v -X POST console.higress.io/post \
|
||||
2.将 `users` 第一个元素的 key 为 `123` 重命名为 `msg`:
|
||||
|
||||
```yaml
|
||||
type: request
|
||||
rules:
|
||||
reqRules:
|
||||
- operate: rename
|
||||
body:
|
||||
- key: users.0.123
|
||||
value: users.0.first
|
||||
- oldKey: users.0.123
|
||||
newKey: users.0.first
|
||||
```
|
||||
|
||||
```bash
|
||||
@@ -466,12 +471,11 @@ $ curl -v -X POST console.higress.io/post \
|
||||
```
|
||||
|
||||
```yaml
|
||||
type: request
|
||||
rules:
|
||||
reqRules:
|
||||
- operate: replace
|
||||
body:
|
||||
- key: users.#.age
|
||||
value: 20
|
||||
newValue: 20
|
||||
```
|
||||
|
||||
```bash
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -59,6 +59,15 @@ func isValidOperation(op string) bool {
|
||||
}
|
||||
}
|
||||
|
||||
func isValidMapSource(source string) bool {
|
||||
switch source {
|
||||
case "headers", "querys", "body":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func parseQueryByPath(path string) (map[string][]string, error) {
|
||||
u, err := url.Parse(path)
|
||||
if err != nil {
|
||||
|
||||
@@ -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"]
|
||||
}
|
||||
`),
|
||||
},
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user