From 54358e397effa416da3b1897465357bf9e258751 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Tue, 15 Dec 2020 10:18:46 +1000 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=A7=B9=20remove=20trailing=20?= =?UTF-8?q?whitespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/frontend-e2e-test.yml | 2 +- .github/workflows/gitleaks.yml | 4 ++-- CHANGELOG.md | 2 +- Makefile | 2 +- api/conf/conf.yaml | 2 +- api/test/docker-deploy/docker-compose.yaml | 2 +- api/test/docker/docker-compose.yaml | 4 ++-- api/test/docker/upstream.conf | 2 +- api/test/e2e/id_compatible_test.go | 2 +- api/test/e2e/route_with_trace_plugin_test.go | 2 +- api/test/e2e/upstream_test.go | 2 +- api/test/shell/docker_deploy_test.sh | 2 +- docs/deploy-with-docker.md | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/frontend-e2e-test.yml b/.github/workflows/frontend-e2e-test.yml index d922cc6e23..b95ba989aa 100644 --- a/.github/workflows/frontend-e2e-test.yml +++ b/.github/workflows/frontend-e2e-test.yml @@ -49,7 +49,7 @@ jobs: - name: Start manager-api working-directory: ./api run: nohup go run . & - + - name: Install front-end dependencies working-directory: ./web if: steps.node_modules_cache_id.outputs.cache-hit != 'true' diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml index 6c30e92712..29fe5becf1 100644 --- a/.github/workflows/gitleaks.yml +++ b/.github/workflows/gitleaks.yml @@ -4,10 +4,10 @@ name: gitLeaks on: push: - branches: + branches: - master pull_request: - branches: + branches: - master jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b1dd6772..7c018ee5ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ This release mainly adds test cases and bugfix for `Manager API`. Add e2e test cases for route, upstream, consumer, SSL, and plugins. ## Bugfix - + - Fix: when created route by `Admin API`, upstream can not be modified by dashboard. [#847](https://github.com/apache/apisix-dashboard/pull/847) - Fix: create route with jwt-auth will display an error. [#878](https://github.com/apache/apisix-dashboard/pull/878) - Fix: create route with error format remote_addrs `Manager API` will return 200, but should return 400. [#899](https://github.com/apache/apisix-dashboard/pull/899) diff --git a/Makefile b/Makefile index 7eee57c131..6877b98247 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ ifeq ("$(wildcard $(GO_EXEC))", "") endif -### api-test: Run the tests of manager-api +### api-test: Run the tests of manager-api .PHONY: api-test api-test: api-default cd api/ && APISIX_API_WORKDIR=$$PWD go test -v -race -cover -coverprofile=coverage.txt -covermode=atomic ./... diff --git a/api/conf/conf.yaml b/api/conf/conf.yaml index 802b11dc14..c3d6760ec3 100644 --- a/api/conf/conf.yaml +++ b/api/conf/conf.yaml @@ -22,7 +22,7 @@ conf: etcd: endpoints: # supports defining multiple etcd host addresses for an etcd cluster - 127.0.0.1:2379 - + # etcd basic auth info # username: "root" # ignore etcd username if not enable etcd auth # password: "123456" # ignore etcd password if not enable etcd auth diff --git a/api/test/docker-deploy/docker-compose.yaml b/api/test/docker-deploy/docker-compose.yaml index 57df46269b..39e91d6eaf 100644 --- a/api/test/docker-deploy/docker-compose.yaml +++ b/api/test/docker-deploy/docker-compose.yaml @@ -44,7 +44,7 @@ services: - http://0.0.0.0:2379 managerapi: - image: dashboard:ci + image: dashboard:ci restart: always volumes: - ../../conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml:ro diff --git a/api/test/docker/docker-compose.yaml b/api/test/docker/docker-compose.yaml index 5bdb4f4888..e17405685d 100644 --- a/api/test/docker/docker-compose.yaml +++ b/api/test/docker/docker-compose.yaml @@ -113,7 +113,7 @@ services: image: johz/upstream:v2.0 restart: always volumes: - - ./upstream.conf:/etc/nginx/conf.d/default.conf:ro + - ./upstream.conf:/etc/nginx/conf.d/default.conf:ro ports: - '80:80/tcp' - '1980:1980/tcp' @@ -167,7 +167,7 @@ services: - '9081:9080/tcp' networks: apisix_dashboard_e2e: - ipv4_address: 172.16.238.31 + ipv4_address: 172.16.238.31 managerapi: build: diff --git a/api/test/docker/upstream.conf b/api/test/docker/upstream.conf index 9615d5f5b6..ff223b4afb 100644 --- a/api/test/docker/upstream.conf +++ b/api/test/docker/upstream.conf @@ -39,7 +39,7 @@ server { listen 1982; listen 5044; - + server_tokens off; location / { diff --git a/api/test/e2e/id_compatible_test.go b/api/test/e2e/id_compatible_test.go index d9ad70d0dc..ea53c4bd82 100644 --- a/api/test/e2e/id_compatible_test.go +++ b/api/test/e2e/id_compatible_test.go @@ -69,7 +69,7 @@ func TestID_Using_Int(t *testing.T) { Path: "/apisix/admin/services", Body: `{ "id": 1, - "upstream_id": 1 + "upstream_id": 1 }`, Headers: map[string]string{"Authorization": token}, ExpectStatus: http.StatusOK, diff --git a/api/test/e2e/route_with_trace_plugin_test.go b/api/test/e2e/route_with_trace_plugin_test.go index c51718befa..3092087468 100644 --- a/api/test/e2e/route_with_trace_plugin_test.go +++ b/api/test/e2e/route_with_trace_plugin_test.go @@ -43,7 +43,7 @@ func TestRoute_With_Plugin_Skywalking(t *testing.T) { "uri": "/hello", "plugins": { "skywalking": { - "sample_ratio": 1 + "sample_ratio": 1 } }, "upstream": { diff --git a/api/test/e2e/upstream_test.go b/api/test/e2e/upstream_test.go index e61e024340..beb0a8c1d6 100644 --- a/api/test/e2e/upstream_test.go +++ b/api/test/e2e/upstream_test.go @@ -171,7 +171,7 @@ func TestRoute_Node_Host(t *testing.T) { }], "type": "roundrobin", "pass_host": "rewrite", - "upstream_host": "httpbin.org" + "upstream_host": "httpbin.org" }`, Headers: map[string]string{"Authorization": token}, ExpectStatus: http.StatusOK, diff --git a/api/test/shell/docker_deploy_test.sh b/api/test/shell/docker_deploy_test.sh index 65ddd4f2df..27df656aca 100755 --- a/api/test/shell/docker_deploy_test.sh +++ b/api/test/shell/docker_deploy_test.sh @@ -20,7 +20,7 @@ set -ex # web page -curl http://127.0.0.1:9000 +curl http://127.0.0.1:9000 code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9000) if [ ! $code -eq 200 ]; then echo "failed: failed to custom port" diff --git a/docs/deploy-with-docker.md b/docs/deploy-with-docker.md index c458a8cad5..091f67d4dd 100644 --- a/docs/deploy-with-docker.md +++ b/docs/deploy-with-docker.md @@ -39,7 +39,7 @@ $ docker build -t apisix-dashboard:$tag . # For users in mainland China, the `ENABLE_PROXY` parameter can be provided to speed up module downloads. $ docker build -t apisix-dashboard:$tag . --build-arg ENABLE_PROXY=true -# If you want to use the latest codes to build, you can specify the `APISIX_DASHBOARD_VERSION` parameter to `master`. +# If you want to use the latest codes to build, you can specify the `APISIX_DASHBOARD_VERSION` parameter to `master`. # This parameter can also be specified as branch name of a specific version, such as `v2.1.1`. $ docker build -t apisix-dashboard:$tag . --build-arg APISIX_DASHBOARD_VERSION=master ```