Cleaner dryrun output

upup/pkg/fi/dryrun_target.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"k8s.io/kops/upup/pkg/fi/utils"
 	"reflect"
+	"strings"
 )
 
 // DryRunTarget is a special Target that does not execute anything, but instead tracks all changes.
@@ -62,21 +63,29 @@ func (t *DryRunTarget) PrintReport(taskMap map[string]Task, out io.Writer) error
 	b := &bytes.Buffer{}
 
 	if len(t.changes) != 0 {
-		fmt.Fprintf(b, "Will create resources:\n")
+		var creates []*render
-		for _, r := range t.changes {
+		var updates []*render
-			if !r.aIsNil {
-				continue
-			}
 
-			fmt.Fprintf(b, "  %T\t%s\n", r.changes, IdForTask(taskMap, r.e))
-		}
-
-		fmt.Fprintf(b, "Will modify resources:\n")
-		// We can't use our reflection helpers here - we want corresponding values from a,e,c
 		for _, r := range t.changes {
 			if r.aIsNil {
-				continue
+				creates = append(creates, r)
+			} else {
+				updates = append(updates, r)
 			}
+		}
+
+		if len(creates) != 0 {
+			fmt.Fprintf(b, "Will create resources:\n")
+			for _, r := range creates {
+				taskName := getTaskName(r.changes)
+				fmt.Fprintf(b, "  %s\t%s\n", taskName, IdForTask(taskMap, r.e))
+			}
+		}
+
+		if len(updates) != 0 {
+			fmt.Fprintf(b, "Will modify resources:\n")
+			// We can't use our reflection helpers here - we want corresponding values from a,e,c
+			for _, r := range updates {
 				var changeList []string
 
 				valC := reflect.ValueOf(r.changes)
@@ -139,18 +148,29 @@ func (t *DryRunTarget) PrintReport(taskMap map[string]Task, out io.Writer) error
 					continue
 				}
 
-			fmt.Fprintf(b, "  %T\t%s\n", r.changes, IdForTask(taskMap, r.e))
+				taskName := getTaskName(r.changes)
+				fmt.Fprintf(b, "  %s\t%s\n", taskName, IdForTask(taskMap, r.e))
 				for _, f := range changeList {
 					fmt.Fprintf(b, "    %s\n", f)
 				}
 				fmt.Fprintf(b, "\n")
 			}
 		}
+	}
 
 	_, err := out.Write(b.Bytes())
 	return err
 }
 
+func getTaskName(t Task) string {
+	s := fmt.Sprintf("%T", t)
+	lastDot := strings.LastIndexByte(s, '.')
+	if lastDot != -1 {
+		s = s[lastDot+1:]
+	}
+	return s
+}
+
 // asString returns a human-readable string representation of the passed value
 func ValueAsString(value reflect.Value) string {
 	b := &bytes.Buffer{}