Merge 48b4aa7 into 4589771

.travis.yml

@@ -1,31 +1,38 @@
 language: go
 
 go:
-  - 1.8.7
+  - 1.12.x
+env:
+  global:
+    - GO111MODULE=on # Needed until Go 1.14
 
 # let us have speedy Docker-based Travis workers
 sudo: false
 
 before_install:
   # Symlink below is needed for Travis CI to work correctly on personal forks of libkv
   - ln -s $HOME/gopath/src/github.com/${TRAVIS_REPO_SLUG///libkv/} $HOME/gopath/src/github.com/docker
+  - pushd / # Fetch tools outside the source tree so they don't modify go.mod.
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
-  - go get github.com/golang/lint/golint
-  - go get github.com/GeertJohan/fgt
+  - go get golang.org/x/lint/golint
+  - popd
 
 before_script:
   - script/travis_consul.sh 0.6.3
   - script/travis_etcd.sh 3.0.0
-  - script/travis_zk.sh 3.5.4-beta
+  - script/travis_zk.sh 3.5.5
 
 script:
   - ./consul agent -server -bootstrap -advertise=127.0.0.1 -data-dir /tmp/consul -config-file=./config.json 1>/dev/null &
   - ./etcd/etcd --listen-client-urls 'http://0.0.0.0:4001' --advertise-client-urls 'http://127.0.0.1:4001' >/dev/null 2>&1 &
-  - ./zk/bin/zkServer.sh start ./zk/conf/zoo.cfg 1> /dev/null
+  - ./zk/bin/zkServer.sh start ./zk/conf/zoo.cfg
+  - ls ./zk
+  - ls ./zk/conf
+  - cat ./zk/zookeeper.log || cat ./zk/conf/zookeeper.log || cat ./zookeeper.log
   - script/validate-gofmt
   - go vet ./...
-  - fgt golint ./...
+  - golint -set_exit_status ./...
   - go test -v -race ./...
   - script/coverage
   - goveralls -service=travis-ci -coverprofile=goverage.report

go.mod

@@ -0,0 +1,36 @@
+module github.com/docker/libkv
+
+go 1.11
+
+require (
+	github.com/coreos/bbolt v1.3.3 // indirect
+	github.com/coreos/etcd v3.3.15+incompatible
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
+	github.com/gogo/protobuf v1.2.1 // indirect
+	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
+	github.com/google/uuid v1.1.1 // indirect
+	github.com/gorilla/websocket v1.4.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.10.0 // indirect
+	github.com/hashicorp/consul/api v1.2.0
+	github.com/jonboulle/clockwork v0.1.0 // indirect
+	github.com/prometheus/client_golang v1.1.0 // indirect
+	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
+	github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75
+	github.com/soheilhy/cmux v0.1.4 // indirect
+	github.com/stretchr/testify v1.4.0
+	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
+	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+	go.etcd.io/bbolt v1.3.3
+	go.uber.org/atomic v1.4.0 // indirect
+	go.uber.org/multierr v1.1.0 // indirect
+	go.uber.org/zap v1.10.0 // indirect
+	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
+	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
+	google.golang.org/grpc v1.23.0 // indirect
+	sigs.k8s.io/yaml v1.1.0 // indirect
+)