Merge pull request #313 from thockin/master

Look for gofmt and if not found, log and proceed

Author: k8s-ci-robot

v2/generator/execute.go

@@ -117,7 +117,8 @@ func assembleGoFile(w io.Writer, f *File) {
 
 func formatCode(src []byte) ([]byte, error) {
 	// We call goimports because it formats imports better than gofmt, but also
-	// call gofmt because it has the "simplify" logic.
+	// call gofmt because it has the "simplify" logic.  If a gofmt binary is
+	// not found, we will skip it.
 	src, err := importsWrapper(src)
 	if err != nil {
 		return nil, err
@@ -136,16 +137,24 @@ func importsWrapper(src []byte) ([]byte, error) {
 }
 
 func gofmtWrapper(src []byte) ([]byte, error) {
-	cmd := exec.Command("gofmt", "-s")
+	const gofmt = "gofmt"
+
+	if _, err := exec.LookPath(gofmt); err != nil {
+		klog.Errorf("WARNING: skipping output simplification: %v", err)
+		return nil, nil
+	}
+
+	cmd := exec.Command(gofmt, "-s")
 	cmd.Stdin = bytes.NewReader(src)
 	stdout := &bytes.Buffer{}
 	cmd.Stdout = stdout
 	stderr := &bytes.Buffer{}
 	cmd.Stderr = stderr
 	if err := cmd.Run(); err != nil {
 		if stderr.Len() > 0 {
-			return nil, fmt.Errorf("gofmt failed: %v: %s", err, strings.TrimSpace(stderr.String()))
+			return nil, fmt.Errorf("%s failed: %v: %s", gofmt, err, strings.TrimSpace(stderr.String()))
 		}
+		return nil, fmt.Errorf("%s failed: %v", gofmt, err)
 	}
 	return stdout.Bytes(), nil
 }

v2/hack/verify-examples.sh

@@ -8,6 +8,8 @@
 # Exit immediately if any command fails
 set -e
 
+VERBOSE=${VERBOSE:-0}
+
 # Make sure we run from the v2 root.
 V2_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 cd "${V2_ROOT}"
@@ -20,7 +22,7 @@ fi
 
 echo "Running ./examples/tracer"
 rm ./examples/tracer/testdata/simple/out.txt
-go run ./examples/tracer ./examples/tracer/testdata/simple > ./examples/tracer/testdata/simple/out.txt
+go run ./examples/tracer -v"${VERBOSE}" ./examples/tracer/testdata/simple > ./examples/tracer/testdata/simple/out.txt
 if ! git diff --quiet HEAD; then
     echo "FAIL: output files changed"
     git diff
@@ -29,7 +31,7 @@ fi
 
 echo "Running ./examples/kilroy"
 rm ./examples/kilroy/testdata/simple/generated.kilroy.go
-go run ./examples/kilroy/ ./examples/kilroy/testdata/simple
+go run ./examples/kilroy/ -v"${VERBOSE}" ./examples/kilroy/testdata/simple
 if ! git diff --quiet HEAD; then
     echo "FAIL: output files changed"
     git diff
@@ -38,7 +40,7 @@ fi
 
 echo "Running ./examples/pointuh"
 rm -rf ./examples/pointuh/testdata/results
-go run ./examples/pointuh/ \
+go run ./examples/pointuh/ -v"${VERBOSE}" \
     --output-dir ./examples/pointuh/testdata/results \
     --output-pkg k8s.io/gengo/examples/pointuh/testdata/results \
     ./examples/pointuh/testdata/simple