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

passthrough: return error if endpoint is empty and opt.Dialer is nil when building resolver #5732

Merged
merged 3 commits into from Nov 16, 2022
Merged

passthrough: return error if endpoint is empty and opt.Dialer is nil when building resolver #5732

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d01bd83
passthrough: return error if endpoint is empty and opt.Dialer is nil …
huangchong94 Oct 19, 2022
3260f78
passthrough: fix non ASCII error string
huangchong94 Oct 20, 2022
73b40cf
passthrough: update error message in build
huangchong94 Nov 16, 2022
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
8 changes: 7 additions & 1 deletion clientconn_parsed_target_test.go
View file
Open in desktop
Expand Up @@ -40,7 +40,6 @@ func (s) TestParsedTarget_Success_WithoutCustomDialer(t *testing.T) {
wantParsed resolver.Target
}{
// No scheme is specified.
{target: "", badScheme: true, wantParsed: resolver.Target{Scheme: defScheme, Authority: "", Endpoint: ""}},
{target: "://", badScheme: true, wantParsed: resolver.Target{Scheme: defScheme, Authority: "", Endpoint: "://"}},
{target: ":///", badScheme: true, wantParsed: resolver.Target{Scheme: defScheme, Authority: "", Endpoint: ":///"}},
{target: "://a/", badScheme: true, wantParsed: resolver.Target{Scheme: defScheme, Authority: "", Endpoint: "://a/"}},
Expand Down Expand Up @@ -110,6 +109,7 @@ func (s) TestParsedTarget_Success_WithoutCustomDialer(t *testing.T) {

func (s) TestParsedTarget_Failure_WithoutCustomDialer(t *testing.T) {
targets := []string{
"",
"unix://a/b/c",
"unix://authority",
"unix-abstract://authority/a/b/c",
Expand Down Expand Up @@ -179,6 +179,12 @@ func (s) TestParsedTarget_WithCustomDialer(t *testing.T) {
wantParsed: resolver.Target{Scheme: defScheme, Authority: "", Endpoint: "/unix/socket/address"},
wantDialerAddress: "/unix/socket/address",
},
{
target: "",
badScheme: true,
wantParsed: resolver.Target{Scheme: defScheme, Authority: "", Endpoint: ""},
wantDialerAddress: "",
},
{
target: "passthrough://a.server.com/google.com",
wantParsed: resolver.Target{Scheme: "passthrough", Authority: "a.server.com", Endpoint: "google.com"},
Expand Down
9 changes: 8 additions & 1 deletion internal/resolver/passthrough/passthrough.go
View file
Open in desktop
Expand Up @@ -20,13 +20,20 @@
// name without scheme back to gRPC as resolved address.
package passthrough

import "google.golang.org/grpc/resolver"
import (
"errors"

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

const scheme = "passthrough"

type passthroughBuilder struct{}

func (*passthroughBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
if target.Endpoint == "" && opts.Dialer == nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like we could do even stronger validation here (verify it could work when sent to net.Dial, e.g. split host/port & parse IP), but this is an improvement anyway.

return nil, errors.New("passthrough resolver: missing address")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address here can lead to confusion because an address in this context usually refers to addresses returned by the resolver. Could you please change the error message to be passthrough: received empty target in Build().

}
r := &passthroughResolver{
target: target,
cc: cc,
Expand Down