transport/grpc: don't reassign ClientSettings.Endpoint (#557)
dial is called multiple times when connection pooling is used,
and reassigning o.Endpoint multiple times generated endpoints like:
pubsub.mtls.mtls.googleapis.com
diff --git a/transport/grpc/dial.go b/transport/grpc/dial.go
index cb73d7e..77ee798 100644
--- a/transport/grpc/dial.go
+++ b/transport/grpc/dial.go
@@ -184,12 +184,6 @@
grpcOpts = append(grpcOpts, timeoutDialerOption)
}
- // NOTE(cbro): this is used only by the nightly mtls_smoketest and should
- // not otherwise be used. It will be removed or renamed at some point.
- if os.Getenv("GOOGLE_API_USE_MTLS") == "always" {
- o.Endpoint = generateDefaultMtlsEndpoint(o.Endpoint)
- }
-
return grpc.DialContext(ctx, o.Endpoint, grpcOpts...)
}
@@ -300,6 +294,13 @@
if err := o.Validate(); err != nil {
return nil, err
}
+
+ // NOTE(cbro): this is used only by the nightly mtls_smoketest and should
+ // not otherwise be used. It will be removed or renamed at some point.
+ if os.Getenv("GOOGLE_API_USE_MTLS") == "always" {
+ o.Endpoint = generateDefaultMtlsEndpoint(o.Endpoint)
+ }
+
return &o, nil
}
