Skip to content

Commit 370ab4e

Browse files
authored
Upgrade to grpc v1.27.1 (#19)
1 parent 6f34c3d commit 370ab4e

File tree

4 files changed

+107
-15
lines changed

4 files changed

+107
-15
lines changed

builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const schemeName = "consul"
1616
// builder implements resolver.Builder and use for constructing all consul resolvers
1717
type builder struct{}
1818

19-
func (b *builder) Build(url resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
19+
func (b *builder) Build(url resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
2020
dsn := strings.Join([]string{schemeName + ":/", url.Authority, url.Endpoint}, "/")
2121
tgt, err := parseURL(dsn)
2222
if err != nil {

consul.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type resolvr struct {
2424
}
2525

2626
// ResolveNow will be skipped due unnecessary in this case
27-
func (r *resolvr) ResolveNow(resolver.ResolveNowOption) {}
27+
func (r *resolvr) ResolveNow(resolver.ResolveNowOptions) {}
2828

2929
// Close closes the resolver.
3030
func (r *resolvr) Close() {

go.mod

+11-7
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@ module github.com/mbobakov/grpc-consul-resolver
33
go 1.13
44

55
require (
6+
github.com/armon/go-metrics v0.3.2 // indirect
67
github.com/go-playground/form v3.1.4+incompatible
78
github.com/golang/mock v1.1.1
89
github.com/google/btree v1.0.0 // indirect
910
github.com/hashicorp/consul/api v1.3.0
11+
github.com/hashicorp/go-immutable-radix v1.1.0 // indirect
12+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
13+
github.com/hashicorp/golang-lru v0.5.4 // indirect
14+
github.com/hashicorp/serf v0.8.5 // indirect
1015
github.com/jpillora/backoff v1.0.0
11-
github.com/kr/pretty v0.1.0 // indirect
12-
github.com/mitchellh/go-homedir v1.1.0 // indirect
13-
github.com/pkg/errors v0.8.1
16+
github.com/pkg/errors v0.9.1
1417
github.com/sirupsen/logrus v1.4.2
1518
github.com/stretchr/testify v1.4.0
16-
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
17-
google.golang.org/grpc v1.26.0
18-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
19+
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
20+
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect
21+
golang.org/x/text v0.3.2 // indirect
22+
google.golang.org/genproto v0.0.0-20200210034751-acff78025515 // indirect
23+
google.golang.org/grpc v1.27.1
1924
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
20-
gopkg.in/yaml.v2 v2.2.4 // indirect
2125
)

0 commit comments

Comments
 (0)