WIP: need to fix error handling for goroutine

Author: Craig Goldstein

yb-support-tool/cmd/exec.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -19,8 +20,6 @@ var (
 	isVerbose  bool
 )
 
-var inventories []exec.Inventory
-
 var execCmd = &cobra.Command{
 	Use:   "exec",
 	Short: "Run commands across all nodes in a universe",
@@ -38,8 +37,17 @@ var ybaCmd = &cobra.Command{
 	Short: "Lookup inventory using YBA API",
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
-		inventories = exec.YbaLookup(hostname, apiToken, isInsecure, isVerbose)
-		exec.SshCmd(inventories, universe, user, command, isParallel, isVerbose)
+		inventories, err := exec.YbaLookup(hostname, apiToken, isInsecure, isVerbose)
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(2)
+		}
+
+		err = exec.SshCmd(inventories, universe, user, command, isParallel, isVerbose)
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(2)
+		}
 	},
 }
 
@@ -48,8 +56,17 @@ var fileCmd = &cobra.Command{
 	Short: "Lookup inventory using inventory file",
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
-		inventories = exec.FileLookup(iFileName, isVerbose)
-		exec.SshCmd(inventories, universe, user, command, isParallel, isVerbose)
+		inventories, err := exec.FileLookup(iFileName, isVerbose)
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(2)
+		}
+
+		err = exec.SshCmd(inventories, universe, user, command, isParallel, isVerbose)
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(2)
+		}
 	},
 }
 

yb-support-tool/exec/inventory.go

@@ -35,7 +35,7 @@ type Inventory struct {
 	} `json:"universeDetails" yaml:"universeDetails"`
 }
 
-func YbaLookup(hostname, apiToken string, isInsecure, isVerbose bool) []Inventory {
+func YbaLookup(hostname, apiToken string, isInsecure, isVerbose bool) ([]Inventory, error) {
 
 	// yugaware-client returns the API response wrapped in "content: "
 	type apiResp struct {
@@ -72,28 +72,25 @@ func YbaLookup(hostname, apiToken string, isInsecure, isVerbose bool) []Inventor
 	// run yugaware-client command using cobra
 	err := ywCommand.Execute()
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return nil, err
 	}
 
 	buffer, err := buf.Bytes(), err
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return nil, err
 	}
 
 	err = json.Unmarshal(buffer, &content)
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return nil, err
 	}
 
 	// content.Content is the raw api response, which is "[]inventory"
-	return content.Content
+	return content.Content, nil
 }
 
-func FileLookup(iFileName string, isVerbose bool) []Inventory {
+func FileLookup(iFileName string, isVerbose bool) ([]Inventory, error) {
 
 	var inventories []Inventory
 
@@ -105,26 +102,24 @@ func FileLookup(iFileName string, isVerbose bool) []Inventory {
 	inventoryFile, err := os.Open(f)
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return nil, err
 	}
 
 	defer inventoryFile.Close()
 
 	inventoryBytes, err := io.ReadAll(inventoryFile)
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return nil, err
 	}
 
 	// this will unmarshal both json and yaml properly
 	err = yaml.Unmarshal(inventoryBytes, &inventories)
 
 	if err != nil {
-		fmt.Printf("Unable to parse inventory file \"%s\": %s", iFileName, err)
-		os.Exit(1)
+		return nil, fmt.Errorf("Unable to parse inventory file \"%s\": %s", iFileName, err)
+
 	}
 
-	return inventories
+	return inventories, nil
 }

yb-support-tool/exec/ssh.go

@@ -11,23 +11,21 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
-func runSsh(conn *ssh.Client, cmd, nodeIdx, nodeName, nodePrivateIp string, isVerbose bool) []byte {
+func runSsh(conn *ssh.Client, cmd, nodeIdx, nodeName, nodePrivateIp string, isVerbose bool) error {
 
 	var res []byte
 
 	session, err := conn.NewSession()
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return err
 	}
 
 	defer session.Close()
 	res, err = session.CombinedOutput(cmd)
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return err
 	}
 
 	output := string(res)
@@ -54,10 +52,10 @@ func runSsh(conn *ssh.Client, cmd, nodeIdx, nodeName, nodePrivateIp string, isVe
 		fmt.Print(output)
 	}
 
-	return res
+	return nil
 }
 
-func SshCmd(inventories []Inventory, universe, user, cmd string, isParallel bool, isVerbose bool) {
+func SshCmd(inventories []Inventory, universe, user, cmd string, isParallel bool, isVerbose bool) error {
 
 	var privateKeyPathPrefix = "/opt/yugabyte/yugaware/data/keys/"
 	var privateKeyPath string
@@ -74,14 +72,12 @@ func SshCmd(inventories []Inventory, universe, user, cmd string, isParallel bool
 	pemBytes, err := os.ReadFile(privateKeyPath)
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return err
 	}
 
 	signer, err := ssh.ParsePrivateKey(pemBytes)
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return err
 	}
 
 	config := &ssh.ClientConfig{
@@ -120,21 +116,25 @@ func SshCmd(inventories []Inventory, universe, user, cmd string, isParallel bool
 			conn, err := ssh.Dial("tcp", host, config)
 
 			if err != nil {
-				fmt.Println(err)
-				os.Exit(1)
+				return err
 			}
 
 			if isParallel {
 				wg.Add(1)
 				go func(wg *sync.WaitGroup) {
-					runSsh(conn, cmd, nodeIdx, nodeName, nodePrivateIp, isVerbose)
+					_ = runSsh(conn, cmd, nodeIdx, nodeName, nodePrivateIp, isVerbose)
 					wg.Done()
 				}(wg)
+
 			} else {
-				runSsh(conn, cmd, nodeIdx, nodeName, nodePrivateIp, isVerbose)
+				err := runSsh(conn, cmd, nodeIdx, nodeName, nodePrivateIp, isVerbose)
+				if err != nil {
+					return err
+				}
 			}
+			wg.Wait()
 		}
-		wg.Wait()
 	}
 
+	return nil
 }