Merge branch 'upstream' into github/master

* upstream: (28 commits) docs: update some tips in develop.md (apache#2451) fix: create upstream error when pass host is node and nodes without port (apache#2421) fix: correct data type of filed Active.checks.active.https_verify_certificate (apache#2422) feat: basic support Apache APISIX 2.13.0 (apache#2428) feat: add page reload judgment (apache#2370) docs: Update RPM install package link (apache#2439) docs: Remove hyperlinks from documents (apache#2431) chore(deps): bump actions/upload-artifact from 2 to 3 (apache#2423) fix: consumer without plugins causes page crashes (apache#2437) chore(deps): bump axios from 0.21.1 to 0.21.4 in /web (apache#2420) feat: Modify plugin preview page (apache#2359) chore(deps): bump moment from 2.29.1 to 2.29.2 in /web (apache#2418) chore: use json schema instead hard code (apache#2399) refactor: migrate route tests to e2enew (apache#2411) chore(deps): bump actions/setup-python from 2.3.2 to 3.1.1 (apache#2414) chore: update the year of copyright and fix typo (apache#2417) docs: update online playground url (apache#2416) chore: update README for online demo (apache#2404) refactor: migrate id compatible tests to e2enew (apache#2400) docs: fix invalid link (apache#2366) ... # Conflicts: # api/internal/route.go # web/src/components/Footer/index.tsx
fitphp · May 24, 2022 · f35668e · f35668e
2 parents 99ee6c3 + 967038f
commit f35668e
Show file tree

Hide file tree

Showing 101 changed files with 3,694 additions and 424 deletions.
diff --git a/.github/workflows/auto-build-rpm.yml b/.github/workflows/auto-build-rpm.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - uses: docker/setup-buildx-action@v1
 
@@ -80,7 +80,7 @@ jobs:
 
       - name: Publish Artifact
         if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: "rpm"
           path: "./apisix-build-tools/output/apisix-dashboard-${{ steps.branch_env.outputs.version }}-0.el7.x86_64.rpm"
diff --git a/.github/workflows/backend-cli-test.yml b/.github/workflows/backend-cli-test.yml
@@ -28,7 +28,7 @@ jobs:
           ALLOW_NONE_AUTHENTICATION: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
 

diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml
@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: "1.15"
           submodules: recursive
@@ -112,10 +112,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: "1.17"
 

diff --git a/.github/workflows/backend-unit-test.yml b/.github/workflows/backend-unit-test.yml
@@ -26,10 +26,10 @@ jobs:
           ALLOW_NONE_AUTHENTICATION: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: "1.15"
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/deploy-with-docker.yml b/.github/workflows/deploy-with-docker.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
 

diff --git a/.github/workflows/frontend-e2e-test.yml b/.github/workflows/frontend-e2e-test.yml
@@ -37,19 +37,19 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: 14.x
           cache: 'yarn'
           cache-dependency-path: web/yarn.lock
 
       - name: Setup golang environment
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: '1.15'
 
@@ -93,7 +93,7 @@ jobs:
           bash <(curl -s https://codecov.io/bash) -f ./coverage/coverage-final.json -F frontend-e2e-test
 
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v2.3.0
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: cypress-report

diff --git a/.github/workflows/frontend-plugin-e2e-test.yml b/.github/workflows/frontend-plugin-e2e-test.yml
@@ -35,19 +35,19 @@ jobs:
           ALLOW_NONE_AUTHENTICATION: yes
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: 14.x
           cache: 'yarn'
           cache-dependency-path: web/yarn.lock
 
       - name: Setup golang environment
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: '1.15'
 
@@ -86,7 +86,7 @@ jobs:
         run: yarn test-plugin:e2e
 
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v2.3.0
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: cypress-report

diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml
@@ -18,7 +18,7 @@ jobs:
   gitleaks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: '1'
           submodules: recursive

diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml
@@ -17,7 +17,7 @@ jobs:
     needs: go-filter
     if: needs.go-filter.outputs.matches == 'true'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
@@ -29,9 +29,9 @@ jobs:
   gofmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: setup go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: '1.15'
 

diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: run license check
         run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,9 +7,9 @@ jobs:
     name: 🍇 Markdown
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: 🚀 Use Node.js
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '14.x'
       - run: npm install -g markdownlint-cli@0.25.0
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code.
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
       - name: Install
         run: |
           wget -O - -q https://git.io/misspell | sh -s -- -b .
@@ -33,8 +33,8 @@ jobs:
     name: 🍏 YAML
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2.3.2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3.1.1
         with:
           python-version: '3.x'  # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64'  # optional x64 or x86. Defaults to x64 if not specified
@@ -50,6 +50,6 @@ jobs:
     name: Trailing whitespace
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Check for trailing whitespace
         run: "! git grep -EIn $'[ \t]+$'"
diff --git a/.github/workflows/make-build.yaml b/.github/workflows/make-build.yaml
@@ -34,19 +34,19 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: 14.x
           cache: 'yarn'
           cache-dependency-path: web/yarn.lock
 
       - name: Setup golang environment
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: '1.15'
 

diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -40,10 +40,10 @@ jobs:
           ALLOW_NONE_AUTHENTICATION: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v3
         with:
           go-version: '1.15'
 

diff --git a/.github/workflows/test-frontend-multiple-node-build.yml b/.github/workflows/test-frontend-multiple-node-build.yml
@@ -30,11 +30,11 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,28 +44,28 @@ This release contains some features and bugfixes, and all the existing functiona
 
 ### Core
 
-feat: add data loader framework [#2371](https://github.com/apache/apisix-dashboard/pull/2371)
-feat: support protobuf on Web [#2320](https://github.com/apache/apisix-dashboard/pull/2320)
-feat: basic support Apache APISIX 2.12.1 [#2315](https://github.com/apache/apisix-dashboard/pull/2315)
-feat: Add more fields to limit-count plugin [#2322](https://github.com/apache/apisix-dashboard/pull/2322)
-feat: support APISIX_PROFILE for env-specific configuration [#2293](https://github.com/apache/apisix-dashboard/pull/2293)
-feat(upstream): add upstream priority field [#2271](https://github.com/apache/apisix-dashboard/pull/2271)
-feat(route): show route id in list and edit views [#2269](https://github.com/apache/apisix-dashboard/pull/2269)
-feat(route): remove key-auth plugin tip [#2261](https://github.com/apache/apisix-dashboard/pull/2261)
-feat: add rejected_msg field to limit-count plugin form [#2328](https://github.com/apache/apisix-dashboard/pull/2328)
-feat: add rejected_msg field to limit-req plugin form [#2312](https://github.com/apache/apisix-dashboard/pull/2312)
-chore: Create route form optimization [#2336](https://github.com/apache/apisix-dashboard/pull/2336)
-chore: add loading in route page [#2287](https://github.com/apache/apisix-dashboard/pull/2287)
-chore(upstream): remove default port for upstream health check [#2278](https://github.com/apache/apisix-dashboard/pull/2278)
-style: add ellipsis for route table [#2317](https://github.com/apache/apisix-dashboard/pull/2317)
+- feat: add data loader framework [#2371](https://github.com/apache/apisix-dashboard/pull/2371)
+- feat: support protobuf on Web [#2320](https://github.com/apache/apisix-dashboard/pull/2320)
+- feat: basic support Apache APISIX 2.12.1 [#2315](https://github.com/apache/apisix-dashboard/pull/2315)
+- feat: Add more fields to limit-count plugin [#2322](https://github.com/apache/apisix-dashboard/pull/2322)
+- feat: support APISIX_PROFILE for env-specific configuration [#2293](https://github.com/apache/apisix-dashboard/pull/2293)
+- feat(upstream): add upstream priority field [#2271](https://github.com/apache/apisix-dashboard/pull/2271)
+- feat(route): show route id in list and edit views [#2269](https://github.com/apache/apisix-dashboard/pull/2269)
+- feat(route): remove key-auth plugin tip [#2261](https://github.com/apache/apisix-dashboard/pull/2261)
+- feat: add rejected_msg field to limit-count plugin form [#2328](https://github.com/apache/apisix-dashboard/pull/2328)
+- feat: add rejected_msg field to limit-req plugin form [#2312](https://github.com/apache/apisix-dashboard/pull/2312)
+- chore: Create route form optimization [#2336](https://github.com/apache/apisix-dashboard/pull/2336)
+- chore: add loading in route page [#2287](https://github.com/apache/apisix-dashboard/pull/2287)
+- chore(upstream): remove default port for upstream health check [#2278](https://github.com/apache/apisix-dashboard/pull/2278)
+- style: add ellipsis for route table [#2317](https://github.com/apache/apisix-dashboard/pull/2317)
 
 ### Bugfix
 
-fix: ! (reverse) operator not handled correctly [#2364](https://github.com/apache/apisix-dashboard/pull/2364)
-fix: idle_timeout filed to support set zero value [#2296](https://github.com/apache/apisix-dashboard/pull/2296)
-fix: retries field to support zero value [#2298](https://github.com/apache/apisix-dashboard/pull/2298)
-fix: get current dir error [#2283](https://github.com/apache/apisix-dashboard/pull/2283)
-style: remove extra margin value [#2300](https://github.com/apache/apisix-dashboard/pull/2300)
+- fix: ! (reverse) operator not handled correctly [#2364](https://github.com/apache/apisix-dashboard/pull/2364)
+- fix: idle_timeout filed to support set zero value [#2296](https://github.com/apache/apisix-dashboard/pull/2296)
+- fix: retries field to support zero value [#2298](https://github.com/apache/apisix-dashboard/pull/2298)
+- fix: get current dir error [#2283](https://github.com/apache/apisix-dashboard/pull/2283)
+- style: remove extra margin value [#2300](https://github.com/apache/apisix-dashboard/pull/2300)
 
 # 2.10.1
 

diff --git a/README.md b/README.md
@@ -46,8 +46,9 @@ Note: Currently the Dashboard does not have complete coverage of Apache APISIX f
 
 ## Demo
 
+[Online Playground](http://20.210.250.99:9000/)
+
 ```text
-URL: http://106.55.144.26/
 Username: admin
 Password: admin
 ```

diff --git a/api/build.sh b/api/build.sh
@@ -45,6 +45,7 @@ fi
 cd ./api && go build -o ../output/manager-api -ldflags "${GOLDFLAGS}" ./main.go && cd ..
 
 cp ./api/conf/schema.json ./output/conf/schema.json
+cp ./api/conf/customize_schema.json ./output/conf/customize_schema.json
 cp ./api/conf/conf*.yaml ./output/conf/
 
 echo "Build the Manager API successfully"
diff --git a/api/conf/conf.yaml b/api/conf/conf.yaml
@@ -60,6 +60,14 @@ conf:
                          # such as absolute path on Windows: winfile:///C:\access.log
                          # log example: 2020-12-09T16:38:09.039+0800	INFO	filter/logging.go:46	/apisix/admin/routes/r1	{"status": 401, "host": "127.0.0.1:9000", "query": "asdfsafd=adf&a=a", "requestId": "3d50ecb8-758c-46d1-af5b-cd9d1c820156", "latency": 0, "remoteIP": "127.0.0.1", "method": "PUT", "errs": []}
   max_cpu: 0             # supports tweaking with the number of OS threads are going to be used for parallelism. Default value: 0 [will use max number of available cpu cores considering hyperthreading (if any)]. If the value is negative, is will not touch the existing parallelism profile.
+  # security:
+  #   access_control_allow_origin: "http://httpbin.org"
+  #   access_control_allow_credentials: true          # support using custom cors configration
+  #   access_control_allow_headers: "Authorization"
+  #   access_control-allow_methods: "*"
+  #   x_frame_options: "deny"
+  #   content_security_policy: ""default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'""
+
 
 authentication:
   secret:

diff --git a/api/conf/customize_schema.json b/api/conf/customize_schema.json
@@ -0,0 +1,33 @@
+{
+    "main": {
+        "system_config": {
+            "properties": {
+                "config_name": {
+                    "maxLength":100,
+                    "minLength":1,
+                    "pattern":"^[a-zA-Z0-9_]+$",
+                    "type":"string"
+                },
+                "desc": {
+                    "maxLength":256,
+                    "type":"string"
+                },
+                "payload": {
+                    "type":"object",
+                    "minProperties":1
+                },
+                "create_time": {
+                    "type":"integer"
+                },
+                "update_time": {
+                    "type":"integer"
+                }
+            },
+            "required": [
+                "config_name",
+                "payload"
+            ],
+            "type":"object"
+        }
+   }
+}