Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 🧹 remove trailing whitespace #1052

Merged
merged 1 commit into from
Dec 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/frontend-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name: gitLeaks

on:
push:
branches:
branches:
- master
pull_request:
branches:
branches:
- master

jobs:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down
2 changes: 1 addition & 1 deletion api/conf/conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/test/docker-deploy/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions api/test/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion api/test/docker/upstream.conf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ server {
listen 1982;
listen 5044;


server_tokens off;

location / {
Expand Down
2 changes: 1 addition & 1 deletion api/test/e2e/id_compatible_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion api/test/e2e/route_with_trace_plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestRoute_With_Plugin_Skywalking(t *testing.T) {
"uri": "/hello",
"plugins": {
"skywalking": {
"sample_ratio": 1
"sample_ratio": 1
}
},
"upstream": {
Expand Down
2 changes: 1 addition & 1 deletion api/test/e2e/upstream_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion api/test/shell/docker_deploy_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/deploy-with-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down