Skip to content

Commit

Permalink
Upgrade to grpc v1.27.1 (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
andybar2 authored Feb 14, 2020
1 parent 6f34c3d commit 370ab4e
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 15 deletions.
2 changes: 1 addition & 1 deletion builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const schemeName = "consul"
// builder implements resolver.Builder and use for constructing all consul resolvers
type builder struct{}

func (b *builder) Build(url resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
func (b *builder) Build(url resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
dsn := strings.Join([]string{schemeName + ":/", url.Authority, url.Endpoint}, "/")
tgt, err := parseURL(dsn)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion consul.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type resolvr struct {
}

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

// Close closes the resolver.
func (r *resolvr) Close() {
Expand Down
18 changes: 11 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,23 @@ module github.com/mbobakov/grpc-consul-resolver
go 1.13

require (
github.com/armon/go-metrics v0.3.2 // indirect
github.com/go-playground/form v3.1.4+incompatible
github.com/golang/mock v1.1.1
github.com/google/btree v1.0.0 // indirect
github.com/hashicorp/consul/api v1.3.0
github.com/hashicorp/go-immutable-radix v1.1.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/serf v0.8.5 // indirect
github.com/jpillora/backoff v1.0.0
github.com/kr/pretty v0.1.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/pkg/errors v0.8.1
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.4.0
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
google.golang.org/grpc v1.26.0
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect
golang.org/x/text v0.3.2 // indirect
google.golang.org/genproto v0.0.0-20200210034751-acff78025515 // indirect
google.golang.org/grpc v1.27.1
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/yaml.v2 v2.2.4 // indirect
)
Loading

0 comments on commit 370ab4e

Please sign in to comment.