Merge pull request #2005 from carolynvs/debug-statements

Make runtime manifest log output debug messages

Author: carolynvs

pkg/runtime/runtime-manifest.go

@@ -504,11 +504,15 @@ func (m *RuntimeManifest) createOutputsDir() error {
 func (m *RuntimeManifest) unpackStateBag() error {
 	_, err := m.FileSystem.Open(statePath)
 	if os.IsNotExist(err) || len(m.StateBag) == 0 {
-		fmt.Fprintln(m.Out, "No existing bundle state to unpack")
+		if m.Debug {
+			fmt.Fprintln(m.Err, "No existing bundle state to unpack")
+		}
 		return nil
 	}
 
-	fmt.Fprintln(m.Out, "Unpacking bundle state...")
+	if m.Debug {
+		fmt.Fprintln(m.Err, "Unpacking bundle state...")
+	}
 	// Unpack the state file and copy its contents to where the bundle expects them
 	// state var name -> path in bundle
 	stateFiles := make(map[string]string, len(m.StateBag))
@@ -519,7 +523,9 @@ func (m *RuntimeManifest) unpackStateBag() error {
 	unpackStateFile := func(tr *tar.Reader, header *tar.Header) error {
 		name := strings.TrimPrefix(header.Name, "porter-state/")
 		dest := stateFiles[name]
-		fmt.Fprintln(m.Out, "  -", name, "->", dest)
+		if m.Debug {
+			fmt.Fprintln(m.Err, "  -", name, "->", dest)
+		}
 
 		f, err := os.OpenFile(dest, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
 		if err != nil {
@@ -577,14 +583,19 @@ func (m *RuntimeManifest) Finalize() error {
 
 // Pack each state variable into /porter/state/tgz.
 func (m *RuntimeManifest) packStateBag() error {
-	fmt.Fprintln(m.Out, "Packing bundle state...")
+	if m.Debug {
+		fmt.Fprintln(m.Err, "Packing bundle state...")
+	}
+
 	packStateFile := func(tw *tar.Writer, s manifest.StateVariable) error {
 		fi, err := m.FileSystem.Stat(s.Path)
 		if os.IsNotExist(err) {
 			return nil
 		}
 
-		fmt.Fprintln(m.Out, "  -", s.Path)
+		if m.Debug {
+			fmt.Fprintln(m.Err, "  -", s.Path)
+		}
 		header, err := tar.FileInfoHeader(fi, fi.Name())
 		if err != nil {
 			return errors.Wrapf(err, "error creating tar header for state variable %s from path %s", s.Name, s.Path)
@@ -632,8 +643,10 @@ func (m *RuntimeManifest) packStateBag() error {
 // and if they can be bound, i.e. they grab a file from the bundle's filesystem,
 // apply the output.
 func (m *RuntimeManifest) applyUnboundBundleOutputs() error {
-	if len(m.Outputs) > 0 {
-		fmt.Fprintln(m.Out, "Collecting bundle outputs...")
+	if len(m.bundle.Outputs) > 0 {
+		if m.Debug {
+			fmt.Fprintln(m.Err, "Collecting bundle outputs...")
+		}
 	}
 
 	var bigErr *multierror.Error
@@ -651,7 +664,9 @@ func (m *RuntimeManifest) applyUnboundBundleOutputs() error {
 		}
 
 		// Print the output that we've collected
-		fmt.Fprintln(m.Out, "  -", name)
+		if m.Debug {
+			fmt.Fprintln(m.Err, "  -", name)
+		}
 		if _, hasOutput := outputs[name]; !hasOutput {
 			// Use the path as originally defined in the manifest
 			// TODO(carolynvs): When we switch to driving everything completely