Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resolver: move dns and passthrough to internal #3116

Merged
merged 2 commits into from Oct 22, 2019
Merged

resolver: move dns and passthrough to internal #3116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
870e7c9
resolver: move dns and passthrough to internal; nobody should directl…
dfawley Oct 21, 2019
be69981
move to internal/resolver
dfawley Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions balancer_test.go
View file
Open in desktop
Expand Up @@ -31,11 +31,6 @@ import (
_ "google.golang.org/grpc/grpclog/glogger"
"google.golang.org/grpc/naming"
"google.golang.org/grpc/status"

// V1 balancer tests use passthrough resolver instead of dns.
// TODO(bar) remove this when removing v1 balaner entirely.

_ "google.golang.org/grpc/resolver/passthrough"
)

func pickFirstBalancerV1(r naming.Resolver) Balancer {
Expand Down
7 changes: 4 additions & 3 deletions clientconn.go
View file
Open in desktop
Expand Up @@ -32,7 +32,6 @@ import (

"google.golang.org/grpc/balancer"
"google.golang.org/grpc/balancer/base"
_ "google.golang.org/grpc/balancer/roundrobin" // To register roundrobin.
"google.golang.org/grpc/codes"
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials"
Expand All @@ -43,10 +42,12 @@ import (
"google.golang.org/grpc/internal/transport"
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/resolver"
_ "google.golang.org/grpc/resolver/dns" // To register dns resolver.
_ "google.golang.org/grpc/resolver/passthrough" // To register passthrough resolver.
"google.golang.org/grpc/serviceconfig"
"google.golang.org/grpc/status"

_ "google.golang.org/grpc/balancer/roundrobin" // To register roundrobin.
_ "google.golang.org/grpc/internal/resolver/dns" // To register dns resolver.
_ "google.golang.org/grpc/internal/resolver/passthrough" // To register passthrough resolver.
)

const (
Expand Down
1 change: 0 additions & 1 deletion clientconn_test.go
View file
Open in desktop
Expand Up @@ -39,7 +39,6 @@ import (
"google.golang.org/grpc/naming"
"google.golang.org/grpc/resolver"
"google.golang.org/grpc/resolver/manual"
_ "google.golang.org/grpc/resolver/passthrough"
"google.golang.org/grpc/testdata"
)

Expand Down
0 resolver/dns/dns_resolver.go → internal/resolver/dns/dns_resolver.go
View file
Open in desktop
File renamed without changes.
0 resolver/dns/dns_resolver_test.go → internal/resolver/dns/dns_resolver_test.go
View file
Open in desktop
File renamed without changes.
0 resolver/passthrough/passthrough.go → internal/resolver/passthrough/passthrough.go
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion test/end2end_test.go
View file
Open in desktop
Expand Up @@ -69,7 +69,6 @@ import (
"google.golang.org/grpc/peer"
"google.golang.org/grpc/resolver"
"google.golang.org/grpc/resolver/manual"
_ "google.golang.org/grpc/resolver/passthrough"
"google.golang.org/grpc/serviceconfig"
"google.golang.org/grpc/stats"
"google.golang.org/grpc/status"
Expand Down
2 changes: 1 addition & 1 deletion vet.sh
View file
Open in desktop
Expand Up @@ -128,7 +128,7 @@ google.golang.org/grpc/examples/features/debugging/client/main.go:SA1019
google.golang.org/grpc/examples/features/load_balancing/client/main.go:SA1019
google.golang.org/grpc/internal/transport/handler_server.go:SA1019
google.golang.org/grpc/internal/transport/handler_server_test.go:SA1019
google.golang.org/grpc/resolver/dns/dns_resolver.go:SA1019
google.golang.org/grpc/internal/resolver/dns/dns_resolver.go:SA1019
google.golang.org/grpc/stats/stats_test.go:SA1019
google.golang.org/grpc/test/balancer_test.go:SA1019
google.golang.org/grpc/test/channelz_test.go:SA1019
Expand Down