You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/09/15 03:27:16 UTC
[apisix] branch master updated: test: remove unnecessary `enable_admin: false` (#7896)
This is an automated email from the ASF dual-hosted git repository.
spacewander 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 d7c15bcca test: remove unnecessary `enable_admin: false` (#7896)
d7c15bcca is described below
commit d7c15bccaf136ff048660a88c218c7adeac9af21
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Thu Sep 15 11:27:11 2022 +0800
test: remove unnecessary `enable_admin: false` (#7896)
---
docs/en/latest/stand-alone.md | 1 -
docs/zh/latest/stand-alone.md | 1 -
t/config-center-yaml/consumer.t | 1 -
t/config-center-yaml/global-rule.t | 1 -
t/config-center-yaml/plugin-configs.t | 1 -
t/config-center-yaml/plugin-metadata.t | 1 -
t/config-center-yaml/route-service.t | 1 -
t/config-center-yaml/route-upstream.t | 1 -
t/config-center-yaml/route.t | 5 -----
t/config-center-yaml/ssl.t | 1 -
t/config-center-yaml/stream-route.t | 1 -
t/control/discovery.t | 2 --
t/control/healthcheck.t | 1 -
t/control/routes.t | 1 -
t/control/services.t | 1 -
t/control/upstreams.t | 1 -
t/discovery/consul_kv.t | 5 -----
t/discovery/consul_kv_dump.t | 8 --------
t/discovery/eureka.t | 1 -
t/discovery/nacos.t | 2 --
t/discovery/nacos2.t | 1 -
t/node/grpc-proxy.t | 1 -
t/node/healthcheck-discovery.t | 1 -
t/node/healthcheck2.t | 1 -
t/node/least_conn.t | 1 -
t/node/upstream-discovery.t | 1 -
t/node/upstream-domain-with-special-dns.t | 3 ---
t/node/upstream-domain-with-special-ipv6-dns.t | 1 -
t/plugin/http-logger-json.t | 1 -
t/plugin/prometheus.t | 1 -
t/plugin/proxy-rewrite2.t | 1 -
t/router/radixtree-host-uri-priority.t | 1 -
t/router/radixtree-host-uri2.t | 1 -
t/stream-node/priority-balancer.t | 1 -
34 files changed, 53 deletions(-)
diff --git a/docs/en/latest/stand-alone.md b/docs/en/latest/stand-alone.md
index 63a769533..dac3b1a29 100644
--- a/docs/en/latest/stand-alone.md
+++ b/docs/en/latest/stand-alone.md
@@ -40,7 +40,6 @@ Refer to the example below:
```yaml
apisix:
- enable_admin: false
config_center: yaml
```
diff --git a/docs/zh/latest/stand-alone.md b/docs/zh/latest/stand-alone.md
index 7effb17b6..b10f2fe38 100644
--- a/docs/zh/latest/stand-alone.md
+++ b/docs/zh/latest/stand-alone.md
@@ -41,7 +41,6 @@ Admin API 将不再被允许使用。
```yaml
apisix:
- enable_admin: false
config_center: yaml
```
diff --git a/t/config-center-yaml/consumer.t b/t/config-center-yaml/consumer.t
index 62cfb321d..123aa4229 100644
--- a/t/config-center-yaml/consumer.t
+++ b/t/config-center-yaml/consumer.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/config-center-yaml/global-rule.t b/t/config-center-yaml/global-rule.t
index 660ace689..d310c0c1b 100644
--- a/t/config-center-yaml/global-rule.t
+++ b/t/config-center-yaml/global-rule.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/config-center-yaml/plugin-configs.t b/t/config-center-yaml/plugin-configs.t
index ab291d65e..2caec45dc 100644
--- a/t/config-center-yaml/plugin-configs.t
+++ b/t/config-center-yaml/plugin-configs.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/config-center-yaml/plugin-metadata.t b/t/config-center-yaml/plugin-metadata.t
index 6e0a9971e..3a1c37218 100644
--- a/t/config-center-yaml/plugin-metadata.t
+++ b/t/config-center-yaml/plugin-metadata.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/config-center-yaml/route-service.t b/t/config-center-yaml/route-service.t
index c83af6fb4..ecb479f0a 100644
--- a/t/config-center-yaml/route-service.t
+++ b/t/config-center-yaml/route-service.t
@@ -25,7 +25,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
run_tests();
diff --git a/t/config-center-yaml/route-upstream.t b/t/config-center-yaml/route-upstream.t
index ff50ce274..18fa800e9 100644
--- a/t/config-center-yaml/route-upstream.t
+++ b/t/config-center-yaml/route-upstream.t
@@ -25,7 +25,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
run_tests();
diff --git a/t/config-center-yaml/route.t b/t/config-center-yaml/route.t
index e77cf732f..6676adf6c 100644
--- a/t/config-center-yaml/route.t
+++ b/t/config-center-yaml/route.t
@@ -25,7 +25,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
run_tests();
@@ -154,7 +153,6 @@ hello world
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
router:
http: "radixtree_host_uri"
--- apisix_yaml
@@ -183,7 +181,6 @@ property "uri" validation failed
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
router:
http: "radixtree_host_uri"
--- apisix_yaml
@@ -211,7 +208,6 @@ GET /hello
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
router:
http: "radixtree_host_uri"
--- apisix_yaml
@@ -239,7 +235,6 @@ GET /hello
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
--- apisix_yaml
routes:
-
diff --git a/t/config-center-yaml/ssl.t b/t/config-center-yaml/ssl.t
index 8d74faff0..e6c80627e 100644
--- a/t/config-center-yaml/ssl.t
+++ b/t/config-center-yaml/ssl.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/config-center-yaml/stream-route.t b/t/config-center-yaml/stream-route.t
index df28a3c0f..258924d18 100644
--- a/t/config-center-yaml/stream-route.t
+++ b/t/config-center-yaml/stream-route.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/control/discovery.t b/t/control/discovery.t
index ab78da6af..c1b00ee64 100644
--- a/t/control/discovery.t
+++ b/t/control/discovery.t
@@ -28,7 +28,6 @@ apisix:
enable_control: true
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
eureka:
@@ -132,7 +131,6 @@ apisix:
enable_control: true
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
consul_kv:
servers:
diff --git a/t/control/healthcheck.t b/t/control/healthcheck.t
index 9e0a38048..c7453df8c 100644
--- a/t/control/healthcheck.t
+++ b/t/control/healthcheck.t
@@ -30,7 +30,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/control/routes.t b/t/control/routes.t
index 180a69095..41c773b9f 100644
--- a/t/control/routes.t
+++ b/t/control/routes.t
@@ -30,7 +30,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/control/services.t b/t/control/services.t
index c702a7ceb..e48ccf4b8 100644
--- a/t/control/services.t
+++ b/t/control/services.t
@@ -30,7 +30,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/control/upstreams.t b/t/control/upstreams.t
index c2d76fbd2..3fcce779b 100644
--- a/t/control/upstreams.t
+++ b/t/control/upstreams.t
@@ -30,7 +30,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/discovery/consul_kv.t b/t/discovery/consul_kv.t
index 30d40c1fa..124dad109 100644
--- a/t/discovery/consul_kv.t
+++ b/t/discovery/consul_kv.t
@@ -82,7 +82,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
consul_kv:
@@ -195,7 +194,6 @@ routes:
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
consul_kv:
@@ -251,7 +249,6 @@ skip some keys, return default nodes, get response: missing consul_kv services
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
consul_kv:
@@ -461,7 +458,6 @@ location /v1/kv {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
consul_kv:
@@ -517,7 +513,6 @@ location /sleep {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
consul_kv:
diff --git a/t/discovery/consul_kv_dump.t b/t/discovery/consul_kv_dump.t
index 7d4e276ad..47e567c7e 100644
--- a/t/discovery/consul_kv_dump.t
+++ b/t/discovery/consul_kv_dump.t
@@ -46,7 +46,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
@@ -110,7 +109,6 @@ GET /t
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
@@ -159,7 +157,6 @@ Configure the invalid consul server addr, and loading the last test 3 generated
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
@@ -207,7 +204,6 @@ success
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
@@ -267,7 +263,6 @@ test load unexpired /tmp/consul_kv.dump file generated by upper test when initia
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
@@ -302,7 +297,6 @@ test load expired ( by check: (dump_file.last_update + dump.expire) < ngx.time )
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
@@ -352,7 +346,6 @@ success
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
@@ -373,7 +366,6 @@ GET /v1/discovery/consul_kv/show_dump_file
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
enable_control: true
discovery:
diff --git a/t/discovery/eureka.t b/t/discovery/eureka.t
index 9f429f165..4b9f73ea8 100644
--- a/t/discovery/eureka.t
+++ b/t/discovery/eureka.t
@@ -25,7 +25,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
eureka:
host:
diff --git a/t/discovery/nacos.t b/t/discovery/nacos.t
index 98c309c78..c29b73383 100644
--- a/t/discovery/nacos.t
+++ b/t/discovery/nacos.t
@@ -26,7 +26,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
nacos:
host:
@@ -45,7 +44,6 @@ our $yaml_auth_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
nacos:
host:
diff --git a/t/discovery/nacos2.t b/t/discovery/nacos2.t
index 755ce16e0..ebc8b6efd 100644
--- a/t/discovery/nacos2.t
+++ b/t/discovery/nacos2.t
@@ -39,7 +39,6 @@ __DATA__
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
discovery:
nacos:
host:
diff --git a/t/node/grpc-proxy.t b/t/node/grpc-proxy.t
index 5c14e01d0..95d1eb385 100644
--- a/t/node/grpc-proxy.t
+++ b/t/node/grpc-proxy.t
@@ -32,7 +32,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/node/healthcheck-discovery.t b/t/node/healthcheck-discovery.t
index db9c62317..cea0a3e5f 100644
--- a/t/node/healthcheck-discovery.t
+++ b/t/node/healthcheck-discovery.t
@@ -29,7 +29,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/node/healthcheck2.t b/t/node/healthcheck2.t
index 2939175f2..269e24d58 100644
--- a/t/node/healthcheck2.t
+++ b/t/node/healthcheck2.t
@@ -31,7 +31,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/node/least_conn.t b/t/node/least_conn.t
index 9df9c0536..39570fd9a 100644
--- a/t/node/least_conn.t
+++ b/t/node/least_conn.t
@@ -30,7 +30,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/node/upstream-discovery.t b/t/node/upstream-discovery.t
index 8ce9606df..4d4b03e11 100644
--- a/t/node/upstream-discovery.t
+++ b/t/node/upstream-discovery.t
@@ -29,7 +29,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/node/upstream-domain-with-special-dns.t b/t/node/upstream-domain-with-special-dns.t
index 0481ab7e4..e50e1d97e 100644
--- a/t/node/upstream-domain-with-special-dns.t
+++ b/t/node/upstream-domain-with-special-dns.t
@@ -32,7 +32,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
@@ -113,7 +112,6 @@ connect to 127.0.0.1:1053
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
dns_resolver_valid: 900
--- apisix_yaml
upstreams:
@@ -194,7 +192,6 @@ connect to 127.0.0.1:1053
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
dns_resolver_valid: 1
--- apisix_yaml
upstreams:
diff --git a/t/node/upstream-domain-with-special-ipv6-dns.t b/t/node/upstream-domain-with-special-ipv6-dns.t
index 5ec838bca..a1efc0e27 100644
--- a/t/node/upstream-domain-with-special-ipv6-dns.t
+++ b/t/node/upstream-domain-with-special-ipv6-dns.t
@@ -32,7 +32,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/plugin/http-logger-json.t b/t/plugin/http-logger-json.t
index 978716553..0d2839d23 100644
--- a/t/plugin/http-logger-json.t
+++ b/t/plugin/http-logger-json.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/plugin/prometheus.t b/t/plugin/prometheus.t
index 442d1b8b3..91756d6e1 100644
--- a/t/plugin/prometheus.t
+++ b/t/plugin/prometheus.t
@@ -612,7 +612,6 @@ qr/apisix_node_info\{hostname=".*"\} 1/
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
--- apisix_yaml
routes:
-
diff --git a/t/plugin/proxy-rewrite2.t b/t/plugin/proxy-rewrite2.t
index e6cbc1de0..89763a293 100644
--- a/t/plugin/proxy-rewrite2.t
+++ b/t/plugin/proxy-rewrite2.t
@@ -28,7 +28,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);
diff --git a/t/router/radixtree-host-uri-priority.t b/t/router/radixtree-host-uri-priority.t
index 4190bb338..b7826f46c 100644
--- a/t/router/radixtree-host-uri-priority.t
+++ b/t/router/radixtree-host-uri-priority.t
@@ -26,7 +26,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
router:
http: 'radixtree_host_uri'
_EOC_
diff --git a/t/router/radixtree-host-uri2.t b/t/router/radixtree-host-uri2.t
index 7573bf804..6699b87a7 100644
--- a/t/router/radixtree-host-uri2.t
+++ b/t/router/radixtree-host-uri2.t
@@ -26,7 +26,6 @@ our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
router:
http: 'radixtree_host_uri'
_EOC_
diff --git a/t/stream-node/priority-balancer.t b/t/stream-node/priority-balancer.t
index e25bdc3f9..5448718d8 100644
--- a/t/stream-node/priority-balancer.t
+++ b/t/stream-node/priority-balancer.t
@@ -31,7 +31,6 @@ add_block_preprocessor(sub {
apisix:
node_listen: 1984
config_center: yaml
- enable_admin: false
_EOC_
$block->set_value("yaml_config", $yaml_config);