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.

Sign up for GitHub

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

Add support fort consul token #201

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support fort consul token #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aec967d
Add support fort consul token
Dudesons Aug 14, 2018
f6e8c3e
Update the go version for the CI
Dudesons Aug 14, 2018
bea7782
Update the zookeeper version for the CI
Dudesons Aug 20, 2018
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- 1.7.1
- 1.8

# let us have speedy Docker-based Travis workers
sudo: false
Expand All @@ -17,7 +17,7 @@ before_install:
before_script:
- script/travis_consul.sh 0.6.3
- script/travis_etcd.sh 3.0.0
- script/travis_zk.sh 3.5.1-alpha
- script/travis_zk.sh 3.5.4-beta

script:
- ./consul agent -server -bootstrap -advertise=127.0.0.1 -data-dir /tmp/consul -config-file=./config.json 1>/dev/null &
Expand Down
2 changes: 1 addition & 1 deletion script/travis_zk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [ $# -gt 0 ] ; then
ZK_VERSION="$1"
else
ZK_VERSION="3.4.7"
ZK_VERSION="3.4.12"
fi

wget "http://apache.cs.utah.edu/zookeeper/zookeeper-${ZK_VERSION}/zookeeper-${ZK_VERSION}.tar.gz"
Expand Down
3 changes: 3 additions & 0 deletions store/consul/consul.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ func New(endpoints []string, options *store.Config) (store.Store, error) {
if options.ConnectionTimeout != 0 {
s.setTimeout(options.ConnectionTimeout)
}
if options.Token != nil {
s.config.Token = *options.Token
}
}

// Creates a new client
Expand Down
1 change: 1 addition & 0 deletions store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type Config struct {
PersistConnection bool
Username string
Password string
Token *string
}

// ClientTLSConfig contains data for a Client TLS configuration in the form
Expand Down