From 05dc0a66e4bab6a93ab05ea90be7d175c59b26b2 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Sun, 24 Jul 2022 14:12:14 +0800
Subject: [PATCH 01/74] feat: add openfunction plugin

---
 apisix/plugins/openfunction.lua | 104 ++++++++++++++++++++++++++++++++
 conf/config-default.yaml        |   1 +
 2 files changed, 105 insertions(+)
 create mode 100644 apisix/plugins/openfunction.lua

diff --git a/apisix/plugins/openfunction.lua b/apisix/plugins/openfunction.lua
new file mode 100644
index 000000000000..3d5dfe99ac11
--- /dev/null
+++ b/apisix/plugins/openfunction.lua
@@ -0,0 +1,104 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+local core              = require("apisix.core")
+local http              = require("resty.http")
+local ngx_encode_base64 = ngx.encode_base64
+
+local schema = {
+    type = "object",
+    properties = {
+        function_uri = {type = "string"},
+        ssl_verify = {
+            type = "boolean",
+            default = true,
+        },
+        service_token = {type = "string"},
+        timeout = {
+            type = "integer",
+            minimum = 1,
+            maximum = 60000,
+            default = 60000,
+            description = "timeout in milliseconds",
+        },
+        keepalive = {type = "boolean", default = true},
+        keepalive_timeout = {type = "integer", minimum = 1000, default = 60000},
+        keepalive_pool = {type = "integer", minimum = 1, default = 5}
+    },
+    required = {"function_uri"}
+}
+
+
+local _M = {
+    version = 0.1,
+    priority = -1902,
+    name = "openfunction",
+    schema = schema,
+}
+
+
+function _M.check_schema(conf)
+    local ok, err = core.schema.check(schema, conf)
+    if not ok then
+        return false, err
+    end
+
+    return true
+end
+
+
+function _M.access(conf, ctx)
+    local params = {
+        method = ngx.req.get_method(),
+        body = core.request.get_body(),
+        keepalive = conf.keepalive,
+        ssl_verify = conf.ssl_verify,
+        headers = core.request.headers(ctx) or {}
+    }
+
+    -- setting authorization headers if not already set
+    if not params.headers["Authorization"] and conf.service_token then
+        params.headers["Authorization"] = "Basic " .. ngx_encode_base64(conf.service_token)
+    end
+
+    if conf.keepalive then
+        params.keepalive_timeout = conf.keepalive_timeout
+        params.keepalive_pool = conf.keepalive_pool
+    end
+
+    local endpoint = conf.function_uri
+    local httpc = http.new()
+    httpc:set_timeout(conf.timeout)
+
+    local res, err = httpc:request_uri(endpoint, params)
+
+    if not res then
+        core.log.error("failed to process ",_M.name, ", err: ", err)
+        return 503
+    end
+
+    -- setting response headers
+    if res.headers ~= nil then
+        core.response.set_header(res.headers)
+    end
+
+    return res.status, res.body
+
+end
+
+
+return _M
diff --git a/conf/config-default.yaml b/conf/config-default.yaml
index 642d4e89de41..acaf0f9a0063 100755
--- a/conf/config-default.yaml
+++ b/conf/config-default.yaml
@@ -471,6 +471,7 @@ plugins:                          # plugin list (sorted by priority)
   - aws-lambda                     # priority: -1899
   - azure-functions                # priority: -1900
   - openwhisk                      # priority: -1901
+  - openfunction                   # priority: -1902
   - serverless-post-function       # priority: -2000
   - ext-plugin-post-req            # priority: -3000
   - ext-plugin-post-resp           # priority: -4000

From fc8a099f6616e3b8e21a17753ec9bca982aadbe2 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 4 Aug 2022 16:46:19 +0800
Subject: [PATCH 02/74] feat: add openfunction plugin

---
 docs/en/latest/config.json |   3 +-
 t/admin/plugins.t          |   1 +
 t/plugin/openfunction.t    | 253 +++++++++++++++++++++++++++++++++++++
 3 files changed, 256 insertions(+), 1 deletion(-)
 create mode 100644 t/plugin/openfunction.t

diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index 939a5cac91c3..6eebc2cf90e9 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -165,7 +165,8 @@
             "plugins/serverless",
             "plugins/azure-functions",
             "plugins/openwhisk",
-            "plugins/aws-lambda"
+            "plugins/aws-lambda",
+            "plugins/openfunction"
           ]
         },
         {
diff --git a/t/admin/plugins.t b/t/admin/plugins.t
index 1d78b2432989..462760d19d86 100644
--- a/t/admin/plugins.t
+++ b/t/admin/plugins.t
@@ -126,6 +126,7 @@ example-plugin
 aws-lambda
 azure-functions
 openwhisk
+openfunction
 serverless-post-function
 ext-plugin-post-req
 ext-plugin-post-resp
diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction.t
new file mode 100644
index 000000000000..91ff08269ce0
--- /dev/null
+++ b/t/plugin/openfunction.t
@@ -0,0 +1,253 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_root_location();
+
+add_block_preprocessor(sub {
+    my ($block) = @_;
+
+    if ((!defined $block->error_log) && (!defined $block->no_error_log)) {
+        $block->set_value("no_error_log", "[error]");
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /t {
+        content_by_lua_block {
+            local plugin = require("apisix.plugins.openfunction")
+            local ok, err = plugin.check_schema({function_uri = "http://60.188.58.218:30585/default/function-sample", service_token = "test:test"})
+            if not ok then
+                ngx.say(err)
+            end
+
+            ngx.say("done")
+        }
+    }
+--- response_body
+done
+
+
+
+=== TEST 2: missing `function_uri`
+--- config
+    location /t {
+        content_by_lua_block {
+            local plugin = require("apisix.plugins.openfunction")
+            local ok, err = plugin.check_schema({service_token = "test:test"})
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- response_body
+property "function_uri" is required
+
+
+
+=== TEST 3: wrong type for `function_uri`
+--- config
+    location /t {
+        content_by_lua_block {
+            local plugin = require("apisix.plugins.openfunction")
+            local ok, err = plugin.check_schema({function_uri = 30858, service_token = "test:test"})
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- response_body
+property "function_uri" validation failed: wrong type: expected string, got number
+
+
+
+=== TEST 4: setup route with plugin
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                        "plugins": {
+                            "openfunction": {
+                                "function_uri": "http://60.188.58.218:30585/default/function-sample/world",
+                                "service_token": "test:test"
+                            }
+                        },
+                        "upstream": {
+                            "nodes": {},
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello"
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+
+
+=== TEST 5: hit route (with GET request)
+--- request
+GET /hello
+--- response_body
+Hello, world!
+
+
+
+=== TEST 6: reset route with test-body function
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                        "plugins": {
+                            "openfunction": {
+                                "function_uri": "http://127.0.0.1:30585/default/test-body",
+                                "service_token": "test:test"
+                            }
+                        },
+                        "upstream": {
+                            "nodes": {},
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello"
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+=== TEST 7: hit route with POST method
+--- request
+POST /hello
+test
+--- response_body
+Hello, test!
+
+
+=== TEST 8: reset route with test-body function without service_token
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                        "plugins": {
+                            "openfunction": {
+                                "function_uri": "http://127.0.0.1:30585/default/test-body"
+                            }
+                        },
+                        "upstream": {
+                            "nodes": {},
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello"
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+=== TEST 9: hit route with POST request when openfunction required basic auth
+--- request
+POST /hello
+test
+--- error_code: 401
+--- response_body_like eval
+qr/401 Authorization Required/
+
+
+
+
+=== TEST 10: reset route to non-existent function_uri
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                        "plugins": {
+                            "openfunction": {
+                                "function_uri": "http://127.0.0.1:30585/default/non-existent",
+                                "service_token": "test:test"
+                            }
+                        },
+                        "upstream": {
+                            "nodes": {},
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello"
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+
+=== TEST 11: hit route (with non-existent function_uri)
+--- request
+POST /hello
+test
+--- more_headers
+Content-Type: application/x-www-form-urlencoded
+--- error_code: 404
+--- response_body_like eval
+qr/404 Not Found/

From 2b46f002734962d0bef7ad751670d66be52ffd1c Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 8 Aug 2022 10:46:50 +0800
Subject: [PATCH 03/74] fix: change test uri

---
 t/plugin/openfunction.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction.t
index 91ff08269ce0..3f9802279038 100644
--- a/t/plugin/openfunction.t
+++ b/t/plugin/openfunction.t
@@ -41,7 +41,7 @@ __DATA__
     location /t {
         content_by_lua_block {
             local plugin = require("apisix.plugins.openfunction")
-            local ok, err = plugin.check_schema({function_uri = "http://60.188.58.218:30585/default/function-sample", service_token = "test:test"})
+            local ok, err = plugin.check_schema({function_uri = "http://127.0.0.1:30585/default/function-sample", service_token = "test:test"})
             if not ok then
                 ngx.say(err)
             end
@@ -96,7 +96,7 @@ property "function_uri" validation failed: wrong type: expected string, got numb
                  [[{
                         "plugins": {
                             "openfunction": {
-                                "function_uri": "http://60.188.58.218:30585/default/function-sample/world",
+                                "function_uri": "http://127.0.0.1:30585/default/function-sample/world",
                                 "service_token": "test:test"
                             }
                         },

From 0c3887ae2607659ef9cf658dad29e1300366a529 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 8 Aug 2022 13:37:22 +0800
Subject: [PATCH 04/74] CI: prepare openfunction env

---
 ci/init-plugin-test-service.sh | 68 ++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 5f468502304d..384cdc6cc9cb 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -41,3 +41,71 @@ docker exec -i rmqnamesrv /home/rocketmq/rocketmq-4.6.0/bin/mqadmin updateTopic
 
 # prepare vault kv engine
 docker exec -i vault sh -c "VAULT_TOKEN='root' VAULT_ADDR='http://0.0.0.0:8200' vault secrets enable -path=kv -version=1 kv"
+
+# prepare openfunction env
+prepare_kind_k8s() {
+    curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64
+    chmod +x ./kind
+    curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+    sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+    kind create cluster --name myk8s-01
+}
+
+install_openfuncntion() {
+    curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
+    helm repo add openfunction https://openfunction.github.io/charts/
+    helm repo update
+    kubectl create namespace openfunction
+    helm install openfunction --set global.Keda.enabled=false --set global.Dapr.enabled=false openfunction/openfunction -n openfunction
+    kubectl wait pods --all  --for=condition=Ready --timeout=300s -n openfunction
+    kubectl delete -A ValidatingWebhookConfiguration ingress-nginx-admission
+    kubectl delete deployment -n keda --all
+    kubectl delete deployment -n dapr-system --all
+    kubectl delete pod -n keda --all
+    kubectl delete pod -n dapr-system --all
+}
+
+set_container_registry_secret() {
+    REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=apisixtestaccount123 REGISTRY_PASSWORD=apisixtestaccount
+    kubectl create secret docker-registry push-secret \
+        --docker-server=$REGISTRY_SERVER \
+        --docker-username=$REGISTRY_USER \
+        --docker-password=$REGISTRY_PASSWORD
+}
+
+create_functions() {
+    wget https://raw.githubusercontent.com/jackkkkklee/samples/release-0.6/functions/knative/hello-world-go/function-sample.yaml
+    wget https://raw.githubusercontent.com/jackkkkklee/samples/main/functions/knative/hello-world-go/function-sample-test-body.yaml
+
+    kubectl apply -f function-sample.yaml
+    kubectl apply -f function-sample-test-body.yaml
+
+    kubectl set resources deployment -n openfunction --all=true --requests=cpu=40m,memory=64Mi
+    kubectl set resources deployment -n kube-system --all=true --requests=cpu=50m,memory=64Mi
+
+    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=300s
+    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Running  --timeout=300s
+    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=300s
+    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Running  --timeout=300s
+
+}
+
+set_ingress_controller() {
+    yum install -y httpd
+    htpasswd -cd auth test test
+    kubectl create secret generic basic-auth --from-file=auth
+
+    kubectl patch ingress openfunction -p '{"metadata":{"annotations":{"nginx.ingress.kubernetes.io/auth-type":"basic","nginx.ingress.kubernetes.io/auth-secret":"basic-auth","nginx.ingress.kubernetes.io/auth-realm":"Authentication Required - test"}}}'
+    kubectl patch svc ingress-nginx-controller -n ingress-nginx -p $'spec:\n type: NodePort'
+    kubectl patch svc ingress-nginx-controller -n ingress-nginx -p '{"spec":{"ports":[{"appProtocol":"http","name":"myhttp","nodePort": 30585,"port":  80,"protocol": "TCP", "targetPort": "http"}]}}'
+  }
+port_forward() {
+    nohup kubectl port-forward --address 0.0.0.0  --namespace=ingress-nginx service/ingress-nginx-controller 30585:80 >/dev/null 2>&1 &
+}
+
+prepare_kind_k8s
+install_openfuncntion
+set_container_registry_secret
+create_functions
+set_ingress_controller
+port_forward

From 3d549ec41c268fd3adedb0228c1872f4d6927bb0 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 8 Aug 2022 13:39:17 +0800
Subject: [PATCH 05/74] docs: add openfunction plugins

---
 docs/en/latest/plugins/openfunction.md | 122 +++++++++++++++++++++++
 docs/zh/latest/plugins/openfunction.md | 129 +++++++++++++++++++++++++
 2 files changed, 251 insertions(+)
 create mode 100644 docs/en/latest/plugins/openfunction.md
 create mode 100644 docs/zh/latest/plugins/openfunction.md

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
new file mode 100644
index 000000000000..774d9c6e4f80
--- /dev/null
+++ b/docs/en/latest/plugins/openfunction.md
@@ -0,0 +1,122 @@
+---
+title: openfunction
+keywords:
+  - APISIX
+  - Plugin
+  - OpenFunction
+  - openfunction
+description: This document contains information about the CNCF OpenFunction Plugin.
+---
+
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+
+## Description
+
+The `openfunction` Plugin is used to integrate APISIX with [CNCF OpenWhisk](https://openfunction.dev/) serverless platform.
+
+This Plugin can be configured on a Route and requests will be send to the configured OpenWhish API endpoint as the upstream.
+
+## Attributes
+
+| Name              | Type    | Required | Default | Valid values | Description                                                                                                |
+| ----------------- | ------- | -------- | ------- | ------------ | ---------------------------------------------------------------------------------------------------------- |
+| function_uri      | string  | True     |         |              | function uri. For example, `https://localhost:30858/default/function-sample`.                              |
+| ssl_verify        | boolean | False    | true    |              | When set to `true` verifies the SSL certificate.                                                           |
+| service_token     | string  | False    |         |              | The token format is 'xx:xx' which support basic auth for ingress controller, .                                      |
+| timeout           | integer | False    | 60000ms | [1, 60000]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
+| keepalive         | boolean | False    | true    |              | When set to `true` keeps the connection alive for reuse.                                                   |
+| keepalive_timeout | integer | False    | 60000ms | [1000,...]ms | Time is ms for connection to remain idle without closing.                                                  |
+| keepalive_pool    | integer | False    | 5       | [1,...]      | Maximum number of requests that can be sent on this connection before closing it.                          |
+
+:::note
+
+The `timeout` attribute sets the time taken by the OpenFunction to execute, and the timeout for the HTTP client in APISIX. OpenFunction  calls may take time to pull the runtime image and start the container. So, if the value is set too small, it may cause a large number of requests to fail.
+
+
+:::
+
+## Enabling the Plugin
+
+Before configuring the Plugin, you need to have OpenFunction running. The example below shows OpenFunction installed in Helm:
+
+```shell
+#add the OpenFunction chart repository
+helm repo add openfunction https://openfunction.github.io/charts/
+helm repo update
+
+#install the OpenFunction chart
+kubectl create namespace openfunction
+helm install openfunction openfunction/openfunction -n openfunction
+```
+
+You can then verify if OpenFunction is ready:
+
+```shell
+kubectl get pods -namespace openfunction
+```
+
+You can then create a function follow the [sample](https://github.com/OpenFunction/samples)
+
+You can now configure the Plugin on a specific Route and point to this running OpenFunction service:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+    "uri": "/hello",
+    "plugins": {
+        "openfunction": {
+            "function_uri": "http://localhost:3233/default/function-sample/test",
+            "service_token": "foo:foo"
+        }
+    }
+}'
+```
+
+## Example usage
+
+Once you have configured the Plugin, you can send a request to the Route and it will invoke the configured function:
+
+```shell
+curl -i http://127.0.0.1:9080/hello
+```
+
+This will give back the response from the function:
+
+```
+hello, test!
+```
+
+## Disable Plugin
+
+To disable the `openfunction` Plugin, you can delete the corresponding JSON configuration from the Plugin configuration. APISIX will automatically reload and you do not have to restart for this to take effect.
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1  -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+    "methods": ["GET"],
+    "uri": "/index.html",
+    "upstream": {
+        "type": "roundrobin",
+        "nodes": {
+            "127.0.0.1:1980": 1
+        }
+    }
+}'
+```
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
new file mode 100644
index 000000000000..a26c4f7c0a20
--- /dev/null
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -0,0 +1,129 @@
+---
+title: openfunction
+keywords:
+  - APISIX
+  - Plugin
+  - OpenFunction
+  - openfunction
+description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信息及使用方法。
+---
+
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+
+## 描述
+
+`openfunction` 插件用于将开源的分布式无服务器平台 [CNCF OpenFunction](https://openfunction.dev/) 作为动态上游集成至 APISIX。
+
+启用 `openfunction` 插件后，该插件会终止对已配置 URI 的请求，并代表客户端向 OpenFunction 的 function发起一个新的请求，然后 `openfunction` 插件会将响应信息返回至客户端。
+
+## 属性
+
+| 名称              | 类型    | 必选项 | 默认值  | 有效值       | 描述                                                         |
+| ----------------- | ------- | ------ | ------- | ------------ | ------------------------------------------------------------ |
+| function_uri      | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
+| ssl_verify        | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
+| service_token     | string  | 是     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持ingress controller的basic auth认证方式。 |
+| timeout           | integer | 否     | 60000ms | [1,60000]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
+| keepalive         | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
+| keepalive_timeout | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
+| keepalive_pool    | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |
+
+:::note
+
+`timeout` 字段规定了 OpenFunction function 的最大执行时间，以及 APISIX 中 HTTP 客户端的请求超时时间。
+
+因为 OpenFunction function 调用可能会耗费很长时间来拉取容器镜像和启动容器，所以如果 `timeout` 字段值设置太小，可能会导致大量的失败请求。
+
+
+:::
+
+## 启用插件
+
+### 搭建 Apache OpenFunction 测试环境
+
+1. 在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。请确保当前环境中已经安装 Kubernetes 软件。
+
+```shell
+#add the OpenFunction chart repository
+helm repo add openfunction https://openfunction.github.io/charts/
+helm repo update
+
+#install the OpenFunction chart
+kubectl create namespace openfunction
+helm install openfunction openfunction/openfunction -n openfunction
+```
+
+2. 你可以通过以下命令来验证openfunction是否已经安装成功：
+```shell
+kubectl get pods -namespace openfunction
+```
+
+3. 你可以通过官方示例创建函数 [sample](https://github.com/OpenFunction/samples)
+
+
+
+### 创建路由
+
+通过以下命令创建一个路由，并在配置文件中添加 `openfunction` 插件：
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+    "uri": "/hello",
+    "plugins": {
+        "openfunction": {
+            "function_uri": "http://localhost:3233/default/function-sample/test",
+            "service_token": "foo:foo"
+        }
+    }
+}'
+```
+
+### 测试请求
+
+使用 `curl` 命令测试：
+
+```shell
+curl -i http://127.0.0.1:9080/hello
+```
+
+正常返回结果：
+
+```
+hello, test!
+```
+
+## 禁用插件
+
+当你需要禁用 `openfunction` 插件时，可以通过以下命令删除相应的 JSON 配置，APISIX 将会自动重新加载相关配置，无需重启服务：
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1  -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+    "methods": ["GET"],
+    "uri": "/hello",
+    "upstream": {
+        "type": "roundrobin",
+        "nodes": {
+            "127.0.0.1:1980": 1
+        }
+    }
+}'
+```

From e13f8703aebd10fd8547cd8d866a521629df0f2a Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Tue, 9 Aug 2022 11:34:53 +0800
Subject: [PATCH 06/74] fix: increase the timeout time

---
 ci/init-plugin-test-service.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 384cdc6cc9cb..3b6bfd420787 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -83,10 +83,10 @@ create_functions() {
     kubectl set resources deployment -n openfunction --all=true --requests=cpu=40m,memory=64Mi
     kubectl set resources deployment -n kube-system --all=true --requests=cpu=50m,memory=64Mi
 
-    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=300s
-    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Running  --timeout=300s
-    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=300s
-    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Running  --timeout=300s
+    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=500s
+    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Running  --timeout=500s
+    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=500s
+    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Running  --timeout=500s
 
 }
 

From f59a15fff48f050d89c3e1ee486789232bf81683 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Tue, 9 Aug 2022 12:41:04 +0800
Subject: [PATCH 07/74] fix: correct htpasswd command

---
 ci/init-plugin-test-service.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 3b6bfd420787..893c266cc27f 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -91,8 +91,7 @@ create_functions() {
 }
 
 set_ingress_controller() {
-    yum install -y httpd
-    htpasswd -cd auth test test
+    htpasswd -cb auth test test
     kubectl create secret generic basic-auth --from-file=auth
 
     kubectl patch ingress openfunction -p '{"metadata":{"annotations":{"nginx.ingress.kubernetes.io/auth-type":"basic","nginx.ingress.kubernetes.io/auth-secret":"basic-auth","nginx.ingress.kubernetes.io/auth-realm":"Authentication Required - test"}}}'

From 69ee6519bd95b66c6b03334c8477900136b318dc Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Tue, 9 Aug 2022 14:10:44 +0800
Subject: [PATCH 08/74] ci: fix openfunction ci params

---
 ci/init-plugin-test-service.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 893c266cc27f..910ece4d6fad 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -80,8 +80,8 @@ create_functions() {
     kubectl apply -f function-sample.yaml
     kubectl apply -f function-sample-test-body.yaml
 
-    kubectl set resources deployment -n openfunction --all=true --requests=cpu=40m,memory=64Mi
-    kubectl set resources deployment -n kube-system --all=true --requests=cpu=50m,memory=64Mi
+    kubectl set resources deployment -n openfunction --all=true --requests=cpu=40m,memory=100Mi
+    kubectl set resources deployment -n kube-system --all=true --requests=cpu=40m,memory=100Mi
 
     kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=500s
     kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Running  --timeout=500s

From 283c5e877b8bc2ec33b3e057d07bfe54ba948fdc Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Tue, 9 Aug 2022 14:55:41 +0800
Subject: [PATCH 09/74] ci: fix openfunction ci params

---
 ci/init-plugin-test-service.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 910ece4d6fad..7d30b6e9b508 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -84,9 +84,9 @@ create_functions() {
     kubectl set resources deployment -n kube-system --all=true --requests=cpu=40m,memory=100Mi
 
     kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=500s
-    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Running  --timeout=500s
+    kubectl wait fn function-sample --for=jsonpath='{.status.serving.state}'=Running  --timeout=500s
     kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=500s
-    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Running  --timeout=500s
+    kubectl wait fn test-body --for=jsonpath='{.status.serving.state}'=Running  --timeout=500s
 
 }
 

From 467d6d007c649482d6183dac4cb31a515e60cbd4 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Wed, 10 Aug 2022 10:47:46 +0800
Subject: [PATCH 10/74] docs: fix name

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 774d9c6e4f80..f86ca081bf31 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -29,7 +29,7 @@ description: This document contains information about the CNCF OpenFunction Plug
 
 ## Description
 
-The `openfunction` Plugin is used to integrate APISIX with [CNCF OpenWhisk](https://openfunction.dev/) serverless platform.
+The `openfunction` Plugin is used to integrate APISIX with [CNCF OpenFunction](https://openfunction.dev/) serverless platform.
 
 This Plugin can be configured on a Route and requests will be send to the configured OpenWhish API endpoint as the upstream.
 

From e88936c8b0f7aaa1582050d2e9ee7f8fe1e45084 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Wed, 10 Aug 2022 10:50:50 +0800
Subject: [PATCH 11/74] docs: fix verification command

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index f86ca081bf31..0a187555dab1 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -69,7 +69,7 @@ helm install openfunction openfunction/openfunction -n openfunction
 You can then verify if OpenFunction is ready:
 
 ```shell
-kubectl get pods -namespace openfunction
+kubectl get pods --namespace openfunction
 ```
 
 You can then create a function follow the [sample](https://github.com/OpenFunction/samples)

From 98b9ba1f8185984dd43dafe13a62ebc1303b49b7 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 10 Aug 2022 15:03:34 +0800
Subject: [PATCH 12/74] fix: fix Code Lint

---
 apisix/plugins/openfunction.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apisix/plugins/openfunction.lua b/apisix/plugins/openfunction.lua
index 3d5dfe99ac11..aff1dbd3e5d5 100644
--- a/apisix/plugins/openfunction.lua
+++ b/apisix/plugins/openfunction.lua
@@ -18,6 +18,7 @@
 local core              = require("apisix.core")
 local http              = require("resty.http")
 local ngx_encode_base64 = ngx.encode_base64
+local ngx  = ngx
 
 local schema = {
     type = "object",

From 23521f1e8215062401e2c720525267fd61f23bfd Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 10 Aug 2022 15:05:00 +0800
Subject: [PATCH 13/74] fix: fix Lint

---
 docs/en/latest/plugins/openfunction.md |  4 ++--
 docs/zh/latest/plugins/openfunction.md | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 0a187555dab1..ccb8798e5b9e 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -49,12 +49,12 @@ This Plugin can be configured on a Route and requests will be send to the config
 
 The `timeout` attribute sets the time taken by the OpenFunction to execute, and the timeout for the HTTP client in APISIX. OpenFunction  calls may take time to pull the runtime image and start the container. So, if the value is set too small, it may cause a large number of requests to fail.
 
-
 :::
 
 ## Enabling the Plugin
 
-Before configuring the Plugin, you need to have OpenFunction running. The example below shows OpenFunction installed in Helm:
+Before configuring the Plugin, you need to have OpenFunction running. For details, please refer to [Installation](https://openfunction.dev/docs/getting-started/installation/).
+The example below shows OpenFunction installed in Helm:
 
 ```shell
 #add the OpenFunction chart repository
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index a26c4f7c0a20..c335a8ffb772 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -31,7 +31,7 @@ description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信
 
 `openfunction` 插件用于将开源的分布式无服务器平台 [CNCF OpenFunction](https://openfunction.dev/) 作为动态上游集成至 APISIX。
 
-启用 `openfunction` 插件后，该插件会终止对已配置 URI 的请求，并代表客户端向 OpenFunction 的 function发起一个新的请求，然后 `openfunction` 插件会将响应信息返回至客户端。
+启用 `openfunction` 插件后，该插件会终止对已配置 URI 的请求，并代表客户端向 OpenFunction 的 function 发起一个新的请求，然后 `openfunction` 插件会将响应信息返回至客户端。
 
 ## 属性
 
@@ -39,7 +39,7 @@ description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信
 | ----------------- | ------- | ------ | ------- | ------------ | ------------------------------------------------------------ |
 | function_uri      | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
 | ssl_verify        | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
-| service_token     | string  | 是     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持ingress controller的basic auth认证方式。 |
+| service_token     | string  | 是     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持 ingress controller 的 basic auth 认证方式。 |
 | timeout           | integer | 否     | 60000ms | [1,60000]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
 | keepalive         | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
 | keepalive_timeout | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
@@ -51,14 +51,14 @@ description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信
 
 因为 OpenFunction function 调用可能会耗费很长时间来拉取容器镜像和启动容器，所以如果 `timeout` 字段值设置太小，可能会导致大量的失败请求。
 
-
 :::
 
 ## 启用插件
 
 ### 搭建 Apache OpenFunction 测试环境
 
-1. 在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。请确保当前环境中已经安装 Kubernetes 软件。
+1. 在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。详情参考[官方安装指南](https://openfunction.dev/docs/getting-started/installation/) 。
+请确保当前环境中已经安装 Kubernetes 软件。
 
 ```shell
 #add the OpenFunction chart repository
@@ -70,15 +70,14 @@ kubectl create namespace openfunction
 helm install openfunction openfunction/openfunction -n openfunction
 ```
 
-2. 你可以通过以下命令来验证openfunction是否已经安装成功：
+2. 你可以通过以下命令来验证 openfunction 是否已经安装成功：
+
 ```shell
 kubectl get pods -namespace openfunction
 ```
 
 3. 你可以通过官方示例创建函数 [sample](https://github.com/OpenFunction/samples)
 
-
-
 ### 创建路由
 
 通过以下命令创建一个路由，并在配置文件中添加 `openfunction` 插件：

From 822b5890232b8d1c29f62dbbbb8f2092dd2ba663 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 11 Aug 2022 21:29:47 +0800
Subject: [PATCH 14/74] ci: avoid function building and run function in docker

---
 ci/init-plugin-test-service.sh | 69 +++-------------------------------
 1 file changed, 6 insertions(+), 63 deletions(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 7d30b6e9b508..c0d20539a9f8 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -43,68 +43,11 @@ docker exec -i rmqnamesrv /home/rocketmq/rocketmq-4.6.0/bin/mqadmin updateTopic
 docker exec -i vault sh -c "VAULT_TOKEN='root' VAULT_ADDR='http://0.0.0.0:8200' vault secrets enable -path=kv -version=1 kv"
 
 # prepare openfunction env
-prepare_kind_k8s() {
-    curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64
-    chmod +x ./kind
-    curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-    sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
-    kind create cluster --name myk8s-01
-}
+docker pull apisixtestaccount123/sample-go-func:v1
+docker pull apisixtestaccount123/sample-go-func:v2
+docker pull apisixtestaccount123/sample-go-func:v3
 
-install_openfuncntion() {
-    curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
-    helm repo add openfunction https://openfunction.github.io/charts/
-    helm repo update
-    kubectl create namespace openfunction
-    helm install openfunction --set global.Keda.enabled=false --set global.Dapr.enabled=false openfunction/openfunction -n openfunction
-    kubectl wait pods --all  --for=condition=Ready --timeout=300s -n openfunction
-    kubectl delete -A ValidatingWebhookConfiguration ingress-nginx-admission
-    kubectl delete deployment -n keda --all
-    kubectl delete deployment -n dapr-system --all
-    kubectl delete pod -n keda --all
-    kubectl delete pod -n dapr-system --all
-}
+nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-header -p 30583:8080 apisixtestaccount123/sample-go-func:v2 >/dev/null 2>&1 &
+nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-body -p 30585:8080 apisixtestaccount123/sample-go-func:v1 >/dev/null 2>&1 &
+nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name func-helloworld-go -p 30584:8080 apisixtestaccount123/sample-go-func:v3 >/dev/null 2>&1 &
 
-set_container_registry_secret() {
-    REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=apisixtestaccount123 REGISTRY_PASSWORD=apisixtestaccount
-    kubectl create secret docker-registry push-secret \
-        --docker-server=$REGISTRY_SERVER \
-        --docker-username=$REGISTRY_USER \
-        --docker-password=$REGISTRY_PASSWORD
-}
-
-create_functions() {
-    wget https://raw.githubusercontent.com/jackkkkklee/samples/release-0.6/functions/knative/hello-world-go/function-sample.yaml
-    wget https://raw.githubusercontent.com/jackkkkklee/samples/main/functions/knative/hello-world-go/function-sample-test-body.yaml
-
-    kubectl apply -f function-sample.yaml
-    kubectl apply -f function-sample-test-body.yaml
-
-    kubectl set resources deployment -n openfunction --all=true --requests=cpu=40m,memory=100Mi
-    kubectl set resources deployment -n kube-system --all=true --requests=cpu=40m,memory=100Mi
-
-    kubectl wait fn function-sample --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=500s
-    kubectl wait fn function-sample --for=jsonpath='{.status.serving.state}'=Running  --timeout=500s
-    kubectl wait fn test-body --for=jsonpath='{.status.build.state}'=Succeeded  --timeout=500s
-    kubectl wait fn test-body --for=jsonpath='{.status.serving.state}'=Running  --timeout=500s
-
-}
-
-set_ingress_controller() {
-    htpasswd -cb auth test test
-    kubectl create secret generic basic-auth --from-file=auth
-
-    kubectl patch ingress openfunction -p '{"metadata":{"annotations":{"nginx.ingress.kubernetes.io/auth-type":"basic","nginx.ingress.kubernetes.io/auth-secret":"basic-auth","nginx.ingress.kubernetes.io/auth-realm":"Authentication Required - test"}}}'
-    kubectl patch svc ingress-nginx-controller -n ingress-nginx -p $'spec:\n type: NodePort'
-    kubectl patch svc ingress-nginx-controller -n ingress-nginx -p '{"spec":{"ports":[{"appProtocol":"http","name":"myhttp","nodePort": 30585,"port":  80,"protocol": "TCP", "targetPort": "http"}]}}'
-  }
-port_forward() {
-    nohup kubectl port-forward --address 0.0.0.0  --namespace=ingress-nginx service/ingress-nginx-controller 30585:80 >/dev/null 2>&1 &
-}
-
-prepare_kind_k8s
-install_openfuncntion
-set_container_registry_secret
-create_functions
-set_ingress_controller
-port_forward

From c31b6c819194c408d5be40acb23eb549823dbed2 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 11 Aug 2022 21:31:06 +0800
Subject: [PATCH 15/74] test: update openfunction test case

---
 t/plugin/openfunction.t | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction.t
index 3f9802279038..13ab71449800 100644
--- a/t/plugin/openfunction.t
+++ b/t/plugin/openfunction.t
@@ -41,7 +41,7 @@ __DATA__
     location /t {
         content_by_lua_block {
             local plugin = require("apisix.plugins.openfunction")
-            local ok, err = plugin.check_schema({function_uri = "http://127.0.0.1:30585/default/function-sample", service_token = "test:test"})
+            local ok, err = plugin.check_schema({function_uri = "http://127.0.0.1:30585/default/test-body"})
             if not ok then
                 ngx.say(err)
             end
@@ -59,7 +59,7 @@ done
     location /t {
         content_by_lua_block {
             local plugin = require("apisix.plugins.openfunction")
-            local ok, err = plugin.check_schema({service_token = "test:test"})
+            local ok, err = plugin.check_schema({timeout = 60000})
             if not ok then
                 ngx.say(err)
             end
@@ -75,7 +75,7 @@ property "function_uri" is required
     location /t {
         content_by_lua_block {
             local plugin = require("apisix.plugins.openfunction")
-            local ok, err = plugin.check_schema({function_uri = 30858, service_token = "test:test"})
+            local ok, err = plugin.check_schema({function_uri = 30858})
             if not ok then
                 ngx.say(err)
             end
@@ -96,8 +96,7 @@ property "function_uri" validation failed: wrong type: expected string, got numb
                  [[{
                         "plugins": {
                             "openfunction": {
-                                "function_uri": "http://127.0.0.1:30585/default/function-sample/world",
-                                "service_token": "test:test"
+                                "function_uri": "http://127.0.0.1:30584/function-sample"
                             }
                         },
                         "upstream": {
@@ -119,12 +118,11 @@ passed
 
 
 
-
 === TEST 5: hit route (with GET request)
 --- request
 GET /hello
 --- response_body
-Hello, world!
+Hello, function-sample!
 
 
 
@@ -138,8 +136,7 @@ Hello, world!
                  [[{
                         "plugins": {
                             "openfunction": {
-                                "function_uri": "http://127.0.0.1:30585/default/test-body",
-                                "service_token": "test:test"
+                                "function_uri": "http://127.0.0.1:30585/default/test-body"
                             }
                         },
                         "upstream": {
@@ -159,6 +156,8 @@ Hello, world!
 --- response_body
 passed
 
+
+
 === TEST 7: hit route with POST method
 --- request
 POST /hello
@@ -167,7 +166,8 @@ test
 Hello, test!
 
 
-=== TEST 8: reset route with test-body function without service_token
+
+=== TEST 8: reset route with test-body function with service_token
 --- config
     location /t {
         content_by_lua_block {
@@ -177,7 +177,10 @@ Hello, test!
                  [[{
                         "plugins": {
                             "openfunction": {
-                                "function_uri": "http://127.0.0.1:30585/default/test-body"
+                                "function_uri": "http://127.0.0.1:30583/",
+                                "authorization": {
+                                    "service_token": "test:test"
+                                }
                             }
                         },
                         "upstream": {
@@ -198,14 +201,12 @@ Hello, test!
 passed
 
 
-=== TEST 9: hit route with POST request when openfunction required basic auth
+
+=== TEST 9: hit route with POST request with service_token
 --- request
 POST /hello
-test
---- error_code: 401
---- response_body_like eval
-qr/401 Authorization Required/
-
+--- response_body chomp
+[Basic dGVzdDp0ZXN0]
 
 
 
@@ -219,8 +220,7 @@ qr/401 Authorization Required/
                  [[{
                         "plugins": {
                             "openfunction": {
-                                "function_uri": "http://127.0.0.1:30585/default/non-existent",
-                                "service_token": "test:test"
+                                "function_uri": "http://127.0.0.1:30584/default/non-existent"
                             }
                         },
                         "upstream": {
@@ -250,4 +250,4 @@ test
 Content-Type: application/x-www-form-urlencoded
 --- error_code: 404
 --- response_body_like eval
-qr/404 Not Found/
+qr/not found/

From 4f0c086e5128cc248e886ac09c891034f4cdb229 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 11 Aug 2022 21:31:29 +0800
Subject: [PATCH 16/74] docs: add openfunction index

---
 docs/zh/latest/config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json
index 14c45fa6f81a..cf9a4a277ca7 100644
--- a/docs/zh/latest/config.json
+++ b/docs/zh/latest/config.json
@@ -164,7 +164,8 @@
             "plugins/serverless",
             "plugins/azure-functions",
             "plugins/openwhisk",
-            "plugins/aws-lambda"
+            "plugins/aws-lambda",
+            "plugins/openfunction"
           ]
         },
         {

From a779ca1142cb7d85e3ee20e9d042bceef7febdc5 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 11 Aug 2022 21:33:25 +0800
Subject: [PATCH 17/74] feat: reuse serverless.generic-upstream

---
 apisix/plugins/openfunction.lua | 91 ++++-----------------------------
 1 file changed, 11 insertions(+), 80 deletions(-)

diff --git a/apisix/plugins/openfunction.lua b/apisix/plugins/openfunction.lua
index aff1dbd3e5d5..d2080642c89e 100644
--- a/apisix/plugins/openfunction.lua
+++ b/apisix/plugins/openfunction.lua
@@ -14,92 +14,23 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-local core              = require("apisix.core")
-local http              = require("resty.http")
 local ngx_encode_base64 = ngx.encode_base64
-local ngx  = ngx
-
-local schema = {
-    type = "object",
-    properties = {
-        function_uri = {type = "string"},
-        ssl_verify = {
-            type = "boolean",
-            default = true,
-        },
-        service_token = {type = "string"},
-        timeout = {
-            type = "integer",
-            minimum = 1,
-            maximum = 60000,
-            default = 60000,
-            description = "timeout in milliseconds",
-        },
-        keepalive = {type = "boolean", default = true},
-        keepalive_timeout = {type = "integer", minimum = 1000, default = 60000},
-        keepalive_pool = {type = "integer", minimum = 1, default = 5}
-    },
-    required = {"function_uri"}
-}
+local plugin_name, plugin_version, priority = "openfunction", 0.1, -1902
 
-
-local _M = {
-    version = 0.1,
-    priority = -1902,
-    name = "openfunction",
-    schema = schema,
+local openfunction_authz_schema = {
+    service_token = {type = "string"}
 }
 
-
-function _M.check_schema(conf)
-    local ok, err = core.schema.check(schema, conf)
-    if not ok then
-        return false, err
-    end
-
-    return true
-end
-
-
-function _M.access(conf, ctx)
-    local params = {
-        method = ngx.req.get_method(),
-        body = core.request.get_body(),
-        keepalive = conf.keepalive,
-        ssl_verify = conf.ssl_verify,
-        headers = core.request.headers(ctx) or {}
-    }
-
+local function request_processor(conf, ctx, params)
+    local headers = params.headers or {}
     -- setting authorization headers if not already set
-    if not params.headers["Authorization"] and conf.service_token then
-        params.headers["Authorization"] = "Basic " .. ngx_encode_base64(conf.service_token)
+    if not headers["Authorization"] and conf.authorization
+            and conf.authorization.service_token then
+        headers["Authorization"] = "Basic " .. ngx_encode_base64(conf.authorization.service_token)
     end
 
-    if conf.keepalive then
-        params.keepalive_timeout = conf.keepalive_timeout
-        params.keepalive_pool = conf.keepalive_pool
-    end
-
-    local endpoint = conf.function_uri
-    local httpc = http.new()
-    httpc:set_timeout(conf.timeout)
-
-    local res, err = httpc:request_uri(endpoint, params)
-
-    if not res then
-        core.log.error("failed to process ",_M.name, ", err: ", err)
-        return 503
-    end
-
-    -- setting response headers
-    if res.headers ~= nil then
-        core.response.set_header(res.headers)
-    end
-
-    return res.status, res.body
-
+    params.headers = headers
 end
 
-
-return _M
+return require("apisix.plugins.serverless.generic-upstream")(plugin_name,
+        plugin_version, priority, request_processor, openfunction_authz_schema)

From 5096a41c0b9b3d214cfe0f532bbfb473eab7f883 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Fri, 12 Aug 2022 14:56:33 +0800
Subject: [PATCH 18/74] docs: fix lint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index ccb8798e5b9e..8ec45948b647 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -47,7 +47,7 @@ This Plugin can be configured on a Route and requests will be send to the config
 
 :::note
 
-The `timeout` attribute sets the time taken by the OpenFunction to execute, and the timeout for the HTTP client in APISIX. OpenFunction  calls may take time to pull the runtime image and start the container. So, if the value is set too small, it may cause a large number of requests to fail.
+The `timeout` attribute sets the time taken by the OpenFunction to execute, and the timeout for the HTTP client in APISIX. OpenFunction calls may take time to pull the runtime image and start the container. So, if the value is set too small, it may cause a large number of requests to fail.
 
 :::
 

From 9b5dc62f29c6db7cfdf73161de2884b73661042e Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Fri, 12 Aug 2022 14:57:02 +0800
Subject: [PATCH 19/74] docs: fix lint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 8ec45948b647..3e7e851485d8 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -53,7 +53,7 @@ The `timeout` attribute sets the time taken by the OpenFunction to execute, and
 
 ## Enabling the Plugin
 
-Before configuring the Plugin, you need to have OpenFunction running. For details, please refer to [Installation](https://openfunction.dev/docs/getting-started/installation/).
+Before configuring the plugin, you need to have OpenFunction running. For details, please refer to [Installation](https://openfunction.dev/docs/getting-started/installation/).
 The example below shows OpenFunction installed in Helm:
 
 ```shell

From 2d02b0265893504321c76af67616acbcb85d4422 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Fri, 12 Aug 2022 15:20:13 +0800
Subject: [PATCH 20/74] docs: update timeout

---
 docs/en/latest/plugins/openfunction.md | 2 +-
 docs/zh/latest/plugins/openfunction.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index ccb8798e5b9e..7f4de9392f42 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -40,7 +40,7 @@ This Plugin can be configured on a Route and requests will be send to the config
 | function_uri      | string  | True     |         |              | function uri. For example, `https://localhost:30858/default/function-sample`.                              |
 | ssl_verify        | boolean | False    | true    |              | When set to `true` verifies the SSL certificate.                                                           |
 | service_token     | string  | False    |         |              | The token format is 'xx:xx' which support basic auth for ingress controller, .                                      |
-| timeout           | integer | False    | 60000ms | [1, 60000]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
+| timeout           | integer | False    | 3000ms | [100, ...]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
 | keepalive         | boolean | False    | true    |              | When set to `true` keeps the connection alive for reuse.                                                   |
 | keepalive_timeout | integer | False    | 60000ms | [1000,...]ms | Time is ms for connection to remain idle without closing.                                                  |
 | keepalive_pool    | integer | False    | 5       | [1,...]      | Maximum number of requests that can be sent on this connection before closing it.                          |
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index c335a8ffb772..3a15fb2cdcaf 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -40,7 +40,7 @@ description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信
 | function_uri      | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
 | ssl_verify        | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
 | service_token     | string  | 是     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持 ingress controller 的 basic auth 认证方式。 |
-| timeout           | integer | 否     | 60000ms | [1,60000]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
+| timeout           | integer | 否     | 3000ms | [100,...]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
 | keepalive         | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
 | keepalive_timeout | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
 | keepalive_pool    | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |

From f9efd9dc07a1e1757dc7019e2c2439fd409ff167 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Fri, 12 Aug 2022 15:21:08 +0800
Subject: [PATCH 21/74] test: add check user-specific auth header

---
 t/plugin/openfunction.t | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction.t
index 13ab71449800..3eb300bdb759 100644
--- a/t/plugin/openfunction.t
+++ b/t/plugin/openfunction.t
@@ -210,7 +210,17 @@ POST /hello
 
 
 
-=== TEST 10: reset route to non-existent function_uri
+=== TEST 10: check higher priority of user-specific Authorization header
+--- request
+POST /hello
+--- more_headers
+Authorization: user-token-xxx
+--- response_body chomp
+[user-token-xxx]
+
+
+
+=== TEST 11: reset route to non-existent function_uri
 --- config
     location /t {
         content_by_lua_block {
@@ -242,7 +252,7 @@ passed
 
 
 
-=== TEST 11: hit route (with non-existent function_uri)
+=== TEST 12: hit route (with non-existent function_uri)
 --- request
 POST /hello
 test

From 59d5236759500747d7aa4348c6d2c35514a78092 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Sun, 14 Aug 2022 11:29:29 +0800
Subject: [PATCH 22/74] docs: update attributes description

---
 docs/en/latest/plugins/openfunction.md | 27 ++++++++++++++------------
 docs/zh/latest/plugins/openfunction.md | 25 +++++++++++++-----------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 682e4e20dfb5..fa7120915bd3 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -35,15 +35,16 @@ This Plugin can be configured on a Route and requests will be send to the config
 
 ## Attributes
 
-| Name              | Type    | Required | Default | Valid values | Description                                                                                                |
-| ----------------- | ------- | -------- | ------- | ------------ | ---------------------------------------------------------------------------------------------------------- |
-| function_uri      | string  | True     |         |              | function uri. For example, `https://localhost:30858/default/function-sample`.                              |
-| ssl_verify        | boolean | False    | true    |              | When set to `true` verifies the SSL certificate.                                                           |
-| service_token     | string  | False    |         |              | The token format is 'xx:xx' which support basic auth for ingress controller, .                                      |
-| timeout           | integer | False    | 3000ms | [100, ...]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
-| keepalive         | boolean | False    | true    |              | When set to `true` keeps the connection alive for reuse.                                                   |
-| keepalive_timeout | integer | False    | 60000ms | [1000,...]ms | Time is ms for connection to remain idle without closing.                                                  |
-| keepalive_pool    | integer | False    | 5       | [1,...]      | Maximum number of requests that can be sent on this connection before closing it.                          |
+| Name                        | Type    | Required | Default | Valid values | Description                                                                                                |
+| --------------------------- | ------- | -------- | ------- | ------------ | ---------------------------------------------------------------------------------------------------------- |
+| function_uri                | string  | True     |         |              | function uri. For example, `https://localhost:30858/default/function-sample`.                              |
+| ssl_verify                  | boolean | False    | true    |              | When set to `true` verifies the SSL certificate.                                                           |
+| authorization               | object  | False    |         |              | Authorization credentials to access functions of OpenFunction.                                      |
+| authorization.service_token | string  | False    |         |              | The token format is 'xx:xx' which support basic auth for ingress controller, .                                      |
+| timeout                     | integer | False    | 3000ms  | [100, ...]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
+| keepalive                   | boolean | False    | true    |              | When set to `true` keeps the connection alive for reuse.                                                   |
+| keepalive_timeout           | integer | False    | 60000ms | [1000,...]ms | Time is ms for connection to remain idle without closing.                                                  |
+| keepalive_pool              | integer | False    | 5       | [1,...]      | Maximum number of requests that can be sent on this connection before closing it.                          |
 
 :::note
 
@@ -69,7 +70,7 @@ helm install openfunction openfunction/openfunction -n openfunction
 You can then verify if OpenFunction is ready:
 
 ```shell
-kubectl get pods --namespace openfunction
+kubectl get pods -namespace openfunction
 ```
 
 You can then create a function follow the [sample](https://github.com/OpenFunction/samples)
@@ -83,7 +84,9 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
     "plugins": {
         "openfunction": {
             "function_uri": "http://localhost:3233/default/function-sample/test",
-            "service_token": "foo:foo"
+            "authorization": {
+                "service_token": "test:test"
+            }
         }
     }
 }'
@@ -94,7 +97,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
 Once you have configured the Plugin, you can send a request to the Route and it will invoke the configured function:
 
 ```shell
-curl -i http://127.0.0.1:9080/hello
+curl -i http://127.0.0.1:9080/hello -X POST -d'test'
 ```
 
 This will give back the response from the function:
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 3a15fb2cdcaf..94c50781a20c 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -35,15 +35,16 @@ description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信
 
 ## 属性
 
-| 名称              | 类型    | 必选项 | 默认值  | 有效值       | 描述                                                         |
-| ----------------- | ------- | ------ | ------- | ------------ | ------------------------------------------------------------ |
-| function_uri      | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
-| ssl_verify        | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
-| service_token     | string  | 是     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持 ingress controller 的 basic auth 认证方式。 |
-| timeout           | integer | 否     | 3000ms | [100,...]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
-| keepalive         | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
-| keepalive_timeout | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
-| keepalive_pool    | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |
+| 名称                         | 类型    | 必选项 | 默认值  | 有效值       | 描述                                                         |
+| --------------------------- | ------- | ------ | ------- | ------------ | ------------------------------------------------------------ |
+| function_uri                | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
+| ssl_verify                  | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
+| authorization               | object  | 否     |         |              | 访问OpenFunction的函数的授权凭证.                                      |
+| authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持 ingress controller 的 basic auth 认证方式。 |
+| timeout                     | integer | 否     | 3000ms  | [100,...]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
+| keepalive                   | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
+| keepalive_timeout           | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
+| keepalive_pool              | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |
 
 :::note
 
@@ -89,7 +90,9 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
     "plugins": {
         "openfunction": {
             "function_uri": "http://localhost:3233/default/function-sample/test",
-            "service_token": "foo:foo"
+            "authorization": {
+                "service_token": "test:test"
+            }
         }
     }
 }'
@@ -100,7 +103,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
 使用 `curl` 命令测试：
 
 ```shell
-curl -i http://127.0.0.1:9080/hello
+curl -i http://127.0.0.1:9080/hello -X POST -d'test'
 ```
 
 正常返回结果：

From 25c79104448ca6607c9923287ea17bf1296bf36d Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 15 Aug 2022 09:59:17 +0800
Subject: [PATCH 23/74] docs: fix lint

---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 94c50781a20c..82b38d9cfda7 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -39,7 +39,7 @@ description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信
 | --------------------------- | ------- | ------ | ------- | ------------ | ------------------------------------------------------------ |
 | function_uri                | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
 | ssl_verify                  | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
-| authorization               | object  | 否     |         |              | 访问OpenFunction的函数的授权凭证.                                      |
+| authorization               | object  | 否     |         |              | 访问 OpenFunction 的函数的授权凭证。|
 | authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持 ingress controller 的 basic auth 认证方式。 |
 | timeout                     | integer | 否     | 3000ms  | [100,...]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
 | keepalive                   | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |

From 1af451dc50560697f33a13ea82f0a7f942089f64 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 15 Aug 2022 10:23:53 +0800
Subject: [PATCH 24/74] fix: set headers in lower-case

---
 apisix/plugins/openfunction.lua | 4 ++--
 t/plugin/openfunction.t         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apisix/plugins/openfunction.lua b/apisix/plugins/openfunction.lua
index d2080642c89e..f75c3696eb23 100644
--- a/apisix/plugins/openfunction.lua
+++ b/apisix/plugins/openfunction.lua
@@ -24,9 +24,9 @@ local openfunction_authz_schema = {
 local function request_processor(conf, ctx, params)
     local headers = params.headers or {}
     -- setting authorization headers if not already set
-    if not headers["Authorization"] and conf.authorization
+    if not headers["authorization"] and conf.authorization
             and conf.authorization.service_token then
-        headers["Authorization"] = "Basic " .. ngx_encode_base64(conf.authorization.service_token)
+        headers["authorization"] = "Basic " .. ngx_encode_base64(conf.authorization.service_token)
     end
 
     params.headers = headers
diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction.t
index 3eb300bdb759..873ab6923833 100644
--- a/t/plugin/openfunction.t
+++ b/t/plugin/openfunction.t
@@ -214,7 +214,7 @@ POST /hello
 --- request
 POST /hello
 --- more_headers
-Authorization: user-token-xxx
+authorization: user-token-xxx
 --- response_body chomp
 [user-token-xxx]
 

From 79c0b3cbdc15ab5df780bbfa97bcfd3afaed2a10 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 15 Aug 2022 13:51:37 +0800
Subject: [PATCH 25/74] ci: add building image locally

---
 ci/init-plugin-test-service.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index c0d20539a9f8..fe10119ce99d 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -43,11 +43,18 @@ docker exec -i rmqnamesrv /home/rocketmq/rocketmq-4.6.0/bin/mqadmin updateTopic
 docker exec -i vault sh -c "VAULT_TOKEN='root' VAULT_ADDR='http://0.0.0.0:8200' vault secrets enable -path=kv -version=1 kv"
 
 # prepare openfunction env
-docker pull apisixtestaccount123/sample-go-func:v1
-docker pull apisixtestaccount123/sample-go-func:v2
-docker pull apisixtestaccount123/sample-go-func:v3
+wget https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
+tar -zxvf pack-v0.27.0-linux.tgz
 
-nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-header -p 30583:8080 apisixtestaccount123/sample-go-func:v2 >/dev/null 2>&1 &
-nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-body -p 30585:8080 apisixtestaccount123/sample-go-func:v1 >/dev/null 2>&1 &
-nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name func-helloworld-go -p 30584:8080 apisixtestaccount123/sample-go-func:v3 >/dev/null 2>&1 &
+# please fork and repalce this(./samples/functions/knative/hello-world-go) if you want to update function
+git clone https://github.com/OpenFunction/samples.git
+git clone https://github.com/jackkkkklee/my-samples.git
 
+./pack build test-uri-image --path ./samples/functions/knative/hello-world-go  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-body-image --path ./my-samples/functions/knative/hello-world-go --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+git -C my-samples switch release-0.6
+./pack build test-header-image --path ./my-samples/functions/knative/hello-world-go  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+
+nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-uri -p 30584:8080  test-uri-image >/dev/null 2>&1 &
+nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-header -p 30583:8080 test-header-image >/dev/null 2>&1 &
+nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-body -p 30585:8080 test-body-image >/dev/null 2>&1 &

From 90d555590d6300ec33261dc71fb6b51fcafc0891 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 15 Aug 2022 15:17:28 +0800
Subject: [PATCH 26/74] docs: fix plugin description

---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 82b38d9cfda7..24f30d4e3b94 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -5,7 +5,7 @@ keywords:
   - Plugin
   - OpenFunction
   - openfunction
-description: 本文介绍了关于 Apache CNCF OpenFunction 插件的基本信息及使用方法。
+description: 本文介绍了关于 CNCF OpenFunction 插件的基本信息及使用方法。
 ---
 
 <!--

From f7a689cd49aab730fc6c1da2bce9c045cead38e0 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 17 Aug 2022 11:19:33 +0800
Subject: [PATCH 27/74] fix: set auth header once users specify it

---
 apisix/plugins/openfunction.lua |  5 ++---
 t/plugin/openfunction.t         | 40 +++++++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/apisix/plugins/openfunction.lua b/apisix/plugins/openfunction.lua
index f75c3696eb23..935d6ebbc540 100644
--- a/apisix/plugins/openfunction.lua
+++ b/apisix/plugins/openfunction.lua
@@ -23,9 +23,8 @@ local openfunction_authz_schema = {
 
 local function request_processor(conf, ctx, params)
     local headers = params.headers or {}
-    -- setting authorization headers if not already set
-    if not headers["authorization"] and conf.authorization
-            and conf.authorization.service_token then
+    -- setting authorization headers if authorization.service_token exists
+    if  conf.authorization and conf.authorization.service_token then
         headers["authorization"] = "Basic " .. ngx_encode_base64(conf.authorization.service_token)
     end
 
diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction.t
index 873ab6923833..dc52d4f5c384 100644
--- a/t/plugin/openfunction.t
+++ b/t/plugin/openfunction.t
@@ -167,7 +167,7 @@ Hello, test!
 
 
 
-=== TEST 8: reset route with test-body function with service_token
+=== TEST 8: reset route with test-header function with service_token
 --- config
     location /t {
         content_by_lua_block {
@@ -210,7 +210,39 @@ POST /hello
 
 
 
-=== TEST 10: check higher priority of user-specific Authorization header
+=== TEST 10: reset route with test-header function without service_token
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                        "plugins": {
+                            "openfunction": {
+                                "function_uri": "http://127.0.0.1:30583/"
+                            }
+                        },
+                        "upstream": {
+                            "nodes": {},
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello"
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+
+=== TEST 11: hit route with user-specific Authorization header
 --- request
 POST /hello
 --- more_headers
@@ -220,7 +252,7 @@ authorization: user-token-xxx
 
 
 
-=== TEST 11: reset route to non-existent function_uri
+=== TEST 12: reset route to non-existent function_uri
 --- config
     location /t {
         content_by_lua_block {
@@ -252,7 +284,7 @@ passed
 
 
 
-=== TEST 12: hit route (with non-existent function_uri)
+=== TEST 13: hit route (with non-existent function_uri)
 --- request
 POST /hello
 test

From b6f6ab9cf85b48f23b349df175cb89ce46fb22c8 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Wed, 17 Aug 2022 17:57:59 +0800
Subject: [PATCH 28/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index fa7120915bd3..82c9683f9ee5 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -94,7 +94,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
 
 ## Example usage
 
-Once you have configured the Plugin, you can send a request to the Route and it will invoke the configured function:
+Once you have configured the plugin, you can send a request to the Route and it will invoke the configured function:
 
 ```shell
 curl -i http://127.0.0.1:9080/hello -X POST -d'test'

From a2b1ab5b208c0641574783dbaa70f2e34c1978a6 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Wed, 17 Aug 2022 17:58:16 +0800
Subject: [PATCH 29/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 82c9683f9ee5..d515eff1bba1 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -70,7 +70,7 @@ helm install openfunction openfunction/openfunction -n openfunction
 You can then verify if OpenFunction is ready:
 
 ```shell
-kubectl get pods -namespace openfunction
+kubectl get pods --namespace openfunction
 ```
 
 You can then create a function follow the [sample](https://github.com/OpenFunction/samples)

From 42f214dffff8c8ce5c05e6c9463d3615bcc4e407 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Wed, 17 Aug 2022 17:58:37 +0800
Subject: [PATCH 30/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index d515eff1bba1..3146a05ab322 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -58,7 +58,7 @@ Before configuring the plugin, you need to have OpenFunction running. For detail
 The example below shows OpenFunction installed in Helm:
 
 ```shell
-#add the OpenFunction chart repository
+# add the OpenFunction chart repository
 helm repo add openfunction https://openfunction.github.io/charts/
 helm repo update
 

From 2deca1c0599d5bf431d5ac1bb081101f07d6fbb7 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 17 Aug 2022 18:22:23 +0800
Subject: [PATCH 31/74] docs: add prerequisites section

---
 docs/en/latest/plugins/openfunction.md | 23 ++++++++++++++++++-----
 docs/zh/latest/plugins/openfunction.md | 24 ++++++++++++++++--------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 3146a05ab322..59412698e00c 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -31,7 +31,7 @@ description: This document contains information about the CNCF OpenFunction Plug
 
 The `openfunction` Plugin is used to integrate APISIX with [CNCF OpenFunction](https://openfunction.dev/) serverless platform.
 
-This Plugin can be configured on a Route and requests will be send to the configured OpenWhish API endpoint as the upstream.
+This Plugin can be configured on a Route and requests will be send to the configured OpenFunction API endpoint as the upstream.
 
 ## Attributes
 
@@ -40,7 +40,7 @@ This Plugin can be configured on a Route and requests will be send to the config
 | function_uri                | string  | True     |         |              | function uri. For example, `https://localhost:30858/default/function-sample`.                              |
 | ssl_verify                  | boolean | False    | true    |              | When set to `true` verifies the SSL certificate.                                                           |
 | authorization               | object  | False    |         |              | Authorization credentials to access functions of OpenFunction.                                      |
-| authorization.service_token | string  | False    |         |              | The token format is 'xx:xx' which support basic auth for ingress controller, .                                      |
+| authorization.service_token | string  | False    |         |              | The token format is 'xx:xx' which support basic auth for function entry points.                                      |
 | timeout                     | integer | False    | 3000ms  | [100, ...]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
 | keepalive                   | boolean | False    | true    |              | When set to `true` keeps the connection alive for reuse.                                                   |
 | keepalive_timeout           | integer | False    | 60000ms | [1000,...]ms | Time is ms for connection to remain idle without closing.                                                  |
@@ -51,10 +51,11 @@ This Plugin can be configured on a Route and requests will be send to the config
 The `timeout` attribute sets the time taken by the OpenFunction to execute, and the timeout for the HTTP client in APISIX. OpenFunction calls may take time to pull the runtime image and start the container. So, if the value is set too small, it may cause a large number of requests to fail.
 
 :::
+## Prerequisites
 
-## Enabling the Plugin
-
-Before configuring the plugin, you need to have OpenFunction running. For details, please refer to [Installation](https://openfunction.dev/docs/getting-started/installation/).
+Before configuring the plugin, you need to have OpenFunction running.
+Installation of OpenFunction requires a certain version Kubernetes cluster.
+For details, please refer to [Installation](https://openfunction.dev/docs/getting-started/installation/).
 The example below shows OpenFunction installed in Helm:
 
 ```shell
@@ -75,6 +76,18 @@ kubectl get pods --namespace openfunction
 
 You can then create a function follow the [sample](https://github.com/OpenFunction/samples)
 
+When building a function, you’ll need to push your function container image to a container registry like Docker Hub or Quay.io. To do that you’ll need to generate a secret for your container registry first.
+
+```shell
+REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=<your_registry_user> REGISTRY_PASSWORD=<your_registry_password>
+kubectl create secret docker-registry push-secret \
+    --docker-server=$REGISTRY_SERVER \
+    --docker-username=$REGISTRY_USER \
+    --docker-password=$REGISTRY_PASSWORD
+```
+
+## Enabling the Plugin
+
 You can now configure the Plugin on a specific Route and point to this running OpenFunction service:
 
 ```shell
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 24f30d4e3b94..348ffd408f76 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -40,7 +40,7 @@ description: 本文介绍了关于 CNCF OpenFunction 插件的基本信息及使
 | function_uri                | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
 | ssl_verify                  | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
 | authorization               | object  | 否     |         |              | 访问 OpenFunction 的函数的授权凭证。|
-| authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持 ingress controller 的 basic auth 认证方式。 |
+| authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持函数入口的 basic auth 认证方式。 |
 | timeout                     | integer | 否     | 3000ms  | [100,...]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
 | keepalive                   | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
 | keepalive_timeout           | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
@@ -54,12 +54,11 @@ description: 本文介绍了关于 CNCF OpenFunction 插件的基本信息及使
 
 :::
 
-## 启用插件
-
-### 搭建 Apache OpenFunction 测试环境
+## 先决条件
 
-1. 在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。详情参考[官方安装指南](https://openfunction.dev/docs/getting-started/installation/) 。
-请确保当前环境中已经安装 Kubernetes 软件。
+1. 在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。
+详情参考[官方安装指南](https://openfunction.dev/docs/getting-started/installation/) 。
+请确保当前环境中已经安装对应版本的 Kubernetes 集群。
 
 ```shell
 #add the OpenFunction chart repository
@@ -74,12 +73,21 @@ helm install openfunction openfunction/openfunction -n openfunction
 2. 你可以通过以下命令来验证 openfunction 是否已经安装成功：
 
 ```shell
-kubectl get pods -namespace openfunction
+kubectl get pods --namespace openfunction
 ```
 
 3. 你可以通过官方示例创建函数 [sample](https://github.com/OpenFunction/samples)
+构建函数时，需要将函数容器镜像推送到容器仓库，如 Docker Hub 或 Quay.io。要做到这一点，首先需要输入如下命令为容器仓库生成一个密钥。
+
+```shell
+REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=<your_registry_user> REGISTRY_PASSWORD=<your_registry_password>
+kubectl create secret docker-registry push-secret \
+    --docker-server=$REGISTRY_SERVER \
+    --docker-username=$REGISTRY_USER \
+    --docker-password=$REGISTRY_PASSWORD
+```
 
-### 创建路由
+## 启用插件
 
 通过以下命令创建一个路由，并在配置文件中添加 `openfunction` 插件：
 

From 2039b79aef5b3ecb5a6af919be4612e6a63d3ba2 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 17 Aug 2022 20:45:37 +0800
Subject: [PATCH 32/74] docs: fix lint

---
 docs/en/latest/plugins/openfunction.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 59412698e00c..f50064211d54 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -51,6 +51,7 @@ This Plugin can be configured on a Route and requests will be send to the config
 The `timeout` attribute sets the time taken by the OpenFunction to execute, and the timeout for the HTTP client in APISIX. OpenFunction calls may take time to pull the runtime image and start the container. So, if the value is set too small, it may cause a large number of requests to fail.
 
 :::
+
 ## Prerequisites
 
 Before configuring the plugin, you need to have OpenFunction running.

From 274f11bf8204d66535d351e98831eee10272b470 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 18 Aug 2022 17:48:34 +0800
Subject: [PATCH 33/74] docs: add sub headers

---
 docs/en/latest/plugins/openfunction.md |  5 +++++
 docs/zh/latest/plugins/openfunction.md | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index f50064211d54..dd2c5930af9e 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -57,6 +57,9 @@ The `timeout` attribute sets the time taken by the OpenFunction to execute, and
 Before configuring the plugin, you need to have OpenFunction running.
 Installation of OpenFunction requires a certain version Kubernetes cluster.
 For details, please refer to [Installation](https://openfunction.dev/docs/getting-started/installation/).
+
+### Install OpenFunction via Helm Chart
+
 The example below shows OpenFunction installed in Helm:
 
 ```shell
@@ -75,6 +78,8 @@ You can then verify if OpenFunction is ready:
 kubectl get pods --namespace openfunction
 ```
 
+### Create and push a function
+
 You can then create a function follow the [sample](https://github.com/OpenFunction/samples)
 
 When building a function, you’ll need to push your function container image to a container registry like Docker Hub or Quay.io. To do that you’ll need to generate a secret for your container registry first.
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 348ffd408f76..b01d2e89bcb0 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -56,10 +56,12 @@ description: 本文介绍了关于 CNCF OpenFunction 插件的基本信息及使
 
 ## 先决条件
 
-1. 在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。
+在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。
 详情参考[官方安装指南](https://openfunction.dev/docs/getting-started/installation/) 。
 请确保当前环境中已经安装对应版本的 Kubernetes 集群。
 
+### 通过 Helm Chart 安装 OpenFunction
+
 ```shell
 #add the OpenFunction chart repository
 helm repo add openfunction https://openfunction.github.io/charts/
@@ -70,13 +72,15 @@ kubectl create namespace openfunction
 helm install openfunction openfunction/openfunction -n openfunction
 ```
 
-2. 你可以通过以下命令来验证 openfunction 是否已经安装成功：
+你可以通过以下命令来验证 openfunction 是否已经安装成功：
 
 ```shell
 kubectl get pods --namespace openfunction
 ```
 
-3. 你可以通过官方示例创建函数 [sample](https://github.com/OpenFunction/samples)
+### 创建并推送 function
+
+你可以通过官方示例创建函数 [sample](https://github.com/OpenFunction/samples) 。
 构建函数时，需要将函数容器镜像推送到容器仓库，如 Docker Hub 或 Quay.io。要做到这一点，首先需要输入如下命令为容器仓库生成一个密钥。
 
 ```shell

From 461ad962d425d40e5be21bb6cbc6013ab433138c Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Fri, 19 Aug 2022 12:22:13 +0800
Subject: [PATCH 34/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index dd2c5930af9e..cedb69f15076 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -78,7 +78,7 @@ You can then verify if OpenFunction is ready:
 kubectl get pods --namespace openfunction
 ```
 
-### Create and push a function
+### Create and Push a Function
 
 You can then create a function follow the [sample](https://github.com/OpenFunction/samples)
 

From 026a96a04eca4b8d2eeab04b3766155f1beecbb2 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Fri, 19 Aug 2022 12:22:27 +0800
Subject: [PATCH 35/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index cedb69f15076..ec0e4f982e7a 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -92,7 +92,7 @@ kubectl create secret docker-registry push-secret \
     --docker-password=$REGISTRY_PASSWORD
 ```
 
-## Enabling the Plugin
+## Enable the Plugin
 
 You can now configure the Plugin on a specific Route and point to this running OpenFunction service:
 

From ed816eab7555cab133ce03e6e4e00998f15fe857 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Fri, 19 Aug 2022 12:22:41 +0800
Subject: [PATCH 36/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index b01d2e89bcb0..fd5778acff22 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -78,7 +78,7 @@ helm install openfunction openfunction/openfunction -n openfunction
 kubectl get pods --namespace openfunction
 ```
 
-### 创建并推送 function
+### 创建并推送函数
 
 你可以通过官方示例创建函数 [sample](https://github.com/OpenFunction/samples) 。
 构建函数时，需要将函数容器镜像推送到容器仓库，如 Docker Hub 或 Quay.io。要做到这一点，首先需要输入如下命令为容器仓库生成一个密钥。

From eeee13043ad8098f45df0b94abe3d48a6e502cd7 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Fri, 19 Aug 2022 13:55:10 +0800
Subject: [PATCH 37/74] feat: add path forwarding test cases and docs

---
 docs/en/latest/plugins/openfunction.md | 39 ++++++++++++++++++++++++-
 docs/zh/latest/plugins/openfunction.md | 36 +++++++++++++++++++++++
 t/plugin/openfunction.t                | 40 ++++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index ec0e4f982e7a..cf1aab911f6d 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -116,7 +116,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
 Once you have configured the plugin, you can send a request to the Route and it will invoke the configured function:
 
 ```shell
-curl -i http://127.0.0.1:9080/hello -X POST -d'test'
+curl -i http://127.0.0.1:9080/hello
 ```
 
 This will give back the response from the function:
@@ -125,6 +125,43 @@ This will give back the response from the function:
 hello, test!
 ```
 
+### Configuring path forwarding
+
+The `OpenFunction` Plugins also supports URL path forwarding while proxying requests to the OpenFunction API endpoints upstream. Extensions to the base request path gets appended to the `function_uri` specified in the Plugin configuration.
+
+:::info IMPORTANT
+
+The `uri` configured on a Route must end with `*` for this feature to work properly. APISIX Routes are matched strictly and the `*` implies that any subpath to this URI would be matched to the same Route.
+
+:::
+
+The example below configures this feature:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+    "uri": "/hello/*",
+    "plugins": {
+        "openfunction": {
+            "function_uri": "http://localhost:3233/default/function-sample",
+            "authorization": {
+                "service_token": "test:test"
+            }
+        }
+    }
+}'
+```
+
+Now, any requests to the path `hello/123` will invoke the OpenFunction ,and the added path is forwarded:
+
+```shell
+curl  http://127.0.0.1:9080/hello/123
+```
+
+```shell
+Hello, 123!
+```
+
 ## Disable Plugin
 
 To disable the `openfunction` Plugin, you can delete the corresponding JSON configuration from the Plugin configuration. APISIX will automatically reload and you do not have to restart for this to take effect.
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index fd5778acff22..a294553e6320 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -124,6 +124,42 @@ curl -i http://127.0.0.1:9080/hello -X POST -d'test'
 hello, test!
 ```
 
+### 配置路径转发
+
+`OpenFunction` 插件还支持URL路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展被附加到插件配置中指定的 `function_uri` 。
+
+:::info IMPORTANT
+
+路由上配置的 `uri` 必须以 `*` 结尾，此功能才能正常工作。 APISIX 路由是严格匹配的，`*` 表示此 URI 的任何子路径都将匹配到同一路由。
+:::
+
+下面的示例配置了此功能:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+    "uri": "/hello/*",
+    "plugins": {
+        "openfunction": {
+            "function_uri": "http://localhost:3233/default/function-sample",
+            "authorization": {
+                "service_token": "test:test"
+            }
+        }
+    }
+}'
+```
+
+现在，对路径 `hello/123` 的任何请求都将调用 OpenFunction 插件设置的对应的函数，并转发添加的路径：
+
+```shell
+curl  http://127.0.0.1:9080/hello/123
+```
+
+```shell
+Hello, 123!
+```
+
 ## 禁用插件
 
 当你需要禁用 `openfunction` 插件时，可以通过以下命令删除相应的 JSON 配置，APISIX 将会自动重新加载相关配置，无需重启服务：
diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction.t
index dc52d4f5c384..8da960df4d40 100644
--- a/t/plugin/openfunction.t
+++ b/t/plugin/openfunction.t
@@ -293,3 +293,43 @@ Content-Type: application/x-www-form-urlencoded
 --- error_code: 404
 --- response_body_like eval
 qr/not found/
+
+
+
+=== TEST 14: reset route with test-uri function and path forwarding
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                        "plugins": {
+                            "openfunction": {
+                                "function_uri": "http://127.0.0.1:30584"
+                            }
+                        },
+                        "upstream": {
+                            "nodes": {},
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello/*"
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+
+=== TEST 15: hit route with GET method
+--- request
+GET /hello/openfunction
+--- response_body
+Hello, openfunction!

From c95f3c1caa8f98280a6c0d8163d0b0861a338e3b Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Fri, 19 Aug 2022 13:59:48 +0800
Subject: [PATCH 38/74] docs: fix lint

---
 docs/zh/latest/plugins/openfunction.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index a294553e6320..e98f507bb5d2 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -126,14 +126,14 @@ hello, test!
 
 ### 配置路径转发
 
-`OpenFunction` 插件还支持URL路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展被附加到插件配置中指定的 `function_uri` 。
+`OpenFunction` 插件还支持 URL 路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展被附加到插件配置中指定的 `function_uri` 。
 
 :::info IMPORTANT
 
 路由上配置的 `uri` 必须以 `*` 结尾，此功能才能正常工作。 APISIX 路由是严格匹配的，`*` 表示此 URI 的任何子路径都将匹配到同一路由。
 :::
 
-下面的示例配置了此功能:
+下面的示例配置了此功能：
 
 ```shell
 curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '

From de829b4d37e302dbf66cf4e6ad156e4f235948a6 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Sat, 20 Aug 2022 22:26:50 +0800
Subject: [PATCH 39/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 ci/init-plugin-test-service.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index fe10119ce99d..a785d48fc8dc 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -46,7 +46,7 @@ docker exec -i vault sh -c "VAULT_TOKEN='root' VAULT_ADDR='http://0.0.0.0:8200'
 wget https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
 tar -zxvf pack-v0.27.0-linux.tgz
 
-# please fork and repalce this(./samples/functions/knative/hello-world-go) if you want to update function
+# please fork and replace this(./samples/functions/knative/hello-world-go) if you want to update function
 git clone https://github.com/OpenFunction/samples.git
 git clone https://github.com/jackkkkklee/my-samples.git
 

From ba3f404c44cb85b8792c3964520bd9f32b010baa Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Sat, 20 Aug 2022 22:27:18 +0800
Subject: [PATCH 40/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index cf1aab911f6d..efb65cfeffdf 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -31,7 +31,7 @@ description: This document contains information about the CNCF OpenFunction Plug
 
 The `openfunction` Plugin is used to integrate APISIX with [CNCF OpenFunction](https://openfunction.dev/) serverless platform.
 
-This Plugin can be configured on a Route and requests will be send to the configured OpenFunction API endpoint as the upstream.
+This Plugin can be configured on a Route and requests will be sent to the configured OpenFunction API endpoint as the upstream.
 
 ## Attributes
 

From 2ab75caa286a5d6e52d7e76e4ce15588ff2c3789 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Sun, 21 Aug 2022 10:06:07 +0800
Subject: [PATCH 41/74] test: add function-example and change directory
 structure

---
 .../function-example/test-body/go.mod         |  5 +++++
 .../function-example/test-body/hello.go       | 17 +++++++++++++++++
 .../function-example/test-header/go.mod       |  3 +++
 .../function-example/test-header/hello.go     | 11 +++++++++++
 .../function-example/test-url/go.mod          |  5 +++++
 .../function-example/test-url/hello.go        | 19 +++++++++++++++++++
 t/plugin/{ => openfunction}/openfunction.t    |  0
 7 files changed, 60 insertions(+)
 create mode 100644 t/plugin/openfunction/function-example/test-body/go.mod
 create mode 100644 t/plugin/openfunction/function-example/test-body/hello.go
 create mode 100644 t/plugin/openfunction/function-example/test-header/go.mod
 create mode 100644 t/plugin/openfunction/function-example/test-header/hello.go
 create mode 100644 t/plugin/openfunction/function-example/test-url/go.mod
 create mode 100644 t/plugin/openfunction/function-example/test-url/hello.go
 rename t/plugin/{ => openfunction}/openfunction.t (100%)

diff --git a/t/plugin/openfunction/function-example/test-body/go.mod b/t/plugin/openfunction/function-example/test-body/go.mod
new file mode 100644
index 000000000000..6242ced93022
--- /dev/null
+++ b/t/plugin/openfunction/function-example/test-body/go.mod
@@ -0,0 +1,5 @@
+module example.com/hello
+
+go 1.16
+
+require github.com/OpenFunction/functions-framework-go v0.3.0
diff --git a/t/plugin/openfunction/function-example/test-body/hello.go b/t/plugin/openfunction/function-example/test-body/hello.go
new file mode 100644
index 000000000000..5511581c2373
--- /dev/null
+++ b/t/plugin/openfunction/function-example/test-body/hello.go
@@ -0,0 +1,17 @@
+package hello
+
+import (
+	"fmt"
+	"net/http"
+	"io/ioutil"
+	"github.com/OpenFunction/functions-framework-go/functions"
+)
+
+func init() {
+	functions.HTTP("HelloWorld", HelloWorld)
+}
+
+func HelloWorld(w http.ResponseWriter, r *http.Request) {
+	body,_ := ioutil.ReadAll(r.Body)
+	fmt.Fprintf(w, "Hello, %s!\n", string(body))
+}
diff --git a/t/plugin/openfunction/function-example/test-header/go.mod b/t/plugin/openfunction/function-example/test-header/go.mod
new file mode 100644
index 000000000000..32c2cadc95a8
--- /dev/null
+++ b/t/plugin/openfunction/function-example/test-header/go.mod
@@ -0,0 +1,3 @@
+module example.com/hello
+
+go 1.16
diff --git a/t/plugin/openfunction/function-example/test-header/hello.go b/t/plugin/openfunction/function-example/test-header/hello.go
new file mode 100644
index 000000000000..a7c3d0e5bd99
--- /dev/null
+++ b/t/plugin/openfunction/function-example/test-header/hello.go
@@ -0,0 +1,11 @@
+package hello
+
+import (
+	"fmt"
+	"net/http"
+)
+
+func HelloWorld(w http.ResponseWriter, r *http.Request) {
+	header := r.Header
+	fmt.Fprintf(w, "%s", header["Authorization"])
+}
diff --git a/t/plugin/openfunction/function-example/test-url/go.mod b/t/plugin/openfunction/function-example/test-url/go.mod
new file mode 100644
index 000000000000..c259999831bd
--- /dev/null
+++ b/t/plugin/openfunction/function-example/test-url/go.mod
@@ -0,0 +1,5 @@
+module example.com/hello
+
+go 1.17
+
+require github.com/OpenFunction/functions-framework-go v0.4.0
diff --git a/t/plugin/openfunction/function-example/test-url/hello.go b/t/plugin/openfunction/function-example/test-url/hello.go
new file mode 100644
index 000000000000..17c1b99252c4
--- /dev/null
+++ b/t/plugin/openfunction/function-example/test-url/hello.go
@@ -0,0 +1,19 @@
+package hello
+
+import (
+	"fmt"
+	ofctx "github.com/OpenFunction/functions-framework-go/context"
+	"net/http"
+
+	"github.com/OpenFunction/functions-framework-go/functions"
+)
+
+func init() {
+	functions.HTTP("HelloWorld", HelloWorld,
+		functions.WithFunctionPath("/{greeting}"))
+}
+
+func HelloWorld(w http.ResponseWriter, r *http.Request) {
+	vars := ofctx.VarsFromCtx(r.Context())
+	fmt.Fprintf(w, "Hello, %s!\n", vars["greeting"])
+}
diff --git a/t/plugin/openfunction.t b/t/plugin/openfunction/openfunction.t
similarity index 100%
rename from t/plugin/openfunction.t
rename to t/plugin/openfunction/openfunction.t

From 6eb79f9768f044ab9cce97a813e17af74c8b21bb Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Sun, 21 Aug 2022 10:11:45 +0800
Subject: [PATCH 42/74] ci: build function by inner repository

---
 ci/init-plugin-test-service.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index a785d48fc8dc..2b6a0bfb4b14 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -46,14 +46,10 @@ docker exec -i vault sh -c "VAULT_TOKEN='root' VAULT_ADDR='http://0.0.0.0:8200'
 wget https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
 tar -zxvf pack-v0.27.0-linux.tgz
 
-# please fork and replace this(./samples/functions/knative/hello-world-go) if you want to update function
-git clone https://github.com/OpenFunction/samples.git
-git clone https://github.com/jackkkkklee/my-samples.git
-
-./pack build test-uri-image --path ./samples/functions/knative/hello-world-go  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-./pack build test-body-image --path ./my-samples/functions/knative/hello-world-go --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-git -C my-samples switch release-0.6
-./pack build test-header-image --path ./my-samples/functions/knative/hello-world-go  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+# please update ./t/plugin/openfunction/function-example if you want to update function
+./pack build test-uri-image --path ./t/plugin/openfunction/function-example/test-uri  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-body-image --path ./t/plugin/openfunction/function-example/test-body --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-header-image --path ./t/plugin/openfunction/function-example/test-header  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
 
 nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-uri -p 30584:8080  test-uri-image >/dev/null 2>&1 &
 nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-header -p 30583:8080 test-header-image >/dev/null 2>&1 &

From a703e08534c7d8bbf1b3fc70aa8842ddd62fc020 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Sun, 21 Aug 2022 10:48:23 +0800
Subject: [PATCH 43/74] fix: change directory name

---
 .../openfunction/function-example/{test-url => test-uri}/go.mod   | 0
 .../openfunction/function-example/{test-url => test-uri}/hello.go | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename t/plugin/openfunction/function-example/{test-url => test-uri}/go.mod (100%)
 rename t/plugin/openfunction/function-example/{test-url => test-uri}/hello.go (100%)

diff --git a/t/plugin/openfunction/function-example/test-url/go.mod b/t/plugin/openfunction/function-example/test-uri/go.mod
similarity index 100%
rename from t/plugin/openfunction/function-example/test-url/go.mod
rename to t/plugin/openfunction/function-example/test-uri/go.mod
diff --git a/t/plugin/openfunction/function-example/test-url/hello.go b/t/plugin/openfunction/function-example/test-uri/hello.go
similarity index 100%
rename from t/plugin/openfunction/function-example/test-url/hello.go
rename to t/plugin/openfunction/function-example/test-uri/hello.go

From 09b73ff5feaffd0ba3ef5c416f5ef9c4f1efa867 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Sun, 21 Aug 2022 20:24:48 +0800
Subject: [PATCH 44/74] fix: add licenses

---
 .../function-example/test-body/hello.go         | 17 +++++++++++++++++
 .../function-example/test-header/hello.go       | 17 +++++++++++++++++
 .../function-example/test-uri/hello.go          | 17 +++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/t/plugin/openfunction/function-example/test-body/hello.go b/t/plugin/openfunction/function-example/test-body/hello.go
index 5511581c2373..d132011b7c14 100644
--- a/t/plugin/openfunction/function-example/test-body/hello.go
+++ b/t/plugin/openfunction/function-example/test-body/hello.go
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package hello
 
 import (
diff --git a/t/plugin/openfunction/function-example/test-header/hello.go b/t/plugin/openfunction/function-example/test-header/hello.go
index a7c3d0e5bd99..5dfb79025343 100644
--- a/t/plugin/openfunction/function-example/test-header/hello.go
+++ b/t/plugin/openfunction/function-example/test-header/hello.go
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package hello
 
 import (
diff --git a/t/plugin/openfunction/function-example/test-uri/hello.go b/t/plugin/openfunction/function-example/test-uri/hello.go
index 17c1b99252c4..73d9037086a6 100644
--- a/t/plugin/openfunction/function-example/test-uri/hello.go
+++ b/t/plugin/openfunction/function-example/test-uri/hello.go
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package hello
 
 import (

From 0cd99752e14b1efcdd8f880b34dc50f74e20612c Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 10:34:41 +0800
Subject: [PATCH 45/74] fix: update licenses

---
 t/plugin/openfunction/function-example/test-body/hello.go   | 2 ++
 t/plugin/openfunction/function-example/test-header/hello.go | 2 ++
 t/plugin/openfunction/function-example/test-uri/hello.go    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/t/plugin/openfunction/function-example/test-body/hello.go b/t/plugin/openfunction/function-example/test-body/hello.go
index d132011b7c14..ffa7fad6bd7e 100644
--- a/t/plugin/openfunction/function-example/test-body/hello.go
+++ b/t/plugin/openfunction/function-example/test-body/hello.go
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2022 The OpenFunction Authors.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
diff --git a/t/plugin/openfunction/function-example/test-header/hello.go b/t/plugin/openfunction/function-example/test-header/hello.go
index 5dfb79025343..418f9fb80943 100644
--- a/t/plugin/openfunction/function-example/test-header/hello.go
+++ b/t/plugin/openfunction/function-example/test-header/hello.go
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2022 The OpenFunction Authors.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
diff --git a/t/plugin/openfunction/function-example/test-uri/hello.go b/t/plugin/openfunction/function-example/test-uri/hello.go
index 73d9037086a6..d726b8e59457 100644
--- a/t/plugin/openfunction/function-example/test-uri/hello.go
+++ b/t/plugin/openfunction/function-example/test-uri/hello.go
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2022 The OpenFunction Authors.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.

From 898bb5ddbf9bffb3ef32cef674cc86fc1e833b65 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 14:54:23 +0800
Subject: [PATCH 46/74] feat: run OpenFunction function images in docker-compse

---
 ci/pod/docker-compose.plugin.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ci/pod/docker-compose.plugin.yml b/ci/pod/docker-compose.plugin.yml
index 226abd7ed204..4a1a328b41a7 100644
--- a/ci/pod/docker-compose.plugin.yml
+++ b/ci/pod/docker-compose.plugin.yml
@@ -197,6 +197,34 @@ services:
       SPLUNK_HEC_TOKEN: "BD274822-96AA-4DA6-90EC-18940FB2414C"
       SPLUNK_HEC_SSL: "False"
 
+  # The function services of OpenFunction
+  test-header:
+    image: test-header-image:latest
+    restart: unless-stopped
+    ports:
+      - "30583:8080"
+    environment:
+      CONTEXT_MODE: "self-host"
+      FUNC_CONTEXT: "{\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}"
+
+  test-uri:
+    image: test-uri-image:latest
+    restart: unless-stopped
+    ports:
+      - "30584:8080"
+    environment:
+      CONTEXT_MODE: "self-host"
+      FUNC_CONTEXT: "{\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}"
+
+  test-body:
+    image: test-body-image:latest
+    restart: unless-stopped
+    ports:
+      - "30585:8080"
+    environment:
+      CONTEXT_MODE: "self-host"
+      FUNC_CONTEXT: "{\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}"
+
 
 networks:
   apisix_net:

From 185741073ff962465838e94219e1dda3df0b6d77 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 14:57:19 +0800
Subject: [PATCH 47/74] ci: build Openfunction functions image before running

---
 .github/workflows/centos7-ci.yml              |  1 +
 ci/init-plugin-test-service.sh                | 12 ---------
 .../function-example/build-function-image.sh  | 25 +++++++++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 t/plugin/openfunction/function-example/build-function-image.sh

diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index b308c79fb95b..3bc7fe18eb1a 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -101,6 +101,7 @@ jobs:
     - name: Start CI env (PLUGIN_TEST)
       if: steps.test_env.outputs.type == 'plugin'
       run: |
+        sh t/plugin/openfunction/build-function-image.sh
         make ci-env-up project_compose_ci=ci/pod/docker-compose.${{ steps.test_env.outputs.type }}.yml
         ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh
 
diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 2b6a0bfb4b14..15b412933c2a 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -42,15 +42,3 @@ docker exec -i rmqnamesrv /home/rocketmq/rocketmq-4.6.0/bin/mqadmin updateTopic
 # prepare vault kv engine
 docker exec -i vault sh -c "VAULT_TOKEN='root' VAULT_ADDR='http://0.0.0.0:8200' vault secrets enable -path=kv -version=1 kv"
 
-# prepare openfunction env
-wget https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
-tar -zxvf pack-v0.27.0-linux.tgz
-
-# please update ./t/plugin/openfunction/function-example if you want to update function
-./pack build test-uri-image --path ./t/plugin/openfunction/function-example/test-uri  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-./pack build test-body-image --path ./t/plugin/openfunction/function-example/test-body --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-./pack build test-header-image --path ./t/plugin/openfunction/function-example/test-header  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-
-nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-uri -p 30584:8080  test-uri-image >/dev/null 2>&1 &
-nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-header -p 30583:8080 test-header-image >/dev/null 2>&1 &
-nohup docker run --rm --env="FUNC_CONTEXT={\"name\":\"HelloWorld\",\"version\":\"v1.0.0\",\"port\":\"8080\",\"runtime\":\"Knative\"}" --env="CONTEXT_MODE=self-host" --name test-body -p 30585:8080 test-body-image >/dev/null 2>&1 &
diff --git a/t/plugin/openfunction/function-example/build-function-image.sh b/t/plugin/openfunction/function-example/build-function-image.sh
new file mode 100644
index 000000000000..09fc1a3c2eb7
--- /dev/null
+++ b/t/plugin/openfunction/function-example/build-function-image.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+wget https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
+tar -zxvf pack-v0.27.0-linux.tgz
+
+# please update ./t/plugin/openfunction/function-example if you want to update function
+./pack build test-uri-image --path ./t/plugin/openfunction/function-example/test-uri  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-body-image --path ./t/plugin/openfunction/function-example/test-body --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-header-image --path ./t/plugin/openfunction/function-example/test-header  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"

From 72ee91a9d0da573455384cad326f03402eb5a548 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 15:07:22 +0800
Subject: [PATCH 48/74] fix: move build-function-image.sh to
 ./t/plugin/openfunction/

---
 .../openfunction/{function-example => }/build-function-image.sh   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename t/plugin/openfunction/{function-example => }/build-function-image.sh (100%)

diff --git a/t/plugin/openfunction/function-example/build-function-image.sh b/t/plugin/openfunction/build-function-image.sh
similarity index 100%
rename from t/plugin/openfunction/function-example/build-function-image.sh
rename to t/plugin/openfunction/build-function-image.sh

From d47e753ac4466aa540ffc2e84bd489b584ce2e1f Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 16:07:01 +0800
Subject: [PATCH 49/74] ci: add building OpenFunction function images by
 build-pack

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 287067390248..6c2df320b7e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,6 +106,7 @@ jobs:
       - name: Start CI env (PLUGIN_TEST)
         if: steps.test_env.outputs.type == 'plugin'
         run: |
+          sudo ./t/plugin/openfunction/build-function-image.sh
           make ci-env-up project_compose_ci=ci/pod/docker-compose.${{ steps.test_env.outputs.type }}.yml
           sudo ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh
 

From 0723388b68ccb49a903ce493997c9e12d35d08ab Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 16:12:03 +0800
Subject: [PATCH 50/74] ci: add building OpenFunction function images by
 build-pack

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c2df320b7e4..c07193c4b418 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
       - name: Start CI env (PLUGIN_TEST)
         if: steps.test_env.outputs.type == 'plugin'
         run: |
-          sudo ./t/plugin/openfunction/build-function-image.sh
+          sh t/plugin/openfunction/build-function-image.sh
           make ci-env-up project_compose_ci=ci/pod/docker-compose.${{ steps.test_env.outputs.type }}.yml
           sudo ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh
 

From 7c5d140a2b78c8a9d433d25ab0a93a5261a65a35 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 17:40:25 +0800
Subject: [PATCH 51/74] fix: add openfunction in license

---
 LICENSE | 1 +
 1 file changed, 1 insertion(+)

diff --git a/LICENSE b/LICENSE
index 0474b542fb65..5cadce448d62 100644
--- a/LICENSE
+++ b/LICENSE
@@ -216,3 +216,4 @@ The following components are provided under the Apache License. See project link
 The text of each license is the standard Apache 2.0 license.
 
    ewma.lua file from kubernetes/ingress-nginx: https://github.com/kubernetes/ingress-nginx Apache 2.0
+   hello.go file from OpenFunction/samples: https://github.com/OpenFunction/samples Apache 2.0

From a940223b10da670195ca709cb11e204e0d92a2d9 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 22:29:31 +0800
Subject: [PATCH 52/74] ci: modify directory of function-example

---
 .github/workflows/build.yml                               | 2 +-
 .github/workflows/centos7-ci.yml                          | 2 +-
 {t/plugin => ci/pod}/openfunction/build-function-image.sh | 8 ++++----
 .../pod}/openfunction/function-example/test-body/go.mod   | 0
 .../pod}/openfunction/function-example/test-body/hello.go | 0
 .../pod}/openfunction/function-example/test-header/go.mod | 0
 .../openfunction/function-example/test-header/hello.go    | 0
 .../pod}/openfunction/function-example/test-uri/go.mod    | 0
 .../pod}/openfunction/function-example/test-uri/hello.go  | 0
 t/plugin/{openfunction => }/openfunction.t                | 0
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename {t/plugin => ci/pod}/openfunction/build-function-image.sh (54%)
 rename {t/plugin => ci/pod}/openfunction/function-example/test-body/go.mod (100%)
 rename {t/plugin => ci/pod}/openfunction/function-example/test-body/hello.go (100%)
 rename {t/plugin => ci/pod}/openfunction/function-example/test-header/go.mod (100%)
 rename {t/plugin => ci/pod}/openfunction/function-example/test-header/hello.go (100%)
 rename {t/plugin => ci/pod}/openfunction/function-example/test-uri/go.mod (100%)
 rename {t/plugin => ci/pod}/openfunction/function-example/test-uri/hello.go (100%)
 rename t/plugin/{openfunction => }/openfunction.t (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c07193c4b418..ba447d68d3d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
       - name: Start CI env (PLUGIN_TEST)
         if: steps.test_env.outputs.type == 'plugin'
         run: |
-          sh t/plugin/openfunction/build-function-image.sh
+          sh ci/pod/openfunction/build-function-image.sh
           make ci-env-up project_compose_ci=ci/pod/docker-compose.${{ steps.test_env.outputs.type }}.yml
           sudo ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh
 
diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index 3bc7fe18eb1a..584ffac3bf20 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -101,7 +101,7 @@ jobs:
     - name: Start CI env (PLUGIN_TEST)
       if: steps.test_env.outputs.type == 'plugin'
       run: |
-        sh t/plugin/openfunction/build-function-image.sh
+        sh ci/pod/openfunction/build-function-image.sh
         make ci-env-up project_compose_ci=ci/pod/docker-compose.${{ steps.test_env.outputs.type }}.yml
         ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh
 
diff --git a/t/plugin/openfunction/build-function-image.sh b/ci/pod/openfunction/build-function-image.sh
similarity index 54%
rename from t/plugin/openfunction/build-function-image.sh
rename to ci/pod/openfunction/build-function-image.sh
index 09fc1a3c2eb7..ab4fc8c46093 100644
--- a/t/plugin/openfunction/build-function-image.sh
+++ b/ci/pod/openfunction/build-function-image.sh
@@ -19,7 +19,7 @@
 wget https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
 tar -zxvf pack-v0.27.0-linux.tgz
 
-# please update ./t/plugin/openfunction/function-example if you want to update function
-./pack build test-uri-image --path ./t/plugin/openfunction/function-example/test-uri  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-./pack build test-body-image --path ./t/plugin/openfunction/function-example/test-body --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-./pack build test-header-image --path ./t/plugin/openfunction/function-example/test-header  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+# please update function-example/*/hello.go if you want to update function
+./pack build test-uri-image --path .ci/pod/openfunction/function-example/test-uri  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-body-image --path .ci/pod/openfunction/function-example/test-body --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-header-image --path .ci/pod/openfunction/function-example/test-header  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
diff --git a/t/plugin/openfunction/function-example/test-body/go.mod b/ci/pod/openfunction/function-example/test-body/go.mod
similarity index 100%
rename from t/plugin/openfunction/function-example/test-body/go.mod
rename to ci/pod/openfunction/function-example/test-body/go.mod
diff --git a/t/plugin/openfunction/function-example/test-body/hello.go b/ci/pod/openfunction/function-example/test-body/hello.go
similarity index 100%
rename from t/plugin/openfunction/function-example/test-body/hello.go
rename to ci/pod/openfunction/function-example/test-body/hello.go
diff --git a/t/plugin/openfunction/function-example/test-header/go.mod b/ci/pod/openfunction/function-example/test-header/go.mod
similarity index 100%
rename from t/plugin/openfunction/function-example/test-header/go.mod
rename to ci/pod/openfunction/function-example/test-header/go.mod
diff --git a/t/plugin/openfunction/function-example/test-header/hello.go b/ci/pod/openfunction/function-example/test-header/hello.go
similarity index 100%
rename from t/plugin/openfunction/function-example/test-header/hello.go
rename to ci/pod/openfunction/function-example/test-header/hello.go
diff --git a/t/plugin/openfunction/function-example/test-uri/go.mod b/ci/pod/openfunction/function-example/test-uri/go.mod
similarity index 100%
rename from t/plugin/openfunction/function-example/test-uri/go.mod
rename to ci/pod/openfunction/function-example/test-uri/go.mod
diff --git a/t/plugin/openfunction/function-example/test-uri/hello.go b/ci/pod/openfunction/function-example/test-uri/hello.go
similarity index 100%
rename from t/plugin/openfunction/function-example/test-uri/hello.go
rename to ci/pod/openfunction/function-example/test-uri/hello.go
diff --git a/t/plugin/openfunction/openfunction.t b/t/plugin/openfunction.t
similarity index 100%
rename from t/plugin/openfunction/openfunction.t
rename to t/plugin/openfunction.t

From 74114916da0df481f1e32389178827fb7448d263 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Mon, 22 Aug 2022 22:30:32 +0800
Subject: [PATCH 53/74] ci: modify directory of function-example

---
 ci/pod/openfunction/build-function-image.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/pod/openfunction/build-function-image.sh b/ci/pod/openfunction/build-function-image.sh
index ab4fc8c46093..3ad08447d090 100644
--- a/ci/pod/openfunction/build-function-image.sh
+++ b/ci/pod/openfunction/build-function-image.sh
@@ -20,6 +20,6 @@ wget https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-l
 tar -zxvf pack-v0.27.0-linux.tgz
 
 # please update function-example/*/hello.go if you want to update function
-./pack build test-uri-image --path .ci/pod/openfunction/function-example/test-uri  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-./pack build test-body-image --path .ci/pod/openfunction/function-example/test-body --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
-./pack build test-header-image --path .ci/pod/openfunction/function-example/test-header  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-uri-image --path ./ci/pod/openfunction/function-example/test-uri  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-body-image --path ./ci/pod/openfunction/function-example/test-body --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"
+./pack build test-header-image --path ./ci/pod/openfunction/function-example/test-header  --builder openfunction/builder-go:v2.4.0-1.17 --env FUNC_NAME="HelloWorld"  --env FUNC_CLEAR_SOURCE=true --env FUNC_GOPROXY="https://goproxy.cn"

From bf72abf9ecc40c9ee37794ab0cd040d564dcabc2 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Tue, 23 Aug 2022 10:21:04 +0800
Subject: [PATCH 54/74] =?UTF-8?q?docs=EF=BC=9Aoptimize=20docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index efb65cfeffdf..2aefdabb185f 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -127,7 +127,7 @@ hello, test!
 
 ### Configuring path forwarding
 
-The `OpenFunction` Plugins also supports URL path forwarding while proxying requests to the OpenFunction API endpoints upstream. Extensions to the base request path gets appended to the `function_uri` specified in the Plugin configuration.
+The `OpenFunction` Plugin also supports transforming the URL path while proxying requests to the OpenFunction API endpoints. Extensions to the base request path get appended to the `function_uri` specified in the Plugin configuration.
 
 :::info IMPORTANT
 

From b294d83db0e84fa38ed72b8d1ba5487d832f0205 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Tue, 23 Aug 2022 10:40:00 +0800
Subject: [PATCH 55/74] docs: fix grammar problems

---
 docs/en/latest/plugins/openfunction.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 2aefdabb185f..c5471ce5b499 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -40,7 +40,7 @@ This Plugin can be configured on a Route and requests will be sent to the config
 | function_uri                | string  | True     |         |              | function uri. For example, `https://localhost:30858/default/function-sample`.                              |
 | ssl_verify                  | boolean | False    | true    |              | When set to `true` verifies the SSL certificate.                                                           |
 | authorization               | object  | False    |         |              | Authorization credentials to access functions of OpenFunction.                                      |
-| authorization.service_token | string  | False    |         |              | The token format is 'xx:xx' which support basic auth for function entry points.                                      |
+| authorization.service_token | string  | False    |         |              | The token format is 'xx:xx' which supports basic auth for function entry points.                                      |
 | timeout                     | integer | False    | 3000ms  | [100, ...]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
 | keepalive                   | boolean | False    | true    |              | When set to `true` keeps the connection alive for reuse.                                                   |
 | keepalive_timeout           | integer | False    | 60000ms | [1000,...]ms | Time is ms for connection to remain idle without closing.                                                  |
@@ -80,9 +80,9 @@ kubectl get pods --namespace openfunction
 
 ### Create and Push a Function
 
-You can then create a function follow the [sample](https://github.com/OpenFunction/samples)
+You can then create a function following the [sample](https://github.com/OpenFunction/samples)
 
-When building a function, you’ll need to push your function container image to a container registry like Docker Hub or Quay.io. To do that you’ll need to generate a secret for your container registry first.
+You'll need to push your function container image to a container registry like Docker Hub or Quay.io when building a function. To do that, you'll need to generate a secret for your container registry first.
 
 ```shell
 REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=<your_registry_user> REGISTRY_PASSWORD=<your_registry_password>
@@ -152,7 +152,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
 }'
 ```
 
-Now, any requests to the path `hello/123` will invoke the OpenFunction ,and the added path is forwarded:
+Now, any requests to the path `hello/123` will invoke the OpenFunction, and the added path is forwarded:
 
 ```shell
 curl  http://127.0.0.1:9080/hello/123

From 41d23626b8f1097c731f311c951233249fee7a77 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Wed, 24 Aug 2022 10:18:58 +0800
Subject: [PATCH 56/74] docs: fix lint

Co-authored-by: Alex Zhang <tokers@apache.org>
---
 docs/en/latest/plugins/openfunction.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index c5471ce5b499..223ff6a81192 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -125,7 +125,8 @@ This will give back the response from the function:
 hello, test!
 ```
 
-### Configuring path forwarding
+### Configure Path Transforming
+
 
 The `OpenFunction` Plugin also supports transforming the URL path while proxying requests to the OpenFunction API endpoints. Extensions to the base request path get appended to the `function_uri` specified in the Plugin configuration.
 

From ada1d15457af092277ce77984388417b1a0c3605 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 24 Aug 2022 16:00:26 +0800
Subject: [PATCH 57/74] docs: fix lint

---
 docs/en/latest/plugins/openfunction.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 223ff6a81192..d9327534782c 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -127,7 +127,6 @@ hello, test!
 
 ### Configure Path Transforming
 
-
 The `OpenFunction` Plugin also supports transforming the URL path while proxying requests to the OpenFunction API endpoints. Extensions to the base request path get appended to the `function_uri` specified in the Plugin configuration.
 
 :::info IMPORTANT

From 85a9c943a330634ab40b41d332557a5c90842e37 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:37:29 +0800
Subject: [PATCH 58/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index e98f507bb5d2..155f214676d7 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -5,7 +5,7 @@ keywords:
   - Plugin
   - OpenFunction
   - openfunction
-description: 本文介绍了关于 CNCF OpenFunction 插件的基本信息及使用方法。
+description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的基本信息及使用方法。
 ---
 
 <!--

From 55ac6936a52aa071062bd22589bc3cf2669ae28f Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:38:23 +0800
Subject: [PATCH 59/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 155f214676d7..fba70fba2360 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -41,7 +41,7 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 | ssl_verify                  | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
 | authorization               | object  | 否     |         |              | 访问 OpenFunction 的函数的授权凭证。|
 | authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持函数入口的 basic auth 认证方式。 |
-| timeout                     | integer | 否     | 3000ms  | [100,...]ms  | OpenFunction action 和 HTTP 调用超时时间（以毫秒为单位）。          |
+| timeout                     | integer | 否     | 3000 ms  | [100,...] ms  | OpenFunction action 和 HTTP 调用超时时间，以毫秒为单位。          |
 | keepalive                   | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
 | keepalive_timeout           | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
 | keepalive_pool              | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |

From a667c6e16b0254d6e1b98ebb5d6d0b78305e2cba Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:38:59 +0800
Subject: [PATCH 60/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index fba70fba2360..6547c33b5204 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -43,7 +43,7 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 | authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持函数入口的 basic auth 认证方式。 |
 | timeout                     | integer | 否     | 3000 ms  | [100,...] ms  | OpenFunction action 和 HTTP 调用超时时间，以毫秒为单位。          |
 | keepalive                   | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
-| keepalive_timeout           | integer | 否     | 60000ms | [1000,...]ms | 当连接空闲时，保持该连接处于活动状态的时间（以毫秒为单位）。               |
+| keepalive_timeout           | integer | 否     | 60000 ms | [1000,...] ms | 当连接空闲时，保持该连接处于活动状态的时间，以毫秒为单位。               |
 | keepalive_pool              | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |
 
 :::note

From c6a56d4c17d790084237c4f8046c091ee792465f Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:39:37 +0800
Subject: [PATCH 61/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 6547c33b5204..34cdde1e2c95 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -50,7 +50,7 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 
 `timeout` 字段规定了 OpenFunction function 的最大执行时间，以及 APISIX 中 HTTP 客户端的请求超时时间。
 
-因为 OpenFunction function 调用可能会耗费很长时间来拉取容器镜像和启动容器，所以如果 `timeout` 字段值设置太小，可能会导致大量的失败请求。
+因为 OpenFunction function 调用可能会耗费很长时间来拉取容器镜像和启动容器，如果 `timeout` 字段的值设置太小，可能会导致大量请求失败。
 
 :::
 

From f8f07ab784d73952554a1c2f38597aa10c33ea53 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:39:49 +0800
Subject: [PATCH 62/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 34cdde1e2c95..37be24cbcd1a 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -46,7 +46,7 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 | keepalive_timeout           | integer | 否     | 60000 ms | [1000,...] ms | 当连接空闲时，保持该连接处于活动状态的时间，以毫秒为单位。               |
 | keepalive_pool              | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |
 
-:::note
+:::note 注意
 
 `timeout` 字段规定了 OpenFunction function 的最大执行时间，以及 APISIX 中 HTTP 客户端的请求超时时间。
 

From 35e32efe9e497b7f3a333cd71bd013ef3f517bfa Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:40:07 +0800
Subject: [PATCH 63/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 37be24cbcd1a..546338149ccc 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -54,7 +54,7 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 
 :::
 
-## 先决条件
+## 前提条件
 
 在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。
 详情参考[官方安装指南](https://openfunction.dev/docs/getting-started/installation/) 。

From 5e6647a4f03e4f88adaeff3fed3156530c02e33d Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:40:34 +0800
Subject: [PATCH 64/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 546338149ccc..b1e93f101c92 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -40,7 +40,7 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 | function_uri                | string  | 是     |         |              | OpenFunction function uri，例如 `https://localhost:30858/default/function-sample`。     |
 | ssl_verify                  | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
 | authorization               | object  | 否     |         |              | 访问 OpenFunction 的函数的授权凭证。|
-| authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx` ，支持函数入口的 basic auth 认证方式。 |
+| authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx`，支持函数入口的 basic auth 认证方式。 |
 | timeout                     | integer | 否     | 3000 ms  | [100,...] ms  | OpenFunction action 和 HTTP 调用超时时间，以毫秒为单位。          |
 | keepalive                   | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
 | keepalive_timeout           | integer | 否     | 60000 ms | [1000,...] ms | 当连接空闲时，保持该连接处于活动状态的时间，以毫秒为单位。               |

From 04edf3906615663db4b2984da993625adf7c9d44 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:40:43 +0800
Subject: [PATCH 65/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index b1e93f101c92..ecd6c9917167 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -128,7 +128,7 @@ hello, test!
 
 `OpenFunction` 插件还支持 URL 路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展被附加到插件配置中指定的 `function_uri` 。
 
-:::info IMPORTANT
+:::info 重要
 
 路由上配置的 `uri` 必须以 `*` 结尾，此功能才能正常工作。 APISIX 路由是严格匹配的，`*` 表示此 URI 的任何子路径都将匹配到同一路由。
 :::

From 0643864291e9f134b538b0730b1e74568208ded5 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:41:20 +0800
Subject: [PATCH 66/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index ecd6c9917167..02a8b5177a5f 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -56,8 +56,8 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 
 ## 前提条件
 
-在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction 。
-详情参考[官方安装指南](https://openfunction.dev/docs/getting-started/installation/) 。
+在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction。详情参考 [OpenFunction 安装指南](https://openfunction.dev/docs/getting-started/installation/)。
+
 请确保当前环境中已经安装对应版本的 Kubernetes 集群。
 
 ### 通过 Helm Chart 安装 OpenFunction

From ba5e58d4c579242afdaa6fa318be6a9814955a24 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:41:46 +0800
Subject: [PATCH 67/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 02a8b5177a5f..bda5c0d5ea28 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -80,8 +80,7 @@ kubectl get pods --namespace openfunction
 
 ### 创建并推送函数
 
-你可以通过官方示例创建函数 [sample](https://github.com/OpenFunction/samples) 。
-构建函数时，需要将函数容器镜像推送到容器仓库，如 Docker Hub 或 Quay.io。要做到这一点，首先需要输入如下命令为容器仓库生成一个密钥。
+你可以参考 [OpenFunction 官方示例](https://github.com/OpenFunction/samples) 创建函数。构建函数时，你需要使用以下命令为容器仓库生成一个密钥，才可以将函数容器镜像推送到容器仓库( 例如 Docker Hub 或 Quay.io）。
 
 ```shell
 REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=<your_registry_user> REGISTRY_PASSWORD=<your_registry_password>

From 107d685a84bc003a4c4d1fc9a716d920302f8fb6 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:48:05 +0800
Subject: [PATCH 68/74] docs: modify expression

Co-authored-by: Fei Han <97138894+hf400159@users.noreply.github.com>
---
 docs/zh/latest/plugins/openfunction.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index bda5c0d5ea28..4f84367bc4f6 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -129,7 +129,8 @@ hello, test!
 
 :::info 重要
 
-路由上配置的 `uri` 必须以 `*` 结尾，此功能才能正常工作。 APISIX 路由是严格匹配的，`*` 表示此 URI 的任何子路径都将匹配到同一路由。
+路由上配置的 `uri` 必须以 `*` 结尾，此功能才能正常工作。APISIX 路由是严格匹配的，`*` 表示此 URI 的任何子路径都将匹配到同一路由。
+
 :::
 
 下面的示例配置了此功能：

From 0d3545cc38f6a8e9e983d6ef0c110ea295937008 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 25 Aug 2022 15:35:08 +0800
Subject: [PATCH 69/74] docs: fix lint

---
 docs/en/latest/plugins/openfunction.md | 28 ++++------------------
 docs/zh/latest/plugins/openfunction.md | 32 ++++++--------------------
 2 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index d9327534782c..9568d96fb930 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -5,7 +5,7 @@ keywords:
   - Plugin
   - OpenFunction
   - openfunction
-description: This document contains information about the CNCF OpenFunction Plugin.
+description: This document contains information about the Apache APISIX openfunction Plugin.
 ---
 
 <!--
@@ -41,9 +41,9 @@ This Plugin can be configured on a Route and requests will be sent to the config
 | ssl_verify                  | boolean | False    | true    |              | When set to `true` verifies the SSL certificate.                                                           |
 | authorization               | object  | False    |         |              | Authorization credentials to access functions of OpenFunction.                                      |
 | authorization.service_token | string  | False    |         |              | The token format is 'xx:xx' which supports basic auth for function entry points.                                      |
-| timeout                     | integer | False    | 3000ms  | [100, ...]ms | OpenFunction action and HTTP call timeout in ms.                                                              |
+| timeout                     | integer | False    | 3000 ms | [100, ...] ms| OpenFunction action and HTTP call timeout in ms.                                                              |
 | keepalive                   | boolean | False    | true    |              | When set to `true` keeps the connection alive for reuse.                                                   |
-| keepalive_timeout           | integer | False    | 60000ms | [1000,...]ms | Time is ms for connection to remain idle without closing.                                                  |
+| keepalive_timeout           | integer | False    | 60000 ms| [1000,...] ms| Time is ms for connection to remain idle without closing.                                                  |
 | keepalive_pool              | integer | False    | 5       | [1,...]      | Maximum number of requests that can be sent on this connection before closing it.                          |
 
 :::note
@@ -58,26 +58,6 @@ Before configuring the plugin, you need to have OpenFunction running.
 Installation of OpenFunction requires a certain version Kubernetes cluster.
 For details, please refer to [Installation](https://openfunction.dev/docs/getting-started/installation/).
 
-### Install OpenFunction via Helm Chart
-
-The example below shows OpenFunction installed in Helm:
-
-```shell
-# add the OpenFunction chart repository
-helm repo add openfunction https://openfunction.github.io/charts/
-helm repo update
-
-#install the OpenFunction chart
-kubectl create namespace openfunction
-helm install openfunction openfunction/openfunction -n openfunction
-```
-
-You can then verify if OpenFunction is ready:
-
-```shell
-kubectl get pods --namespace openfunction
-```
-
 ### Create and Push a Function
 
 You can then create a function following the [sample](https://github.com/OpenFunction/samples)
@@ -85,7 +65,7 @@ You can then create a function following the [sample](https://github.com/OpenFun
 You'll need to push your function container image to a container registry like Docker Hub or Quay.io when building a function. To do that, you'll need to generate a secret for your container registry first.
 
 ```shell
-REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=<your_registry_user> REGISTRY_PASSWORD=<your_registry_password>
+REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER= ${your_registry_user} REGISTRY_PASSWORD= ${your_registry_password}
 kubectl create secret docker-registry push-secret \
     --docker-server=$REGISTRY_SERVER \
     --docker-username=$REGISTRY_USER \
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 4f84367bc4f6..4777a16b8cf1 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -41,9 +41,9 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 | ssl_verify                  | boolean | 否     | true    |              | 当设置为 `true` 时执行 SSL 验证。                            |
 | authorization               | object  | 否     |         |              | 访问 OpenFunction 的函数的授权凭证。|
 | authorization.service_token | string  | 否     |         |              | OpenFunction service token，其格式为 `xxx:xxx`，支持函数入口的 basic auth 认证方式。 |
-| timeout                     | integer | 否     | 3000 ms  | [100,...] ms  | OpenFunction action 和 HTTP 调用超时时间，以毫秒为单位。          |
+| timeout                     | integer | 否     | 3000 ms | [100,...] ms | OpenFunction action 和 HTTP 调用超时时间，以毫秒为单位。          |
 | keepalive                   | boolean | 否     | true    |              | 当设置为 `true` 时，保持连接的活动状态以便重复使用。         |
-| keepalive_timeout           | integer | 否     | 60000 ms | [1000,...] ms | 当连接空闲时，保持该连接处于活动状态的时间，以毫秒为单位。               |
+| keepalive_timeout           | integer | 否     | 60000 ms| [1000,...] ms| 当连接空闲时，保持该连接处于活动状态的时间，以毫秒为单位。               |
 | keepalive_pool              | integer | 否     | 5       | [1,...]      | 连接断开之前，可接收的最大请求数。                           |
 
 :::note 注意
@@ -56,31 +56,13 @@ description: 本文介绍了 API 网关 Apache APISIX 的 openfunction 插件的
 
 ## 前提条件
 
-在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction。详情参考 [OpenFunction 安装指南](https://openfunction.dev/docs/getting-started/installation/)。
+在使用 `openfunction` 插件之前，你需要通过以下命令运行 OpenFunction。详情参考 [OpenFunction 安装指南](https://openfunction.dev/docs/getting-started/installation/) 。
 
 请确保当前环境中已经安装对应版本的 Kubernetes 集群。
 
-### 通过 Helm Chart 安装 OpenFunction
-
-```shell
-#add the OpenFunction chart repository
-helm repo add openfunction https://openfunction.github.io/charts/
-helm repo update
-
-#install the OpenFunction chart
-kubectl create namespace openfunction
-helm install openfunction openfunction/openfunction -n openfunction
-```
-
-你可以通过以下命令来验证 openfunction 是否已经安装成功：
-
-```shell
-kubectl get pods --namespace openfunction
-```
-
 ### 创建并推送函数
 
-你可以参考 [OpenFunction 官方示例](https://github.com/OpenFunction/samples) 创建函数。构建函数时，你需要使用以下命令为容器仓库生成一个密钥，才可以将函数容器镜像推送到容器仓库( 例如 Docker Hub 或 Quay.io）。
+你可以参考 [OpenFunction 官方示例](https://github.com/OpenFunction/samples) 创建函数。构建函数时，你需要使用以下命令为容器仓库生成一个密钥，才可以将函数容器镜像推送到容器仓库 ( 例如 Docker Hub 或 Quay.io）。
 
 ```shell
 REGISTRY_SERVER=https://index.docker.io/v1/ REGISTRY_USER=<your_registry_user> REGISTRY_PASSWORD=<your_registry_password>
@@ -92,7 +74,7 @@ kubectl create secret docker-registry push-secret \
 
 ## 启用插件
 
-通过以下命令创建一个路由，并在配置文件中添加 `openfunction` 插件：
+你可以通过以下命令在指定路由中启用该插件：
 
 ```shell
 curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
@@ -109,7 +91,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
 }'
 ```
 
-### 测试请求
+## 测试插件
 
 使用 `curl` 命令测试：
 
@@ -125,7 +107,7 @@ hello, test!
 
 ### 配置路径转发
 
-`OpenFunction` 插件还支持 URL 路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展被附加到插件配置中指定的 `function_uri` 。
+`OpenFunction` 插件还支持 URL 路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展(如路由 `/hello/*` 中 `*` 的部分)会被添加到插件配置中指定的 `function_uri`。
 
 :::info 重要
 

From eed4f5adf6dd06ab70e41303640401374f692a61 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Thu, 25 Aug 2022 16:21:59 +0800
Subject: [PATCH 70/74] docs: fix lint

---
 docs/zh/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 4777a16b8cf1..1253146d29d5 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -107,7 +107,7 @@ hello, test!
 
 ### 配置路径转发
 
-`OpenFunction` 插件还支持 URL 路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展(如路由 `/hello/*` 中 `*` 的部分)会被添加到插件配置中指定的 `function_uri`。
+`OpenFunction` 插件还支持 URL 路径转发，同时将请求代理到上游的 OpenFunction API 端点。基本请求路径的扩展（如路由 `/hello/*` 中 `*` 的部分）会被添加到插件配置中指定的 `function_uri`。
 
 :::info 重要
 

From b89805a049e0ed5cf4cec06dab5b2e62aa920bc3 Mon Sep 17 00:00:00 2001
From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:28:33 +0800
Subject: [PATCH 71/74] docs: update  latest admin port
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
---
 docs/en/latest/plugins/openfunction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 9568d96fb930..0b741247fbe1 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -77,7 +77,7 @@ kubectl create secret docker-registry push-secret \
 You can now configure the Plugin on a specific Route and point to this running OpenFunction service:
 
 ```shell
-curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+curl http://127.0.0.1:9180/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
 {
     "uri": "/hello",
     "plugins": {

From 558948a16302b238b1c9bfe283f1e7b5ecaeb323 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 31 Aug 2022 14:41:01 +0800
Subject: [PATCH 72/74] ci: discard change

---
 ci/init-plugin-test-service.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 15b412933c2a..5f468502304d 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -41,4 +41,3 @@ docker exec -i rmqnamesrv /home/rocketmq/rocketmq-4.6.0/bin/mqadmin updateTopic
 
 # prepare vault kv engine
 docker exec -i vault sh -c "VAULT_TOKEN='root' VAULT_ADDR='http://0.0.0.0:8200' vault secrets enable -path=kv -version=1 kv"
-

From 3ee2c41c18b28e7f80a59d4ef4be542227c7abf2 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 31 Aug 2022 14:41:38 +0800
Subject: [PATCH 73/74] docs: update admin api port

---
 docs/en/latest/plugins/openfunction.md | 4 ++--
 docs/zh/latest/plugins/openfunction.md | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/latest/plugins/openfunction.md b/docs/en/latest/plugins/openfunction.md
index 0b741247fbe1..7eee546bbf94 100644
--- a/docs/en/latest/plugins/openfunction.md
+++ b/docs/en/latest/plugins/openfunction.md
@@ -118,7 +118,7 @@ The `uri` configured on a Route must end with `*` for this feature to work prope
 The example below configures this feature:
 
 ```shell
-curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+curl http://127.0.0.1:9180/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
 {
     "uri": "/hello/*",
     "plugins": {
@@ -147,7 +147,7 @@ Hello, 123!
 To disable the `openfunction` Plugin, you can delete the corresponding JSON configuration from the Plugin configuration. APISIX will automatically reload and you do not have to restart for this to take effect.
 
 ```shell
-curl http://127.0.0.1:9080/apisix/admin/routes/1  -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+curl http://127.0.0.1:9180/apisix/admin/routes/1  -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
 {
     "methods": ["GET"],
     "uri": "/index.html",
diff --git a/docs/zh/latest/plugins/openfunction.md b/docs/zh/latest/plugins/openfunction.md
index 1253146d29d5..7923db291c3f 100644
--- a/docs/zh/latest/plugins/openfunction.md
+++ b/docs/zh/latest/plugins/openfunction.md
@@ -77,7 +77,7 @@ kubectl create secret docker-registry push-secret \
 你可以通过以下命令在指定路由中启用该插件：
 
 ```shell
-curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+curl http://127.0.0.1:9180/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
 {
     "uri": "/hello",
     "plugins": {
@@ -118,7 +118,7 @@ hello, test!
 下面的示例配置了此功能：
 
 ```shell
-curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+curl http://127.0.0.1:9180/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
 {
     "uri": "/hello/*",
     "plugins": {
@@ -147,7 +147,7 @@ Hello, 123!
 当你需要禁用 `openfunction` 插件时，可以通过以下命令删除相应的 JSON 配置，APISIX 将会自动重新加载相关配置，无需重启服务：
 
 ```shell
-curl http://127.0.0.1:9080/apisix/admin/routes/1  -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+curl http://127.0.0.1:9180/apisix/admin/routes/1  -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
 {
     "methods": ["GET"],
     "uri": "/hello",

From 698f371c11ebc9e1f1fe573ca1fd773173a7f873 Mon Sep 17 00:00:00 2001
From: LCW <Lcw769193516@163.com>
Date: Wed, 31 Aug 2022 15:18:58 +0800
Subject: [PATCH 74/74] ci: solve conflict

---
 ci/pod/docker-compose.plugin.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ci/pod/docker-compose.plugin.yml b/ci/pod/docker-compose.plugin.yml
index 4a1a328b41a7..18d59a042433 100644
--- a/ci/pod/docker-compose.plugin.yml
+++ b/ci/pod/docker-compose.plugin.yml
@@ -197,6 +197,34 @@ services:
       SPLUNK_HEC_TOKEN: "BD274822-96AA-4DA6-90EC-18940FB2414C"
       SPLUNK_HEC_SSL: "False"
 
+  # Elasticsearch Logger Service
+  elasticsearch-noauth:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
+    restart: unless-stopped
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+      discovery.type: single-node
+      xpack.security.enabled: 'false'
+
+  elasticsearch-auth:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
+    restart: unless-stopped
+    ports:
+      - "9201:9201"
+      - "9301:9301"
+    environment:
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+      discovery.type: single-node
+      ELASTIC_USERNAME: elastic
+      ELASTIC_PASSWORD: 123456
+      http.port: 9201
+      transport.tcp.port: 9301
+      xpack.security.enabled: 'true'
+
+
   # The function services of OpenFunction
   test-header:
     image: test-header-image:latest