Skip to content

Commit 07bae3f

Browse files
committed
jmroh: chore(build): upgrade etcd to fix tests with golang 1.15
1 parent 23e4a04 commit 07bae3f

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

LICENSE_OF_DEPENDENCIES.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
- github.com/NYTimes/gziphandler [APACHE-2.0](https://github.com/NYTimes/gziphandler/blob/master/LICENSE.md)
44
- github.com/sirupsen/logrus [MIT](https://github.com/Sirupsen/logrus/blob/master/LICENSE)
55
- github.com/etcd-io/bbolt [MIT](https://github.com/etcd-io/bbolt/blob/master/LICENSE)
6+
- github.com/etcd-io/etcd [MIT](https://github.com/etcd-io/etcd/blob/master/LICENSE)
67
- github.com/bouk/httprouter [BSD](https://github.com/bouk/httprouter/blob/master/LICENSE)
78
- github.com/dgrijalva/jwt-go [MIT](https://github.com/dgrijalva/jwt-go/blob/master/LICENSE)
89
- github.com/elazarl/go-bindata-assetfs [BSD](https://github.com/elazarl/go-bindata-assetfs/blob/master/LICENSE)

backend/go.mod

+1-12
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ require (
66
github.com/ajg/form v1.5.1 // indirect
77
github.com/beorn7/perks v1.0.1 // indirect
88
github.com/bouk/httprouter v0.0.0-20160817010721-ee8b3818a7f5
9-
github.com/coreos/bbolt v1.3.3 // indirect
10-
github.com/coreos/etcd v3.3.22+incompatible
11-
github.com/coreos/go-semver v0.3.0 // indirect
12-
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
13-
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
149
github.com/dgrijalva/jwt-go v3.2.0+incompatible
15-
github.com/dustin/go-humanize v1.0.0 // indirect
1610
github.com/elazarl/go-bindata-assetfs v1.0.0
1711
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
1812
github.com/fatih/structs v1.1.0 // indirect
@@ -26,16 +20,13 @@ require (
2620
github.com/google/uuid v1.1.1
2721
github.com/gorilla/websocket v1.4.2
2822
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect
29-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
3023
github.com/grpc-ecosystem/grpc-gateway v1.14.6 // indirect
3124
github.com/imkira/go-interpol v1.1.0 // indirect
3225
github.com/influxdata/flux v0.65.0
3326
github.com/influxdata/influxdb v1.1.5
3427
github.com/influxdata/kapacitor v1.5.3
3528
github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368
3629
github.com/jessevdk/go-flags v1.4.0
37-
github.com/jonboulle/clockwork v0.1.0 // indirect
38-
github.com/json-iterator/go v1.1.7 // indirect
3930
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
4031
github.com/lestrrat-go/jwx v0.9.0
4132
github.com/mattn/go-colorable v0.1.6 // indirect
@@ -46,23 +37,21 @@ require (
4637
github.com/sergi/go-diff v1.1.0
4738
github.com/sirupsen/logrus v1.6.0
4839
github.com/smartystreets/goconvey v1.6.4 // indirect
49-
github.com/soheilhy/cmux v0.1.4 // indirect
5040
github.com/stretchr/testify v1.4.0
5141
github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966 // indirect
5242
github.com/valyala/fasthttp v1.15.1 // indirect
5343
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
54-
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
5544
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
5645
github.com/yudai/gojsondiff v1.0.0 // indirect
5746
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
5847
github.com/yudai/pp v2.0.1+incompatible // indirect
5948
go.etcd.io/bbolt v1.3.5
49+
go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b
6050
go.uber.org/multierr v1.5.0 // indirect
6151
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5
6252
golang.org/x/net v0.0.0-20200602114024-627f9648deb9
6353
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
6454
google.golang.org/api v0.15.0
65-
sigs.k8s.io/yaml v1.1.0 // indirect
6655
)
6756

6857
replace github.com/coreos/go-systemd => github.com/coreos/go-systemd/v22 v22.0.0

backend/kv/etcd/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"math/rand"
99
"time"
1010

11-
"github.com/coreos/etcd/clientv3"
12-
"github.com/coreos/etcd/clientv3/concurrency"
1311
cloudhub "github.com/snetsystems/cloudhub/backend"
1412
"github.com/snetsystems/cloudhub/backend/kv"
1513
"github.com/snetsystems/cloudhub/backend/mocks"
1614
"github.com/snetsystems/cloudhub/backend/snowflake"
15+
"go.etcd.io/etcd/clientv3"
16+
"go.etcd.io/etcd/clientv3/concurrency"
1717
)
1818

1919
const (

backend/kv/etcd/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/coreos/etcd/embed"
1110
cloudhub "github.com/snetsystems/cloudhub/backend"
1211
"github.com/snetsystems/cloudhub/backend/kv"
1312
"github.com/snetsystems/cloudhub/backend/mocks"
1413
"github.com/stretchr/testify/require"
14+
"go.etcd.io/etcd/embed"
1515
)
1616

1717
func TestNewClient(t *testing.T) {

0 commit comments

Comments
 (0)