Support -alwaysShowBuildLog option in remaining builder-tool subcomma…

…nds.
Symantec · Aug 18, 2019 · 8df4892 · 8df4892
1 parent 80eae70
commit 8df4892
Showing 1 changed file with 51 additions and 15 deletions.
diff --git a/cmd/builder-tool/manifest.go b/cmd/builder-tool/manifest.go
@@ -5,7 +5,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"os"
 	"syscall"
 
@@ -30,6 +29,8 @@ func buildFromManifestSubcommand(args []string, logger log.DebugLogger) {
 		*expiresIn, logWriter, logger)
 	if err != nil {
 		if !*alwaysShowBuildLog {
+			fmt.Fprintln(os.Stderr,
+				"Start of build log ==========================")
 			os.Stderr.Write(logWriter.Bytes())
 		}
 		fmt.Fprintln(os.Stderr, "End of build log ============================")
@@ -38,39 +39,74 @@ func buildFromManifestSubcommand(args []string, logger log.DebugLogger) {
 	}
 	if *alwaysShowBuildLog {
 		fmt.Fprintln(os.Stderr, "End of build log ============================")
+	} else {
+		err := fsutil.CopyToFile("build.log", filePerms, &logWriter.buffer,
+			uint64(logWriter.buffer.Len()))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error writing build log: %s\n", err)
+			os.Exit(1)
+		}
 	}
 	fmt.Println(name)
 	os.Exit(0)
 }
 
 func buildTreeFromManifestSubcommand(args []string, logger log.DebugLogger) {
 	srpcClient := getImageServerClient()
-	buildLog := &bytes.Buffer{}
-	rootDir, err := builder.BuildTreeFromManifest(srpcClient, args[0], buildLog,
-		logger)
+	logWriter := &logWriterType{}
+	if *alwaysShowBuildLog {
+		fmt.Fprintln(os.Stderr, "Start of build log ==========================")
+	}
+	rootDir, err := builder.BuildTreeFromManifest(srpcClient, args[0],
+		logWriter, logger)
 	if err != nil {
+		if !*alwaysShowBuildLog {
+			fmt.Fprintln(os.Stderr,
+				"Start of build log ==========================")
+			os.Stderr.Write(logWriter.Bytes())
+		}
+		fmt.Fprintln(os.Stderr, "End of build log ============================")
 		fmt.Fprintf(os.Stderr, "Error processing manifest: %s\n", err)
-		io.Copy(os.Stderr, buildLog)
 		os.Exit(1)
 	}
-	fmt.Println(rootDir)
-	err = fsutil.CopyToFile("build.log", filePerms, buildLog,
-		uint64(buildLog.Len()))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error writing build log: %s\n", err)
-		os.Exit(1)
+	if *alwaysShowBuildLog {
+		fmt.Fprintln(os.Stderr, "End of build log ============================")
+	} else {
+		err := fsutil.CopyToFile("build.log", filePerms, &logWriter.buffer,
+			uint64(logWriter.buffer.Len()))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error writing build log: %s\n", err)
+			os.Exit(1)
+		}
 	}
+	fmt.Println(rootDir)
 	os.Exit(0)
 }
 
 func processManifestSubcommand(args []string, logger log.DebugLogger) {
-	buildLog := &bytes.Buffer{}
-	if err := builder.ProcessManifest(args[0], args[1], buildLog); err != nil {
+	logWriter := &logWriterType{}
+	if *alwaysShowBuildLog {
+		fmt.Fprintln(os.Stderr, "Start of build log ==========================")
+	}
+	if err := builder.ProcessManifest(args[0], args[1], logWriter); err != nil {
+		if !*alwaysShowBuildLog {
+			fmt.Fprintln(os.Stderr,
+				"Start of build log ==========================")
+			os.Stderr.Write(logWriter.Bytes())
+		}
+		fmt.Fprintln(os.Stderr, "End of build log ============================")
 		fmt.Fprintf(os.Stderr, "Error processing manifest: %s\n", err)
-		io.Copy(os.Stderr, buildLog)
 		os.Exit(1)
+	}
+	if *alwaysShowBuildLog {
+		fmt.Fprintln(os.Stderr, "End of build log ============================")
 	} else {
-		io.Copy(os.Stdout, buildLog)
+		err := fsutil.CopyToFile("build.log", filePerms, &logWriter.buffer,
+			uint64(logWriter.buffer.Len()))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error writing build log: %s\n", err)
+			os.Exit(1)
+		}
 	}
 	os.Exit(0)
 }