Skip to content

Commit

Permalink
Upgrade etcd to 3.3.17 (#3343)
Browse files Browse the repository at this point in the history
I originally intended to upgrade etcd to 3.4.2, but at this time,
the module is broken, and cannot be included, under the original
import path, or the new go.etcd.io import path.

See etcd-io/etcd#11154 for more info.

Closes #3278

Signed-off-by: Eric Chlebek <eric@sensu.io>

* Re-write tracing middleware tests to use prometheus_client/testutil (#3342)

The testutil package was introduced in v0.9 and exposes some helpers for
for writing simple unit tests.

Signed-off-by: James Phillips <jamesdphillips@gmail.com>
  • Loading branch information
echlebek committed Oct 21, 2019
1 parent 555e94e commit f62e680
Show file tree
Hide file tree
Showing 4 changed files with 455 additions and 299 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ Versioning](http://semver.org/spec/v2.0.0.html).
- Added support for api keys to be used in api authentication.
- Added support for sensu-backend service environment variables

### Changed
- Upgraded etcd to 3.3.17

### Fixed
- As a result of upgrading etcd, TLS etcd clients that lose their connection will
successfully reconnect when using --no-embed-etcd.

## [5.14.1] - 2019-10-16

### Added
Expand Down
86 changes: 35 additions & 51 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ go 1.12
require (
github.com/AlecAivazis/survey v1.4.1
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/NYTimes/gziphandler v0.0.0-20180227021810-5032c8878b9d
github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
github.com/ash2k/stager v0.0.0-20170622123058-6e9c7b0eacd4 // indirect
github.com/atlassian/gostatsd v0.0.0-20180514010436-af796620006e
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect
github.com/coreos/bbolt v1.3.1-coreos.6 // indirect
github.com/coreos/etcd v3.3.13+incompatible
github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418 // indirect
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf
github.com/coreos/bbolt v1.3.3 // indirect
github.com/coreos/etcd v3.3.17+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
github.com/dave/jennifer v0.0.0-20171207062344-d8bdbdbee4e1
github.com/dgrijalva/jwt-go v3.0.0+incompatible
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/docker/docker v0.0.0-20180409082103-cbde00b44273
github.com/dsnet/compress v0.0.0-20170928175515-f41072d47fff // indirect
github.com/echlebek/crock v1.0.1
Expand All @@ -25,85 +24,70 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-ole/go-ole v0.0.0-20170209151332-de8695c8edbf // indirect
github.com/go-resty/resty v0.0.0-20170925192930-9ac9c42358f7
github.com/gogo/protobuf v1.2.1
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/protobuf v1.1.0
github.com/gogo/protobuf v1.3.1
github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
github.com/golang/protobuf v1.3.2
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
github.com/google/btree v0.0.0-20161217183710-316fb6d3f031 // indirect
github.com/google/go-cmp v0.3.0 // indirect
github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c
github.com/google/uuid v1.1.1
github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect
github.com/gorilla/mux v1.6.2
github.com/gorilla/websocket v1.2.0
github.com/gorilla/websocket v1.4.1
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
github.com/graph-gophers/dataloader v0.0.0-20180104184831-78139374585c
github.com/graphql-go/graphql v0.7.9-0.20190403165646-199d20bbfed7
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
github.com/gxed/GoEndian v0.0.0-20160916112711-0f5c6873267e // indirect
github.com/gxed/eventfd v0.0.0-20160916113412-80a92cca79a8 // indirect
github.com/hashicorp/go-version v1.2.0
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/ipfs/go-log v0.0.0-20180416040000-7ecd3df29a4a // indirect
github.com/jbenet/go-reuseport v0.0.0-20180416043609-15a1cd37f050 // indirect
github.com/jonboulle/clockwork v0.1.0 // indirect
github.com/json-iterator/go v1.1.6
github.com/json-iterator/go v1.1.7
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/libp2p/go-reuseport v0.0.0-20180416043609-15a1cd37f050 // indirect
github.com/libp2p/go-sockaddr v0.0.0-20180329070516-f3e9f73a53d1 // indirect
github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.2 // indirect
github.com/mattn/go-runewidth v0.0.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.0 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
github.com/mholt/archiver v0.0.0-20180816053333-85d3d0b511ea
github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.1.2
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/nwaples/rardecode v0.0.0-20170112110516-f22b7ef81a0a // indirect
github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84
github.com/opentracing/opentracing-go v1.0.2 // indirect
github.com/pierrec/lz4 v0.0.0-20171218195038-2fcda4cb7018 // indirect
github.com/pierrec/xxHash v0.1.1 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/prometheus/client_golang v0.8.0
github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612
github.com/prometheus/common v0.0.0-20170908161822-2f17f4a9d485 // indirect
github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8 // indirect
github.com/prometheus/client_golang v1.2.0
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d
github.com/robfig/cron v0.0.0-20171101201047-2315d5715e36
github.com/sensu/lasr v1.2.1
github.com/shirou/gopsutil v0.0.0-20180801053943-8048a2e9c577
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd // indirect
github.com/sirupsen/logrus v1.2.0
github.com/soheilhy/cmux v0.1.3 // indirect
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v0.0.0-20190408140645-7a605a50e69c
github.com/stretchr/testify v1.2.2
github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 // indirect
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.4.0
github.com/stretchr/testify v1.4.0
github.com/ulikunitz/xz v0.5.4 // indirect
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc // indirect
github.com/willf/pad v0.0.0-20160331131008-b3d780601022
github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect
go.etcd.io/bbolt v1.3.2
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/crypto v0.0.0-20190308221718-c2843e01d9a2
golang.org/x/net v0.0.0-20190620200207-3b0461eec859
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
golang.org/x/time v0.0.0-20170927054726-6dc17368e09b
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee // indirect
google.golang.org/grpc v1.13.0
go.uber.org/multierr v1.2.0 // indirect
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582
golang.org/x/sys v0.0.0-20191010194322-b09406accb47
golang.org/x/text v0.3.2 // indirect
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
google.golang.org/appengine v1.4.0 // indirect
google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 // indirect
google.golang.org/grpc v1.24.0
gopkg.in/AlecAivazis/survey.v1 v1.4.0 // indirect
gopkg.in/h2non/filetype.v1 v1.0.3
gopkg.in/sourcemap.v1 v1.0.5 // indirect
gopkg.in/yaml.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)
Loading

0 comments on commit f62e680

Please sign in to comment.