Updating dependencies

Updated most of the dependencies in vendor.

.travis.yml

@@ -3,8 +3,6 @@ sudo: false
 language: go
 
 go:
-  - 1.13
-  - 1.14
   - 1.15
   - master
 

Makefile

@@ -20,8 +20,8 @@ GOVERSION ?= $(shell go version | awk '{print $$3;}')
 GORELEASER ?= $(shell which goreleaser)
 
 # pin versions for CI builds
-CI_CONSUL_VERSION ?= 1.6.2
-CI_VAULT_VERSION ?= 1.3.2
+CI_CONSUL_VERSION ?= 1.8.4
+CI_VAULT_VERSION ?= 1.5.2
 CI_HUGO_VERSION ?= 0.63.2
 
 # all is the default target

cert/vault_client.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/hashicorp/vault/sdk/helper/consts"
 )
 
 // vaultClient wraps an *api.Client and takes care of token renewal
@@ -89,12 +90,22 @@ func (c *vaultClient) Get() (*api.Client, error) {
 
 	// did we get a wrapped token?
 	resp, err := client.Logical().Unwrap(token)
+	var respErr *api.ResponseError
+	contains := func(haystack []string, needle string) bool {
+		for _, h := range haystack {
+			if h == needle {
+				return true
+			}
+		}
+		return false
+	}
 	switch {
 	case err == nil:
 		log.Printf("[INFO] vault: Unwrapped token %s", token)
 		client.SetToken(resp.Auth.ClientToken)
-	case strings.HasPrefix(err.Error(), "no value found at"):
-		// not a wrapped token
+	case errors.As(err, &respErr) &&
+		contains(respErr.Errors, consts.ErrInvalidWrappingToken.Error()):
+		// not wrapped
 	default:
 		return nil, err
 	}

go.mod

@@ -1,111 +1,61 @@
 module github.com/fabiolb/fabio
 
 require (
-	contrib.go.opencensus.io/exporter/ocagent v0.3.0 // indirect
-	github.com/Azure/azure-sdk-for-go v22.2.2+incompatible // indirect
-	github.com/Azure/go-autorest v11.2.7+incompatible // indirect
-	github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 // indirect
 	github.com/Shopify/sarama v1.19.0 // indirect
-	github.com/Shopify/toxiproxy v2.1.3+incompatible // indirect
-	github.com/apache/thrift v0.0.0-20181028152738-da1169d75b15 // indirect
-	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
+	github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
+	github.com/apache/thrift v0.13.0 // indirect
+	github.com/armon/go-metrics v0.3.4 // indirect
 	github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f
-	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/aws/aws-sdk-go v1.15.76 // indirect
-	github.com/boltdb/bolt v1.3.1 // indirect
-	github.com/circonus-labs/circonus-gometrics v2.2.4+incompatible
-	github.com/circonus-labs/circonusllhist v0.0.0-20160526043813-d724266ae527 // indirect
-	github.com/coreos/bbolt v1.3.0 // indirect
-	github.com/coreos/etcd v3.3.10+incompatible // indirect
-	github.com/coreos/go-semver v0.2.0 // indirect
-	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/cyberdelia/go-metrics-graphite v0.0.0-20150826032200-b8345b7f01d5
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31 // indirect
+	github.com/circonus-labs/circonus-gometrics/v3 v3.2.0
+	github.com/circonus-labs/go-apiclient v0.7.9 // indirect
+	github.com/cyberdelia/go-metrics-graphite v0.0.0-20161219230853-39f87cc3b432
 	github.com/eapache/go-resiliency v1.1.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
-	github.com/fatih/structs v0.0.0-20160601093117-5ada2f449b10 // indirect
-	github.com/go-logfmt/logfmt v0.3.0 // indirect
-	github.com/go-sql-driver/mysql v1.4.1 // indirect
+	github.com/frankban/quicktest v1.11.1 // indirect
+	github.com/go-logfmt/logfmt v0.5.0 // indirect
 	github.com/gobwas/glob v0.0.0-20180208211842-19c076cdf202
 	github.com/gogo/protobuf v1.2.1 // indirect
-	github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
-	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
-	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
-	github.com/gorilla/websocket v1.4.0 // 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.5.1 // indirect
-	github.com/hashicorp/consul v1.4.2
-	github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
-	github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
-	github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c // indirect
-	github.com/hashicorp/go-multierror v0.0.0-20150916205742-d30f09973e19 // indirect
-	github.com/hashicorp/go-retryablehttp v0.5.0 // indirect
-	github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect
-	github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86
-	github.com/hashicorp/hcl v0.0.0-20160607001940-d7400db7143f // indirect
-	github.com/hashicorp/memberlist v0.1.0 // indirect
-	github.com/hashicorp/serf v0.7.0 // indirect
-	github.com/hashicorp/vault v0.6.0
-	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/golang/snappy v0.0.2 // indirect
+	github.com/google/btree v1.0.0 // indirect
+	github.com/hashicorp/consul/api v1.7.0
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-hclog v0.14.1 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.0 // indirect
+	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/hashicorp/go-retryablehttp v0.6.7 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/hashicorp/serf v0.9.5 // indirect
+	github.com/hashicorp/vault/api v1.0.4
+	github.com/hashicorp/vault/sdk v0.1.13
 	github.com/inetaf/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
-	github.com/lib/pq v1.0.0 // indirect
-	github.com/magiconair/properties v0.0.0-20171031211101-49d762b9817b
-	github.com/marstr/guid v1.1.0 // indirect
-	github.com/miekg/dns v1.0.15 // indirect
-	github.com/mitchellh/copystructure v1.0.0 // indirect
-	github.com/mitchellh/go-homedir v0.0.0-20160606030122-1111e456ffea // indirect
-	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v0.0.0-20160212031839-d2dd02622084 // indirect
+	github.com/magiconair/properties v1.8.4
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mitchellh/mapstructure v1.3.3 // indirect
 	github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76
-	github.com/ncw/swift v1.0.42 // indirect
 	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
-	github.com/opentracing/opentracing-go v1.0.2
-	github.com/openzipkin/zipkin-go-opentracing v0.3.4
-	github.com/pascaldekloe/goe v0.0.0-20150719195608-f99183613f48
-	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
-	github.com/pkg/errors v0.8.0 // indirect
-	github.com/pkg/profile v1.2.1
-	github.com/prometheus/client_golang v0.9.1 // indirect
-	github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce // indirect
-	github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect
+	github.com/opentracing/opentracing-go v1.2.0
+	github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5
+	github.com/pascaldekloe/goe v0.1.0
+	github.com/pierrec/lz4 v2.5.2+incompatible // indirect
+	github.com/pkg/profile v1.5.0
 	github.com/pubnub/go-metrics-statsd v0.0.0-20170124014003-7da61f429d6b
-	github.com/rakyll/statik v0.1.6
-	github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165
-	github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af
-	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
-	github.com/satori/go.uuid v1.2.0 // indirect
-	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
-	github.com/sergi/go-diff v0.0.0-20170118131230-24e2351369ec
-	github.com/sirupsen/logrus v1.2.0 // indirect
-	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/tg123/go-htpasswd v0.0.0-20190305225429-d38e564730bf
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 // indirect
-	github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect
-	github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f // indirect
-	github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect
-	go.opencensus.io v0.18.0 // indirect
-	go.uber.org/atomic v1.3.2 // indirect
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.9.1 // indirect
-	golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 // indirect
-	golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
-	golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
-	golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
-	google.golang.org/appengine v1.3.0 // indirect
-	google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect
-	google.golang.org/grpc v1.16.0
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
-	gopkg.in/vmihailenco/msgpack.v2 v2.9.1 // indirect
-	labix.org/v2/mgo v0.0.0-20140701140051-000000000287 // indirect
-	launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect
+	github.com/rakyll/statik v0.1.7
+	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
+	github.com/rogpeppe/fastuuid v1.2.0
+	github.com/sergi/go-diff v1.1.0
+	github.com/tg123/go-htpasswd v1.0.0
+	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
+	golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0
+	golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
+	golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
+	google.golang.org/grpc v1.33.0
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
 )
 
 go 1.13