diff --git a/.travis.yml b/.travis.yml index 6f2dc4ab..5332de2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: script: - ./src/test/bash/travis_run_consul.sh - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw --settings .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true' -- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' +- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' env: global: - GIT_NAME="Spencer Gibb" diff --git a/pom.xml b/pom.xml index 15c10879..1c242d06 100644 --- a/pom.xml +++ b/pom.xml @@ -121,36 +121,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/ConsulDiscoveryClientAclTests.java - - - - - - - ci - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/ConsulPropertySourceLocatorTests.java - **/ConsulDiscoveryClientAclTests.java - - - - - - diff --git a/src/test/bash/travis_run_consul.sh b/src/test/bash/travis_run_consul.sh index 565ffa29..acdac7a5 100755 --- a/src/test/bash/travis_run_consul.sh +++ b/src/test/bash/travis_run_consul.sh @@ -1,6 +1,7 @@ #!/bin/bash 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/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_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746 +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 +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 diff --git a/src/test/resources/consul_acl/consul_anonymous_acl.json b/src/test/resources/consul_acl/consul_anonymous_acl.json new file mode 100644 index 00000000..39f16ac2 --- /dev/null +++ b/src/test/resources/consul_acl/consul_anonymous_acl.json @@ -0,0 +1,20 @@ +{ + "ID": "anonymous", + "Name": "anonymous", + "Type": "client", + "Rules": "{ + \"key\": { + \"\": { + \"policy\": \"write\" + } + }, + \"service\": { + \"\": { + \"policy\": \"write\" + }, + \"testConsulDiscoveryAcl\": { + \"policy\": \"read\" + } + } + }" +} diff --git a/src/test/resources/consul_config/acl_config.json b/src/test/resources/consul_config/acl_config.json index 787f1eb5..ea9e761b 100644 --- a/src/test/resources/consul_config/acl_config.json +++ b/src/test/resources/consul_config/acl_config.json @@ -2,5 +2,5 @@ "datacenter": "local", "acl_datacenter": "local", "acl_master_token": "2ee647bd-bd69-4118-9f34-b9a6e9e60746", - "acl_default_policy": "write" + "acl_default_policy": "deny" }