CHANGELOG.md

@@ -19,6 +19,7 @@
 
 # Table of Contents
 
+- [2.4.0](#240)
 - [2.3.0](#230)
 - [2.2.0](#220)
 - [2.1.1](#211)
@@ -27,6 +28,51 @@
 - [1.5.0](#150)
 - [1.0.0](#100)
 
+# 2.4.0
+
+This release mainly improves basic features, bugfix and adds test cases.
+
+`Manager API` 2.4 should be used with [Apache APISIX 2.3](https://github.com/apache/apisix/releases/tag/2.3). It is not recommended to use with other Apache APISIX versions.
+
+### Core
+
+- Support to show warning notification when dashboard version not matching apisix. [#1435](https://github.com/apache/apisix-dashboard/pull/1435)
+- Support mTLS connection to ETCD. [#1437](https://github.com/apache/apisix-dashboard/pull/1437)
+- Support IP allow list. [#1424](https://github.com/apache/apisix-dashboard/pull/1424)
+- Support to get manager-api version through API. [#1429](https://github.com/apache/apisix-dashboard/pull/1429)
+- Support import route from OpenAPI specification3.0. [#1102](https://github.com/apache/apisix-dashboard/pull/1102)
+- Support export route from OpenAPI specification3.0. [#1245](https://github.com/apache/apisix-dashboard/pull/1245)
+- Support string type for the script field in Route. [#1289](https://github.com/apache/apisix-dashboard/pull/1289)
+- Feat: add script_id field in Route.entity. [#1386](https://github.com/apache/apisix-dashboard/pull/1386)
+- Feat: add stop subcommand. [#741](https://github.com/apache/apisix-dashboard/pull/741)
+- Feat: add e2e test coverage. [#1270](https://github.com/apache/apisix-dashboard/pull/1270)
+- Feat: add returning value for HTTP PUT and PATCH methods. [#1322](https://github.com/apache/apisix-dashboard/pull/1322)
+- Feat: user can skip upstream when select service_id [#1302](https://github.com/apache/apisix-dashboard/pull/1302)
+
+### Bugfix
+
+- Fix: add defer recover for goroutines to prevent abnormal crash. [#1419](https://github.com/apache/apisix-dashboard/pull/1419)
+- Fix: add version ldflags when building manager-api in Dockerfile. [#1393](https://github.com/apache/apisix-dashboard/pull/1393)
+- Fix: Upgrade gjson and protobuf to avoid security problem. [#1366](https://github.com/apache/apisix-dashboard/pull/1366)
+- Fix: Incomplete label display. [#1252](https://github.com/apache/apisix-dashboard/pull/1252)
+- Fix: Redirect plugin should not show in route step3 [#1276](https://github.com/apache/apisix-dashboard/pull/1276)
+- Fix: Editing a Service, the upstream info will be lost. [#1347](https://github.com/apache/apisix-dashboard/pull/1347)
+
+### Test Case
+
+- Use ginkgo framwork to do backend E2E testing. [#1319](https://github.com/apache/apisix-dashboard/pull/1319)
+- Add action to check the version for release. [#1418](https://github.com/apache/apisix-dashboard/pull/1418)
+- Add test for make build. [#1421](https://github.com/apache/apisix-dashboard/pull/1421)
+- Remove the etcd dependency in part of unit test. [#1169](https://github.com/apache/apisix-dashboard/pull/1469)
+- Skip Cypress binary install when build. [#1248](https://github.com/apache/apisix-dashboard/pull/1248)
+- Enhance plugin schema smoke test [#1261](https://github.com/apache/apisix-dashboard/pull/1261)
+- Delete unnecessary wait in front-end test. [#1370](https://github.com/apache/apisix-dashboard/pull/1370)
+- Add edit the plugin testcase [#1372](https://github.com/apache/apisix-dashboard/pull/1372)
+
+### Doc
+
+- Doc: add document for introducing bakend e2e test. [#1381](https://github.com/apache/apisix-dashboard/pull/1381)
+
 # 2.3.0
 
 ### Core

Dockerfile

@@ -19,9 +19,10 @@ FROM alpine:latest as pre-build
 ARG APISIX_DASHBOARD_VERSION=master
 
 RUN set -x \
-    && wget https://github.com/apache/apisix-dashboard/archive/${APISIX_DASHBOARD_VERSION}.tar.gz -O /tmp/apisix-dashboard.tar.gz \
-    && mkdir /usr/local/apisix-dashboard \
-    && tar -xvf /tmp/apisix-dashboard.tar.gz -C /usr/local/apisix-dashboard --strip 1
+    && apk add --no-cache --virtual .builddeps git \
+    && git clone https://github.com/apache/apisix-dashboard.git -b ${APISIX_DASHBOARD_VERSION} /usr/local/apisix-dashboard \
+    && cd /usr/local/apisix-dashboard && git clean -Xdf \
+    && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash
 
 FROM golang:1.14 as api-builder
 

README.md

@@ -31,7 +31,7 @@
 
 - The master version should be used with Apache APISIX master version.
 
-- The latest released version is [2.3](https://apisix.apache.org/downloads/) and should be used with [Apache APISIX 2.2](https://apisix.apache.org/downloads/). It is not recommended to use with other Apache APISIX versions.
+- The latest released version is [2.4](https://apisix.apache.org/downloads/) and should be used with [Apache APISIX 2.3](https://apisix.apache.org/downloads/). It is not recommended to use with other Apache APISIX versions.
 
 ## What's Apache APISIX Dashboard
 

api/VERSION

@@ -1 +1 @@
-master
+2.4

api/test/shell/manager_smoking.sh

@@ -52,6 +52,12 @@ else
 	    echo "no Version output"
 	    exit 1
 	fi
+	# Version output
+	hashline=$(docker logs docker-deploy_managerapi_1 | grep -E "^GitHash : [A-Za-z0-9\-\_\.]+")
+	if [ -z "$hashline" ];then
+	    echo "no GitHash output"
+	    exit 1
+	fi
 fi
 
 

docs/deploy-with-rpm.md

@@ -24,7 +24,7 @@
 ## Install from RPM
 
 ```sh
-$ sudo yum install -y https://github.com/apache/apisix-dashboard/releases/download/v2.3/apisix-dashboard-v2.3-1.x86_64.rpm
+$ sudo yum install -y https://github.com/apache/apisix-dashboard/releases/download/v2.4/apisix-dashboard-2.4-0.x86_64.rpm
 ```
 
 ## Run

docs/deploy.md

@@ -43,7 +43,7 @@ $ go env -w GOPROXY=https://goproxy.cn,direct
 ## Clone the project
 
 ```sh
-$ git clone -b v2.3 https://github.com/apache/apisix-dashboard.git
+$ git clone -b v2.4 https://github.com/apache/apisix-dashboard.git
 ```
 
 ## Build

docs/develop.md

@@ -28,7 +28,7 @@ Before development, refer to this [guide](./deploy.md) to install dependencies.
 ## Clone the project
 
 ```sh
-$ git clone -b v2.2 https://github.com/apache/apisix-dashboard.git
+$ git clone -b v2.4 https://github.com/apache/apisix-dashboard.git
 ```
 
 ## Start developing

web/cypress/fixtures/plugin-dataset.json

@@ -192,34 +192,81 @@
     {
       "shouldValid": true,
       "data": {
-        "token_endpoint": "https://efactory-security-portal.salzburgresearch.at/",
-        "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket"
+        "client_id" : "foo",
+        "token_endpoint" : "https://host.domain/auth/realms/foo/protocol/openid-connect/token"
       }
     },
     {
       "shouldValid": true,
       "data": {
-        "token_endpoint": "https://efactory-security-portal.salzburgresearch.at/",
+        "client_id": "foo",
+        "discovery": "https://host.domain/auth/realms/foo/.well-known/uma2-configuration"
+      }
+    },
+    {
+      "shouldValid": true,
+      "data": {
+        "audience": "foo",
+        "discovery": "https://host.domain/auth/realms/foo/.well-known/uma2-configuration"
+      }
+    },
+    {
+      "shouldValid": true,
+      "data": {
+        "client_id": "foo",
+        "lazy_load_paths": true,
+        "token_endpoint": "https://host.domain/auth/realms/foo/protocol/openid-connect/token",
+        "resource_registration_endpoint": "https://host.domain/auth/realms/foo/authz/protection/resource_set"
+      }
+    },
+    {
+      "shouldValid": true,
+      "data": {
+        "client_id": "foo",
+        "lazy_load_paths": true,
+        "discovery": "https://host.domain/auth/realms/foo/.well-known/uma2-configuration"
+      }
+    },
+    {
+      "shouldValid": true,
+      "data": {
+        "discovery": "https://host.domain/auth/realms/foo/.well-known/uma2-configuration",
+        "token_endpoint": "https://host.domain/auth/realms/foo/protocol/openid-connect/token",
+        "resource_registration_endpoint": "https://host.domain/auth/realms/foo/authz/protection/resource_set",
+        "client_id": "University",
+        "audience": "University",
+        "client_secret": "secret",
+        "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket",
+        "policy_enforcement_mode": "ENFORCING",
         "permissions": ["res:customer#scopes:view"],
+        "lazy_load_paths": false,
+        "http_method_as_scope": false,
         "timeout": 1000,
-        "audience": "University",
-        "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket"
+        "ssl_verify": false,
+        "cache_ttl_seconds": 1000,
+        "keepalive": true,
+        "keepalive_timeout": 10000,
+        "keepalive_pool": 5
       }
     },
     {
       "shouldValid": false,
       "data": {
-        "permissions": ["res:customer#scopes:view"]
+        "client_id": "foo"
       }
     },
     {
-      "shouldValid": true,
+      "shouldValid": false,
       "data": {
-        "token_endpoint": "http://127.0.0.1:8090/auth/realms/University/protocol/openid-connect/token",
-        "permissions": ["course_resource#view"],
-        "audience": "course_management",
-        "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket",
-        "timeout": 3000
+        "discovery": "https://host.domain/auth/realms/foo/.well-known/uma2-configuration"
+      }
+    },
+    {
+      "shouldValid": false,
+      "data": {
+        "client_id": "foo",
+        "token_endpoint": "https://host.domain/auth/realms/foo/protocol/openid-connect/token",
+        "lazy_load_paths": true
       }
     }
   ],

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apisix-dashboard",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "private": true,
   "description": "Dashboard for Apache APISIX",
   "scripts": {