Merge branch 'master' into kubernetes-auth

.travis.yml

@@ -3,7 +3,7 @@ go:
   - 1.x
   - tip
 env:
-  - VAULT_ADDR='http://127.0.0.1:8200' CONSUL_VERSION=0.9.3 ETCD_VERSION=3.2.8 DYNAMODB_VERSION=2017-02-16 VAULT_VERSION=0.8.1 ZOOKEEPER_VERSION=3.4.10 RANCHER_VERSION=0.6.0
+  - VAULT_ADDR='http://127.0.0.1:8200' CONSUL_VERSION=0.9.3 ETCD_VERSION=3.3.1 DYNAMODB_VERSION=2017-02-16 VAULT_VERSION=0.8.1 ZOOKEEPER_VERSION=3.4.10 RANCHER_VERSION=0.6.0
 services:
   - redis
 before_install:
@@ -17,8 +17,10 @@ before_install:
   - tar xzf etcd-v${ETCD_VERSION}-linux-amd64.tar.gz
   - sudo mv etcd-v${ETCD_VERSION}-linux-amd64/etcd /bin/
   - sudo mv etcd-v${ETCD_VERSION}-linux-amd64/etcdctl /bin/
+  - unset ETCD_VERSION
   - etcd &
   # install DynamoDB
+  - sudo pip install awscli
   - mkdir /tmp/dynamodb
   - wget -O - https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_${DYNAMODB_VERSION}.tar.gz | tar xz --directory /tmp/dynamodb
   - java -Djava.library.path=/tmp/dynamodb/DynamoDBLocal_lib -jar /tmp/dynamodb/DynamoDBLocal.jar -inMemory &

CHANGELOG

@@ -1,3 +1,17 @@
+### v0.15.0
+
+0c4cb29e Don't pass empty prefix to zookeeper nodeWalk
+5d6e2790 Update template.md - added forgotten verb
+19d6514d remove fmt.Println
+802e6a11 Added windows cmd support
+59001ca3 Fix handling of absent parameters for ssm backend
+8419c708 AWS SSM - don't treat "ParameterNotFound" as a fatal error
+0a09632a Add support for consul BasicAuth
+adf8d486 Fix panic during Consul client creation
+027be91f Update docker Multi-Stage build
+376d3f99 fix etcdv3 client watch: reuse previous watch to avoid memory leak
+f711530d fix(confd): etcd curl err when make integration
+
 ### v0.14.0
 
 95ba861f Replace godep with dep

Gopkg.toml

@@ -1,3 +1,7 @@
+[prune]
+  unused-packages = true
+  go-tests = true
+
 [[constraint]]
   name = "github.com/BurntSushi/toml"
   version = "0.3.0"
@@ -12,7 +16,7 @@
 
 [[constraint]]
   name = "github.com/coreos/etcd"
-  version = "=3.2.8"
+  version = "=3.3.1"
 
 [[constraint]]
   name = "github.com/fsnotify/fsnotify"
@@ -36,33 +40,32 @@
 
 [[constraint]]
   name = "github.com/samuel/go-zookeeper"
+  revision = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"
 
 [[constraint]]
   name = "golang.org/x/net"
+  revision = "66aacef3dd8a676686c7ae3716979581e8b03c47"
 
 [[constraint]]
   name = "gopkg.in/yaml.v2"
+  branch = "v2"
 
 [[override]]
   name = "github.com/ugorji/go"
-  revision = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+  revision = "bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57"
 
 [[override]]
   name = "google.golang.org/grpc"
-  version = "=1.2.1"
+  version = "=1.7.5"
 
 [[override]]
   name = "golang.org/x/crypto"
-  revision = "1351f936d976c60a0a48d728281922cf63eafb8d"
-
-[[override]]
-  name = "golang.org/x/net"
-  revision = "c8c74377599bd978aee1cf3b9b63a8634051cec2"
+  revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3"
 
 [[override]]
   name = "golang.org/x/sys"
-  revision = "e48874b42435b4347fc52bdee0424a52abc974d7"
+  revision = "ebfc5b4631820b793c9010c87fd8fef0f39eb082"
 
 [[override]]
   name = "github.com/golang/protobuf"
-  revision = "4bd1920723d7b7c925de087aa32e2187708897f7"
+  revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build install clean test integration dep release
 VERSION=`egrep -o '[0-9]+\.[0-9a-z.\-]+' version.go`
-GIT_SHA=`git rev-parse --short HEAD`
+GIT_SHA=`git rev-parse --short HEAD || echo`
 
 build:
 	@echo "Building confd..."
@@ -20,11 +20,15 @@ test:
 
 integration:
 	@echo "Running integration tests..."
-	@find ./integration -name test.sh -exec bash {} \;
+	@for i in `find ./integration -name test.sh`; do \
+		echo "Running $$i"; \
+		bash $$i || exit 1; \
+		bash integration/expect/check.sh || exit 1; \
+		rm /tmp/confd-*; \
+	done
 
 dep:
 	@dep ensure
-	@dep prune
 
 release:
 	@docker build -q -t confd_builder -f Dockerfile.build.alpine .