Merge branch 'upstream/master' into github/master

* upstream/master: feat: release 3.0.0 (apache#2722) Revert "feat: release 2.16.0 (apache#2719)" (apache#2721) feat: release 2.16.0 (apache#2719) fix: plugin configuration lost in editor (apache#2718) fix: adapt APISIX plugin disabled (apache#2717) feat: basic support Apache APISIX 3.0.0 (apache#2701) feat: change etcd prefix for ssl and proto (apache#2693) fix: remove cases external service dependency (apache#2697) chore: simplify e2e environment (apache#2694) chore: optimize "allow_origins_by_regex tooltip" description (apache#2690) feat: release 2.15.0 (apache#2685) feat: basic support Apache APISIX 2.15.0 (apache#2680) feat: release 2.14.0 (apache#2677) fix: bump go version to 1.16 (apache#2678) feat: release 2.13.1 (apache#2658) feat: support more upstream scheme (apache#2675) feat: support purge method (apache#2674) feat: add enable flag to oidc function (apache#2672) # Conflicts: # web/package.json
fitphp · Jan 30, 2023 · ba48f8d · ba48f8d
2 parents d6d38f3 + f494919
commit ba48f8d
Show file tree

Hide file tree

Showing 116 changed files with 6,431 additions and 3,911 deletions.
diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml
@@ -22,6 +22,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: setup go
         uses: actions/setup-go@v3
@@ -40,17 +42,10 @@ jobs:
 
       - name: Modify conf.yaml Configure for use by the manage-api cluster
         run: |
-          sed -i 's/127.0.0.1:2379/172.16.238.10:2379/' ./api/conf/conf.yaml
+          sed -i 's/127.0.0.1:2379/etcd:2379/' ./api/conf/conf.yaml
           sed -i 's@127.0.0.1@0.0.0.0/0@' ./api/conf/conf.yaml
-          sed -i '/172.16.238.10:2379/a\      - 172.16.238.11:2379' ./api/conf/conf.yaml
-          sed -i '/172.16.238.10:2379/a\      - 172.16.238.12:2379' ./api/conf/conf.yaml
           sed -i 's@0.0.0.0/0:9000@127.0.0.1:9000@' ./api/conf/conf.yaml
-
-
-      - name: download file Dockerfile-apisix
-        working-directory: ./api/test/docker
-        run: |
-          curl -o Dockerfile-apisix https://raw.githubusercontent.com/apache/apisix-docker/master/alpine/Dockerfile
+          sed -i 's/enabled: false/enabled: true/' ./api/conf/conf.yaml
 
       - name: build docker images
         working-directory: ./api/test/docker
@@ -76,11 +71,13 @@ jobs:
           docker logs docker_managerapi_1
 
       - name: install ginkgo cli
-        run: go install github.com/onsi/ginkgo/ginkgo@v1.16.5
+        run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@latest
 
       - name: run test
         working-directory: ./api/test/e2e
-        run: ginkgo -r
+        run: |
+          go mod download
+          ginkgo -r --flake-attempts=3 -v
 
       - name: stop docker compose
         working-directory: ./api/test/docker

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,10 @@
 
 # Table of Contents
 
+- [3.0.0](#300)
+- [2.15.0](#2150)
+- [2.14.0](#2140)
+- [2.13.1](#2131)
 - [2.13.0](#2130)
 - [2.11.0](#2110)
 - [2.10.1](#2101)
@@ -39,6 +43,95 @@
 - [1.5.0](#150)
 - [1.0.0](#100)
 
+## 3.0.0
+
+### Core
+
+- feat: basic support Apache APISIX 3.0.0 [#2701](https://github.com/apache/apisix-dashboard/pull/2701)
+- feat: change etcd prefix for ssl and proto [#2693](https://github.com/apache/apisix-dashboard/pull/2693)
+
+### Bugfix
+
+- fix: remove cases external service dependency [#2697](https://github.com/apache/apisix-dashboard/pull/2697)
+- fix: adapt APISIX plugin disabled [#2717](https://github.com/apache/apisix-dashboard/pull/2717)
+- fix: plugin configuration lost in editor [#2718](https://github.com/apache/apisix-dashboard/pull/2718)
+
+### Other
+
+- chore: optimize "allow_origins_by_regex tooltip" description [#2690](https://github.com/apache/apisix-dashboard/pull/2690)
+- chore: simplify e2e env [#2694](https://github.com/apache/apisix-dashboard/pull/2694)
+
+## 2.15.0
+
+### Core
+
+- feat: basic support Apache APISIX 2.15.0 [#2680](https://github.com/apache/apisix-dashboard/pull/2680)
+
+### Bugfix
+
+- fix: bump go version to 1.16 [#2678](https://github.com/apache/apisix-dashboard/pull/2678)
+
+## 2.14.0
+
+### Core
+
+- feat: basic support Apache APISIX 2.14.1 [#2464](https://github.com/apache/apisix-dashboard/pull/2464)
+- feat: refactor OpenAPI 3 parse and convert [#2460](https://github.com/apache/apisix-dashboard/pull/2460)
+- feat: integrate data loader interface to import handler [#2474](https://github.com/apache/apisix-dashboard/pull/2474)
+- feat: support data loader in frontend [#2480](https://github.com/apache/apisix-dashboard/pull/2480)
+- feat: translating Turkish for new features [#2487](https://github.com/apache/apisix-dashboard/pull/2487)
+- feat: add batch delete function for route [#2502](https://github.com/apache/apisix-dashboard/pull/2502)
+- feat: support show all enable plugin list tab [#2585](https://github.com/apache/apisix-dashboard/pull/2585)
+- feat: Add config struct of OpenID-Connect Login [#2597](https://github.com/apache/apisix-dashboard/pull/2597)
+- feat: Adding a Loading state to buttons [#2630](https://github.com/apache/apisix-dashboard/pull/2630)
+- feat: add login filter of OpenID-Connect [#2608](https://github.com/apache/apisix-dashboard/pull/2608)
+- feat: add etcd store auto re-initialize [#2650](https://github.com/apache/apisix-dashboard/pull/2650)
+- feat: add enable flag to oidc function [#2672](https://github.com/apache/apisix-dashboard/pull/2672)
+- feat: support purge method [#2674](https://github.com/apache/apisix-dashboard/pull/2674)
+- feat: support more upstream scheme [#2675](https://github.com/apache/apisix-dashboard/pull/2675)
+
+### Docs
+
+- docs: add data loader and new OpenAPI 3 loader [#2484](https://github.com/apache/apisix-dashboard/pull/2484)
+- docs: add new import and export docs to sidebar [#2485](https://github.com/apache/apisix-dashboard/pull/2485)
+- docs: update deploy-with-docker.md [#2472](https://github.com/apache/apisix-dashboard/pull/2472)
+- docs: add a notice about the compatibility of Ingress and Dashboard [#2552](https://github.com/apache/apisix-dashboard/pull/2552)
+- docs: add correct csp rule [#2548](https://github.com/apache/apisix-dashboard/pull/2548)
+- docs: add Slack invitation link badge [#2617](https://github.com/apache/apisix-dashboard/pull/2617)
+
+### Bugfix
+
+- fix: advance matching in the route create page causes the page to crash [#2440](https://github.com/apache/apisix-dashboard/pull/2440)
+- fix: Users can create a Consumer in Dashboard without enabling the plugin [#2442](https://github.com/apache/apisix-dashboard/pull/2442)
+- fix: block arbitrary file index [#2497](https://github.com/apache/apisix-dashboard/pull/2497)
+- fix: route duplicate ID [#2501](https://github.com/apache/apisix-dashboard/pull/2501)
+- fix: add a judgement for last_report_time [#2551](https://github.com/apache/apisix-dashboard/pull/2551)
+- fix: drawer components delete plugin not working [#2573](https://github.com/apache/apisix-dashboard/pull/2573)
+- fix: page refresh causes deletion exception [#2593](https://github.com/apache/apisix-dashboard/pull/2593)
+- fix: plugin_config missing on service exist [#2657](https://github.com/apache/apisix-dashboard/pull/2657)
+- fix: ant-table unable to request [#2641](https://github.com/apache/apisix-dashboard/pull/2641)
+- fix: change default CSP value [#2601](https://github.com/apache/apisix-dashboard/pull/2601)
+
+### Test
+
+- test: remove stale E2E cases [#2475](https://github.com/apache/apisix-dashboard/pull/2475)
+- fix: cli test invalid etcd [#2544](https://github.com/apache/apisix-dashboard/pull/2544)
+- feat: fix actions version to root version [#2521](https://github.com/apache/apisix-dashboard/pull/2521)
+- test: reduce fe ci time [#2557](https://github.com/apache/apisix-dashboard/pull/2557)
+- feat: set serverUrlMap with env, update cypress, update stylelint [#2583](https://github.com/apache/apisix-dashboard/pull/2583)
+- feat: add tip and preset model for plugin editor, improve e2e stability [#2581](https://github.com/apache/apisix-dashboard/pull/2581)
+
+### Other
+
+- feat: dashboard support windows [#2619](https://github.com/apache/apisix-dashboard/pull/2619)
+- feat: configure eslint plugins to support format import and export [#2647](https://github.com/apache/apisix-dashboard/pull/2647)
+
+## 2.13.1
+
+**This is a maintenance release, and you can see the CHANGELOG in `release/2.13` branch.**
+
+[https://github.com/apache/apisix-dashboard/blob/release/2.13/CHANGELOG.md#2131](https://github.com/apache/apisix-dashboard/blob/release/2.13/CHANGELOG.md#2131)
+
 # 2.13.0
 
 This release contains some features and bugfixes, and all the existing functionalities are compatible with Apache APISIX 2.13.x.

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@
 
 - The master version should be used with Apache APISIX master version.
 
-- The latest released version is [2.13.0](https://apisix.apache.org/downloads/) and is compatible with [Apache APISIX 2.13.x](https://apisix.apache.org/downloads/).
+- The latest released version is [3.0.0](https://apisix.apache.org/downloads/) and is compatible with [Apache APISIX 3.0.x](https://apisix.apache.org/downloads/).
 
 ## What's Apache APISIX Dashboard
 

diff --git a/api/VERSION b/api/VERSION
@@ -1 +1 @@
-2.13.0
+3.0.0
diff --git a/api/conf/conf.yaml b/api/conf/conf.yaml
@@ -81,6 +81,7 @@ authentication:
       password: user
 
 oidc:
+  enabled: false
   expire_time: 3600
   client_id: dashboard
   client_secret: dashboard
@@ -90,49 +91,84 @@ oidc:
   redirect_url: http://127.0.0.1:9000/apisix/admin/oidc/callback
   scope: openid
 
-plugins:                          # plugin list (sorted in alphabetical order)
+plugins:
   - api-breaker
+  - authz-casbin
+  - authz-casdoor
   - authz-keycloak
+  - aws-lambda
+  - azure-functions
   - basic-auth
-  - batch-requests
+  # - batch-requests
+  - clickhouse-logger
+  - client-control
   - consumer-restriction
   - cors
+  - csrf
+  - datadog
   # - dubbo-proxy
   - echo
-  # - error-log-logger
+  - error-log-logger
   # - example-plugin
+  - ext-plugin-post-req
+  - ext-plugin-post-resp
+  - ext-plugin-pre-req
   - fault-injection
+  - file-logger
+  - forward-auth
+  - google-cloud-logging
   - grpc-transcode
+  - grpc-web
+  - gzip
   - hmac-auth
   - http-logger
   - ip-restriction
   - jwt-auth
   - kafka-logger
+  - kafka-proxy
   - key-auth
+  - ldap-auth
   - limit-conn
   - limit-count
   - limit-req
+  - loggly
   # - log-rotate
+  - mocking
   # - node-status
+  - opa
   - openid-connect
+  - opentelemetry
+  - openwhisk
   - prometheus
   - proxy-cache
+  - proxy-control
   - proxy-mirror
   - proxy-rewrite
+  - public-api
+  - real-ip
   - redirect
   - referer-restriction
   - request-id
   - request-validation
   - response-rewrite
+  - rocketmq-logger
+  - server-info
   - serverless-post-function
   - serverless-pre-function
-  # - skywalking
+  - skywalking
+  - skywalking-logger
   - sls-logger
+  - splunk-hec-logging
   - syslog
   - tcp-logger
+  - traffic-split
+  - ua-restriction
   - udp-logger
   - uri-blocker
   - wolf-rbac
   - zipkin
-  - server-info
-  - traffic-split
+  - elasticsearch-logge
+  - openfunction
+  - tencent-cloud-cls
+  - ai
+  - cas-auth