fix: default defaultEndpointTemplate (#2535)

codyoss · web-flow · commit 5a78abe30a64 · 2024-04-19T17:11:46.000-05:00
diff --git a/transport/grpc/dial.go b/transport/grpc/dial.go
@@ -213,8 +213,8 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna
 	}
 
 	// Defaults for older clients that don't set this value yet
-	var defaultEndpointTemplate string
-	if ds.DefaultEndpointTemplate == "" {
+	defaultEndpointTemplate := ds.DefaultEndpointTemplate
+	if defaultEndpointTemplate == "" {
 		defaultEndpointTemplate = ds.DefaultEndpoint
 	}
 
diff --git a/transport/http/dial.go b/transport/http/dial.go
@@ -91,8 +91,8 @@ func newClientNewAuth(ctx context.Context, ds *internal.DialSettings) (*http.Cli
 	}
 
 	// Defaults for older clients that don't set this value yet
-	var defaultEndpointTemplate string
-	if ds.DefaultEndpointTemplate == "" {
+	defaultEndpointTemplate := ds.DefaultEndpointTemplate
+	if defaultEndpointTemplate == "" {
 		defaultEndpointTemplate = ds.DefaultEndpoint
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,8 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`// Defaults for older clients that don't set this value yet`
`216`		`- var defaultEndpointTemplate string`
`217`		`- if ds.DefaultEndpointTemplate == "" {`
	`216`	`+ defaultEndpointTemplate := ds.DefaultEndpointTemplate`
	`217`	`+ if defaultEndpointTemplate == "" {`
`218`	`218`	`defaultEndpointTemplate = ds.DefaultEndpoint`
`219`	`219`	`}`
`220`	`220`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ func newClientNewAuth(ctx context.Context, ds internal.DialSettings) (http.Cli`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`// Defaults for older clients that don't set this value yet`
`94`		`- var defaultEndpointTemplate string`
`95`		`- if ds.DefaultEndpointTemplate == "" {`
	`94`	`+ defaultEndpointTemplate := ds.DefaultEndpointTemplate`
	`95`	`+ if defaultEndpointTemplate == "" {`
`96`	`96`	`defaultEndpointTemplate = ds.DefaultEndpoint`
`97`	`97`	`}`
`98`	`98`