From ac135225ca3734783d057afbb89d2b010f1f54c4 Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Thu, 25 Nov 2021 14:55:46 +0900 Subject: [PATCH] Clean up code --- test/e2e/grpc_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e/grpc_test.go b/test/e2e/grpc_test.go index 3aafaa279a6e..7aae7fc90661 100644 --- a/test/e2e/grpc_test.go +++ b/test/e2e/grpc_test.go @@ -73,16 +73,17 @@ func dial(ctx *TestContext, host, domain string) (*grpc.ClientConn, error) { if !hasPort(host) { host = net.JoinHostPort(host, defaultPort) } + var err error + domain, _, err = net.SplitHostPort(domain) + if err != nil { + return nil, err + } secureOpt := grpc.WithInsecure() if test.ServingFlags.HTTPS { tlsConfig := test.TLSClientConfig(context.Background(), ctx.t.Logf, ctx.clients) // Set ServerName for pseudo hostname with TLS. - var err error - tlsConfig.ServerName, _, err = net.SplitHostPort(domain) - if err != nil { - return nil, err - } + tlsConfig.ServerName = domain secureOpt = grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)) }