SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates consul to 1.7.2

Browse Source 
fixes gh-491
This commit is contained in:
Spencer Gibb
2020-04-09 01:06:26 -04:00
parent e71ad1ee2e
commit ce0ac8b2be
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/bash/travis_install_consul.sh → src/main/bash/ci_install_consul.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
CONSUL_VER="0.7.5"
CONSUL_VER="1.7.2"
CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
IGNORE_CERTS="${IGNORE_CERTS:-no}"

13
src/test/bash/ci_run_consul.sh Executable file
View File

@@ -0,0 +1,13 @@
#!/bin/bash
ps -ef | grep consul
killall consul
BASEDIR=`dirname $0`/../../..
#${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui -config-dir ${BASEDIR}/src/test/resources/consul_config &
${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui -config-dir ${BASEDIR}/src/test/resources/empty_config &
# wait for consul to elect a leader before sending acl
sleep 5
# FIXME: 2.2.3 consul acl rework see https://github.com/spring-cloud/spring-cloud-consul/issues/628
#curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_anonymous_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
#echo "consul_anonymous_acl installed"
#curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
#echo "consul_discovery_client_acl installed"

11
src/test/bash/travis_run_consul.sh
View File

@@ -1,11 +0,0 @@
#!/bin/bash
ps -ef | grep consul
killall consul
BASEDIR=`dirname $0`/../../..
${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui -config-dir ${BASEDIR}/src/test/resources/consul_config &
# wait for consul to elect a leader before sending acl
sleep 5
curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_anonymous_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
echo "consul_anonymous_acl installed"
curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
echo "consul_discovery_client_acl installed"

0
src/test/resources/empty_config/.do-not-delete.txt Normal file
View File