interanl/util/projutil/proj_util.go: refactor command exec into ExecCmd()

Author: estroz

Diff for: commands/operator-sdk/cmd/build.go

@@ -158,9 +158,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
 	buildCmd := exec.Command("docker", "build", ".",
 		"-f", buildDockerfile,
 		"-t", baseImageName)
-	buildCmd.Stdout = os.Stdout
-	buildCmd.Stderr = os.Stderr
-	err := buildCmd.Run()
+	err := projutil.ExecCmd(buildCmd)
 	if err != nil {
 		if enableTests {
 			log.Fatalf("failed to output intermediate image %s: (%v)", image, err)
@@ -215,9 +213,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
 			"--build-arg", "TESTDIR="+testLocationBuild,
 			"--build-arg", "BASEIMAGE="+baseImageName,
 			"--build-arg", "NAMESPACEDMAN="+namespacedManBuild)
-		testBuildCmd.Stdout = os.Stdout
-		testBuildCmd.Stderr = os.Stderr
-		err = testBuildCmd.Run()
+		err = projutil.ExecCmd(testBuildCmd)
 		if err != nil {
 			log.Fatalf("failed to output test image %s: (%v)", image, err)
 		}
@@ -289,7 +285,8 @@ func buildOperatorBinary() error {
 	outputBinName := filepath.Join(absProjectPath, scaffold.BuildBinDir, binName)
 
 	cmd := exec.Command("go", "build", "-o", outputBinName, managerDir)
-	return execGoCmd(cmd)
+	cmd.Env = append(os.Environ(), "GOOS=linux", "GOARCH=amd64", "CGO_ENABLED=0")
+	return projutil.ExecCmd(cmd)
 }
 
 func buildTestBinary() error {
@@ -298,12 +295,6 @@ func buildTestBinary() error {
 	outputBinName := filepath.Join(absProjectPath, scaffold.BuildBinDir, binName+"-test")
 
 	cmd := exec.Command("go", "test", "-c", "-o", outputBinName, testLocationBuild+"/...")
-	return execGoCmd(cmd)
-}
-
-func execGoCmd(cmd *exec.Cmd) error {
 	cmd.Env = append(os.Environ(), "GOOS=linux", "GOARCH=amd64", "CGO_ENABLED=0")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
+	return projutil.ExecCmd(cmd)
 }

Diff for: commands/operator-sdk/cmd/generate/k8s.go

@@ -17,7 +17,6 @@ package generate
 import (
 	"fmt"
 	"io/ioutil"
-	"os"
 	"os/exec"
 	"path/filepath"
 
@@ -74,9 +73,7 @@ func K8sCodegen() {
 		groupVersions,
 	}
 	cgCmd := exec.Command(genGroupsCmd, args...)
-	cgCmd.Stdout = os.Stdout
-	cgCmd.Stderr = os.Stderr
-	err = cgCmd.Run()
+	err = projutil.ExecCmd(cgCmd)
 	if err != nil {
 		log.Fatalf("failed to perform code-generation: (%v)", err)
 	}

Diff for: commands/operator-sdk/cmd/new.go

@@ -225,9 +225,10 @@ func doAnsibleScaffold() {
 
 	// Run galaxy init.
 	cmd := exec.Command(filepath.Join(galaxyInit.AbsProjectPath, galaxyInit.Path))
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Run()
+	err = projutil.ExecCmd(cmd)
+	if err != nil {
+		log.Fatalf("failed to run galaxy-init: (%v)", err)
+	}
 
 	// Delete Galxy INIT
 	// Mac OS tmp directory is /var/folders/_c/..... this means we have to make sure that we get the top level directory to remove
@@ -271,14 +272,12 @@ func verifyFlags() {
 	}
 }
 
-func execCmd(stdout *os.File, cmd string, args ...string) {
+func execProjectCmd(cmd string, args ...string) {
 	dc := exec.Command(cmd, args...)
 	dc.Dir = filepath.Join(projutil.MustGetwd(), projectName)
-	dc.Stdout = stdout
-	dc.Stderr = os.Stderr
-	err := dc.Run()
+	err := projutil.ExecCmd(dc)
 	if err != nil {
-		log.Fatalf("failed to exec %s %#v: (%v)", cmd, args, err)
+		log.Fatal(err)
 	}
 }
 
@@ -288,7 +287,7 @@ func pullDep() {
 		log.Fatalf("looking for dep in $PATH: (%v)", err)
 	}
 	log.Info("Run dep ensure ...")
-	execCmd(os.Stdout, dep, ensureCmd, "-v")
+	execProjectCmd(dep, ensureCmd, "-v")
 	log.Info("Run dep ensure done")
 }
 
@@ -297,8 +296,8 @@ func initGit() {
 		return
 	}
 	log.Info("Run git init ...")
-	execCmd(os.Stdout, "git", "init")
-	execCmd(os.Stdout, "git", "add", "--all")
-	execCmd(os.Stdout, "git", "commit", "-q", "-m", "INITIAL COMMIT")
+	execProjectCmd("git", "init")
+	execProjectCmd("git", "add", "--all")
+	execProjectCmd("git", "commit", "-q", "-m", "INITIAL COMMIT")
 	log.Info("Run git init done")
 }

Diff for: commands/operator-sdk/cmd/test/local.go

@@ -204,11 +204,9 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 	dc := exec.Command("go", testArgs...)
 	dc.Env = append(os.Environ(), fmt.Sprintf("%v=%v", test.TestNamespaceEnv, tlConfig.namespace))
 	dc.Dir = projutil.MustGetwd()
-	dc.Stdout = os.Stdout
-	dc.Stderr = os.Stderr
-	err := dc.Run()
+	err := projutil.ExecCmd(dc)
 	if err != nil {
-		log.Fatalf("failed to exec `go %s`: (%v)", strings.Join(testArgs, " "), err)
+		log.Fatal(err)
 	}
 
 	log.Info("Local operator test successfully completed.")

Diff for: commands/operator-sdk/cmd/up/local.go

@@ -125,11 +125,9 @@ func upLocal() {
 		}
 		os.Exit(0)
 	}()
-	dc.Stdout = os.Stdout
-	dc.Stderr = os.Stderr
 	dc.Env = append(os.Environ(), fmt.Sprintf("%v=%v", k8sutil.KubeConfigEnvVar, kubeConfig))
 	dc.Env = append(dc.Env, fmt.Sprintf("%v=%v", k8sutil.WatchNamespaceEnvVar, namespace))
-	err := dc.Run()
+	err := projutil.ExecCmd(dc)
 	if err != nil {
 		log.Fatalf("failed to run operator locally: (%v)", err)
 	}

Diff for: internal/util/projutil/project_util.go

@@ -17,8 +17,10 @@ package projutil
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 
@@ -162,3 +164,13 @@ func IsDockerfileMultistage(dockerfile string) bool {
 	}
 	return bytes.Count(df, []byte("FROM")) > 1
 }
+
+func ExecCmd(cmd *exec.Cmd) error {
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		return fmt.Errorf("failed to exec %s %#v: %v", cmd.Path, cmd.Args, err)
+	}
+	return nil
+}