Merge pull request #11508 from chrischdi/pr-clusterctl-multiline-messages-indent

🌱 clusterctl: properly indent multiline lists in clusterctl describe

Author: k8s-ci-robot

cmd/clusterctl/cmd/describe_cluster.go

@@ -780,6 +780,10 @@ func formatParagraph(text string, maxWidth int) string {
 			}
 			break
 		}
+		indent := tmp
+		if strings.HasPrefix(strings.TrimSpace(l), "* ") {
+			indent += "  "
+		}
 		for _, w := range re.Split(l, -1) {
 			if len(tmp)+len(w) < maxWidth {
 				if strings.TrimSpace(tmp) != "" {
@@ -789,7 +793,7 @@ func formatParagraph(text string, maxWidth int) string {
 				continue
 			}
 			lines = append(lines, tmp)
-			tmp = w
+			tmp = indent + w
 		}
 		lines = append(lines, tmp)
 	}

cmd/clusterctl/cmd/describe_cluster_test.go

@@ -365,3 +365,41 @@ func (t *Table) NegatedFailureMessage(actual interface{}) string {
 	actualTable := strings.Split(actual.(string), "\n")
 	return fmt.Sprintf("Expected %v and received %v", t.tableData, actualTable)
 }
+
+func Test_formatParagraph(t *testing.T) {
+	tests := []struct {
+		text     string
+		maxWidth int
+		want     string
+	}{
+		{
+			text:     "",
+			maxWidth: 254,
+			want:     "",
+		},
+		{
+			text:     "* a b c d e f",
+			maxWidth: 5,
+			want:     "* a b\n  c d\n  e f",
+		},
+		{
+			text: "* a b c d e f\n" +
+				"  * g h\n" +
+				"  * i j",
+			maxWidth: 5,
+			want: "* a b\n" +
+				"  c d\n" +
+				"  e f\n" +
+				"  * g\n" +
+				"    h\n" +
+				"  * i\n" +
+				"    j",
+		},
+	}
+	for ti, tt := range tests {
+		t.Run(fmt.Sprintf("%d", ti), func(t *testing.T) {
+			g := NewWithT(t)
+			g.Expect("\n" + formatParagraph(tt.text, tt.maxWidth)).To(BeEquivalentTo("\n" + tt.want))
+		})
+	}
+}