Merge branch 'apache:master' into master

api7 · Sep 27, 2022 · 13385bf · 13385bf
2 parents 076bc4c + 3c18031
commit 13385bf
Show file tree

Hide file tree

Showing 599 changed files with 26,941 additions and 8,992 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -17,16 +17,16 @@
 
 github:
     description: The Cloud-Native API Gateway
-    homepage: https://apisix.apache.org/
+    homepage: https://apisix.apache.org/blog/
     labels:
       - api-gateway
       - cloud-native
       - nginx
-      - lua
       - luajit
       - apigateway
       - microservices
       - api
+      - apis
       - loadbalancing
       - reverse-proxy
       - api-management
@@ -36,6 +36,9 @@ github:
       - devops
       - kubernetes
       - docker
+      - kubernetes-ingress
+      - kubernetes-ingress-controller
+      - service-mesh
 
     enabled_merge_buttons:
       squash:  true
@@ -50,6 +53,14 @@ github:
           dismiss_stale_reviews: true
           require_code_owner_reviews: true
           required_approving_review_count: 2
+      release/2.99:
+        required_pull_request_reviews:
+          require_code_owner_reviews: true
+          required_approving_review_count: 2
+      release/2.15:
+        required_pull_request_reviews:
+          require_code_owner_reviews: true
+          required_approving_review_count: 2
       release/2.14:
         required_pull_request_reviews:
           require_code_owner_reviews: true

diff --git a/.github/actions/action-semantic-pull-request b/.github/actions/action-semantic-pull-request
diff --git a/.github/semantic.yml b/.github/semantic.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,10 +25,10 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-18.04
+          - ubuntu-20.04
         os_name:
           - linux_openresty
-          - linux_openresty_1_17
+          - linux_openresty_1_19
         test_dir:
           - t/plugin
           - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/deployment t/discovery t/error_page t/misc
@@ -106,6 +106,10 @@ jobs:
       - name: Start CI env (PLUGIN_TEST)
         if: steps.test_env.outputs.type == 'plugin'
         run: |
+          # download keycloak cas provider
+          sudo wget https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar -O /opt/keycloak-protocol-cas-18.0.2.jar
+
+          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
@@ -101,6 +101,10 @@ jobs:
     - name: Start CI env (PLUGIN_TEST)
       if: steps.test_env.outputs.type == 'plugin'
       run: |
+        # download keycloak cas provider
+        sudo wget https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar -O /opt/keycloak-protocol-cas-18.0.2.jar
+
+        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/.github/workflows/chaos.yml b/.github/workflows/chaos.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.16"
+          go-version: "1.17"
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/cli-master.yml b/.github/workflows/cli-master.yml
@@ -26,7 +26,7 @@ jobs:
       matrix:
         job_name:
           - linux_apisix_master_luarocks
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 15
     env:
       OPENRESTY_VERSION: default

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-18.04
+          - ubuntu-20.04
         job_name:
           - linux_apisix_current_luarocks
           - linux_apisix_current_luarocks_in_customed_nginx

diff --git a/.github/workflows/doc-lint.yml b/.github/workflows/doc-lint.yml
@@ -1,6 +1,10 @@
 name: Doc Lint
 
 on:
+  push:
+    paths:
+      - 'docs/**'
+      - '**/*.md'
   pull_request:
     branches: [master, 'release/**']
     paths:
@@ -18,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: 🚀 Use Node.js
-        uses: actions/setup-node@v3.3.0
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: '12.x'
       - run: npm install -g markdownlint-cli@0.25.0

diff --git a/.github/workflows/fuzzing-ci.yaml b/.github/workflows/fuzzing-ci.yaml
@@ -63,21 +63,15 @@ jobs:
 
     - name: install boofuzz
       run: |
+        # Avoid "ERROR: flask has requirement click>=8.0, but you'll have click 7.0 which is incompatible"
+        sudo apt remove python3-click
         pip install -r $PWD/t/fuzzing/requirements.txt
 
-    - name: run simpleroute test
+    - name: run tests
       run: |
         python $PWD/t/fuzzing/simpleroute_test.py
-
-    - name: run serverless route test
-      run: |
         python $PWD/t/fuzzing/serverless_route_test.py
-
-    - name: run vars route test
-      run: |
         python $PWD/t/fuzzing/vars_route_test.py
-
-    - name: run check leak test
-      run: |
         python $PWD/t/fuzzing/client_abort.py
         python $PWD/t/fuzzing/simple_http.py
+        python $PWD/t/fuzzing/http_upstream.py
diff --git a/.github/workflows/kubernetes-ci.yml b/.github/workflows/kubernetes-ci.yml
@@ -25,10 +25,10 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-18.04
+          - ubuntu-20.04
         os_name:
           - linux_openresty
-          - linux_openresty_1_17
+          - linux_openresty_1_19
 
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 15
@@ -44,22 +44,17 @@ jobs:
 
       - name: Setup kubernetes cluster
         run: |
-          KIND_VERSION="v0.11.1"
-          KUBECTL_VERSION="v1.22.0"
-          curl -Lo ./kind "https://kind.sigs.k8s.io/dl/${KIND_VERSION}/kind-$(uname)-amd64"
-          curl -Lo ./kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl"
-          chmod +x ./kind
-          chmod +x ./kubectl
+          KUBERNETES_VERSION="v1.22.7"
 
-          ./kind create cluster --name apisix-test --config ./t/kubernetes/configs/kind.yaml
+          kind create cluster --name apisix-test --config ./t/kubernetes/configs/kind.yaml --image kindest/node:${KUBERNETES_VERSION}
 
-          ./kubectl wait --for=condition=Ready nodes --all --timeout=180s
+          kubectl wait --for=condition=Ready nodes --all --timeout=180s
 
-          ./kubectl apply -f ./t/kubernetes/configs/account.yaml
+          kubectl apply -f ./t/kubernetes/configs/account.yaml
 
-          ./kubectl apply -f ./t/kubernetes/configs/endpoint.yaml
+          kubectl apply -f ./t/kubernetes/configs/endpoint.yaml
 
-          KUBERNETES_CLIENT_TOKEN_CONTENT=$(./kubectl get secrets | grep apisix-test | awk '{system("./kubectl get secret -o jsonpath={.data.token} "$1" | base64 --decode")}')
+          KUBERNETES_CLIENT_TOKEN_CONTENT=$(kubectl get secrets | grep apisix-test | awk '{system("kubectl get secret -o jsonpath={.data.token} "$1" | base64 --decode")}')
 
           KUBERNETES_CLIENT_TOKEN_DIR="/tmp/var/run/secrets/kubernetes.io/serviceaccount"
 
@@ -73,7 +68,7 @@ jobs:
           echo 'KUBERNETES_CLIENT_TOKEN='"${KUBERNETES_CLIENT_TOKEN_CONTENT}"
           echo 'KUBERNETES_CLIENT_TOKEN_FILE='${KUBERNETES_CLIENT_TOKEN_FILE}
 
-          ./kubectl proxy -p 6445 &
+          kubectl proxy -p 6445 &
 
       - name: Linux Install
         run: |

diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
@@ -32,6 +32,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check License Header
-        uses: apache/skywalking-eyes@v0.3.0
+        uses: apache/skywalking-eyes@v0.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,6 +1,6 @@
 name: ❄️ Lint
 
-on: [pull_request]
+on: [push, pull_request]
 
 permissions:
   contents: read
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Nodejs env
-        uses: actions/setup-node@v3.3.0
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: '12'
 

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -13,7 +13,7 @@ permissions:
 jobs:
   performance:
     if: github.event_name == 'pull_request' && github.event.label.name == 'performance'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 45
 
     steps:

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
@@ -0,0 +1,35 @@
+name: "PR Lint"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: ./.github/actions/action-semantic-pull-request
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |
+            feat
+            fix
+            docs
+            style
+            refactor
+            perf
+            test
+            build
+            ci
+            chore
+            revert
+            change
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Prune Stale
-      uses: actions/stale@v5
+      uses: actions/stale@v6
       with:
         days-before-issue-stale: 350
         days-before-issue-close: 14

diff --git a/.github/workflows/tars-ci.yml b/.github/workflows/tars-ci.yml
@@ -25,10 +25,10 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-18.04
+          - ubuntu-20.04
         os_name:
           - linux_openresty
-          - linux_openresty_1_17
+          - linux_openresty_1_19
 
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 15

diff --git a/.gitignore b/.gitignore
@@ -77,6 +77,10 @@ t/fuzzing/__pycache__/
 boofuzz-results/
 *.pyc
 *.wasm
+t/grpc_server_example/grpc_server_example
+t/plugin/grpc-web/grpc-web-server
+t/plugin/grpc-web/node_modules/
+
 # release tar package
 *.tgz
 release/*
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "t/toolkit"]
 	path = t/toolkit
 	url = https://github.com/api7/test-toolkit.git
+[submodule ".github/actions/action-semantic-pull-request"]
+	path = .github/actions/action-semantic-pull-request
+	url = https://github.com/amannn/action-semantic-pull-request.git
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -19,7 +19,7 @@ header:
     spdx-id: Apache-2.0
     copyright-owner: Apache Software Foundation
 
-  license-location-threshold: 350
+  license-location-threshold: 360
 
   paths-ignore:
     - '.gitignore'