rework

slackhq · Jan 22, 2024 · 5acdcc3 · 5acdcc3
1 parent 95c480c
commit 5acdcc3
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/go/vt/grpcclient/client_auth_static.go b/go/vt/grpcclient/client_auth_static.go
@@ -65,25 +65,23 @@ func AppendStaticAuth(opts []grpc.DialOption) ([]grpc.DialOption, error) {
 		return opts, nil
 	}
 
-	if clientCreds == nil {
-		var err error
-		once.Do(func() {
-			var credsData []byte
-			credsData, err = os.ReadFile(*credsFile)
-			if err != nil {
-				return
-			}
-
-			clientCreds = &StaticAuthClientCreds{}
-			err = json.Unmarshal(credsData, clientCreds)
-			if err != nil {
-				return
-			}
-		})
+	var err error
+	once.Do(func() {
+		var credsData []byte
+		credsData, err = os.ReadFile(*credsFile)
+		if err != nil {
+			return
+		}
 
+		clientCreds = &StaticAuthClientCreds{}
+		err = json.Unmarshal(credsData, clientCreds)
 		if err != nil {
-			return nil, err
+			return
 		}
+	})
+
+	if clientCreds == nil || err != nil {
+		return nil, err
 	}
 
 	creds := grpc.WithPerRPCCredentials(clientCreds)