This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 696cb50 feat(CI): check for trailing whitespace (#3250)
696cb50 is described below
commit 696cb50ba53f4aff3811ddab8c112d96c4f578f0
Author: John Bampton <[email protected]>
AuthorDate: Tue Feb 16 14:14:46 2021 +1000
feat(CI): check for trailing whitespace (#3250)
---
.github/workflows/lint.yml | 7 +++++++
Makefile | 2 +-
t/lib/dubbo-backend/dubbo-backend-provider/pom.xml | 4 ++--
.../main/resources/META-INF/spring/dubbo-demo-provider.xml | 2 +-
t/node/global-rule.t | 2 +-
t/node/least_conn.t | 2 +-
t/plugin/cors.t | 2 +-
t/plugin/dubbo-proxy/route.t | 2 +-
t/plugin/prometheus2.t | 12 ++++++------
t/plugin/traffic-split.t | 2 +-
10 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ad21223..ef1f707 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -31,3 +31,10 @@ jobs:
run: |
# return non-zero exit code on warnings
yamllint --strict .
+ trailing-whitespace:
+ name: ๐ Trailing whitespace
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: ๐งน Check for trailing whitespace
+ run: "! git grep -EIn $'[ \t]+$' | grep -v 'received: '"
diff --git a/Makefile b/Makefile
index 8fe192f..320a214 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ install: default
$(INSTALL) README.md $(INST_CONFDIR)/README.md
$(INSTALL) bin/apisix $(INST_BINDIR)/apisix
-
+
$(INSTALL) -d $(INST_LUADIR)/apisix/plugins/slslog
$(INSTALL) apisix/plugins/slslog/*.lua
$(INST_LUADIR)/apisix/plugins/slslog/
diff --git a/t/lib/dubbo-backend/dubbo-backend-provider/pom.xml
b/t/lib/dubbo-backend/dubbo-backend-provider/pom.xml
index 7ceb3a1..6b496f3 100644
--- a/t/lib/dubbo-backend/dubbo-backend-provider/pom.xml
+++ b/t/lib/dubbo-backend/dubbo-backend-provider/pom.xml
@@ -34,7 +34,7 @@ limitations under the License.
<curator.version>2.12.0</curator.version>
<dubbo.version>2.7.7</dubbo.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.dubbo.backend</groupId>
@@ -52,7 +52,7 @@ limitations under the License.
<version>4.5.5</version>
</dependency>
</dependencies>
-
+
<build>
<finalName>dubbo-demo-provider</finalName>
<plugins>
diff --git
a/t/lib/dubbo-backend/dubbo-backend-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
b/t/lib/dubbo-backend/dubbo-backend-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
index 14b5afd..4adc04f 100644
---
a/t/lib/dubbo-backend/dubbo-backend-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
+++
b/t/lib/dubbo-backend/dubbo-backend-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
@@ -29,7 +29,7 @@
<!-- use dubbo protocol to export service on port 20880 -->
<dubbo:protocol name="dubbo" port="20880" threads="1024"/>
-
+
<!-- service implementation, as same as regular local bean -->
<bean id="demoService"
class="org.apache.dubbo.backend.provider.DemoServiceImpl"/>
diff --git a/t/node/global-rule.t b/t/node/global-rule.t
index ccf97ab..f96648b 100644
--- a/t/node/global-rule.t
+++ b/t/node/global-rule.t
@@ -165,7 +165,7 @@ apisix:
global_rule_skip_internal_api: false
plugins:
- limit-count
- - node-status
+ - node-status
--- request
GET /apisix/status
--- error_code: 503
diff --git a/t/node/least_conn.t b/t/node/least_conn.t
index 7d0a272..9df9c05 100644
--- a/t/node/least_conn.t
+++ b/t/node/least_conn.t
@@ -38,7 +38,7 @@ _EOC_
my $route = <<_EOC_;
routes:
- -
+ -
upstream_id: 1
uris:
- /mysleep
diff --git a/t/plugin/cors.t b/t/plugin/cors.t
index a0d2e2a..97bfc42 100644
--- a/t/plugin/cors.t
+++ b/t/plugin/cors.t
@@ -249,7 +249,7 @@ Access-Control-Allow-Methods: *
Access-Control-Allow-Headers: *
Access-Control-Expose-Headers: *
Access-Control-Max-Age: 5
-Access-Control-Allow-Credentials:
+Access-Control-Allow-Credentials:
--- no_error_log
[error]
diff --git a/t/plugin/dubbo-proxy/route.t b/t/plugin/dubbo-proxy/route.t
index 7feea03..ede3e9c 100644
--- a/t/plugin/dubbo-proxy/route.t
+++ b/t/plugin/dubbo-proxy/route.t
@@ -207,7 +207,7 @@ plugins:
},
"key-auth": {}
},
- "uris": ["/hello"]
+ "uris": ["/hello"]
}]]
)
diff --git a/t/plugin/prometheus2.t b/t/plugin/prometheus2.t
index 10f6c33..1189855 100644
--- a/t/plugin/prometheus2.t
+++ b/t/plugin/prometheus2.t
@@ -368,7 +368,7 @@ GET /apisix/prometheus/metrics
"timeout": 3,
"drop_limit": 1048576,
"pool_size": 5
- }
+ }
},
"upstream": {
"nodes": {
@@ -426,7 +426,7 @@
qr/apisix_batch_process_entries\{name="sys-logger",route_id="9",server_addr="127
"endpoint": "http://127.0.0.1:9447";,
"service_name": "APISIX",
"sample_ratio": 1
- }
+ }
},
"upstream": {
"nodes": {
@@ -491,7 +491,7 @@
qr/apisix_batch_process_entries\{name="zipkin_report",route_id="9",server_addr="
"concat_method": "json",
"batch_max_size": 1000,
"max_retry_count": 0
- }
+ }
},
"upstream": {
"nodes": {
@@ -557,7 +557,7 @@
qr/apisix_batch_process_entries\{name="http-logger",route_id="9",server_addr="12
"inactive_timeout": 5,
"tls": false,
"max_retry_count": 0
- }
+ }
},
"upstream": {
"nodes": {
@@ -620,7 +620,7 @@
qr/apisix_batch_process_entries\{name="tcp-logger",route_id="10",server_addr="12
"name": "udp-logger",
"inactive_timeout": 5,
"buffer_duration": 60
- }
+ }
},
"upstream": {
"nodes": {
@@ -688,7 +688,7 @@
qr/apisix_batch_process_entries\{name="udp-logger",route_id="10",server_addr="12
"access_key_secret": "your_key_secret",
"timeout": 5000,
"project": "your_project"
- }
+ }
},
"upstream": {
"nodes": {
diff --git a/t/plugin/traffic-split.t b/t/plugin/traffic-split.t
index f9460d3..7c38b68 100644
--- a/t/plugin/traffic-split.t
+++ b/t/plugin/traffic-split.t
@@ -1358,7 +1358,7 @@ qr/additional properties forbidden, found
additional_properties/
content_by_lua_block {
local plugin = require("apisix.plugins.traffic-split")
local ok, err = plugin.check_schema({
- rules = {
+ rules = {
{
additional_properties = "hello",
match = {
