Merge branch 'feat/argocd-app-history' of https://github.com/Mangaal/…

…argo-cd into feat/argocd-app-history
Mangaal · Mar 14, 2024 · f14c3f1 · f14c3f1
2 parents 3f05e52 + 12bb9f7
commit f14c3f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go
@@ -2496,12 +2496,11 @@ func printApplicationHistoryTable(revHistory []argoappv1.RevisionHistory) {
 		}
 	}
 	for source, historyEntries := range varHistory {
-		_, _ = fmt.Fprintf(w, "SOURCE\t%s\n", source)
+		_, _ = fmt.Fprintf(w, "\nSOURCE\t%s\n", source)
 		_, _ = fmt.Fprintf(w, "ID\tDATE\tREVISION\n")
 		for _, history := range historyEntries {
 			_, _ = fmt.Fprintf(w, "%d\t%s\t%s\n", history.id, history.date, history.revision)
 		}
-		_, _ = fmt.Fprintf(w, "\n")
 	}
 	_ = w.Flush()
 }

diff --git a/cmd/argocd/commands/app_test.go b/cmd/argocd/commands/app_test.go
@@ -581,7 +581,7 @@ func TestPrintApplicationHistoryTable(t *testing.T) {
 		return nil
 	})
 
-	expectation := "SOURCE  test\nID      DATE                           REVISION\n1       0001-01-01 00:00:00 +0000 UTC  1\n2       0001-01-01 00:00:00 +0000 UTC  2\n3       0001-01-01 00:00:00 +0000 UTC  3\n\n"
+	expectation := "\nSOURCE  test\nID      DATE                           REVISION\n1       0001-01-01 00:00:00 +0000 UTC  1\n2       0001-01-01 00:00:00 +0000 UTC  2\n3       0001-01-01 00:00:00 +0000 UTC  3\n"
 
 	if output != expectation {
 		t.Fatalf("Incorrect print operation output %q, should be %q", output, expectation)
@@ -648,7 +648,7 @@ func TestPrintApplicationHistoryTableWithMultipleSources(t *testing.T) {
 		return nil
 	})
 
-	expectation := "SOURCE  test-1\nID      DATE                           REVISION\n1       0001-01-01 00:00:00 +0000 UTC  1a\n2       0001-01-01 00:00:00 +0000 UTC  2a\n3       0001-01-01 00:00:00 +0000 UTC  3a\n\nSOURCE  test-2\nID      DATE                           REVISION\n1       0001-01-01 00:00:00 +0000 UTC  1b\n2       0001-01-01 00:00:00 +0000 UTC  2b\n3       0001-01-01 00:00:00 +0000 UTC  3b\n\n"
+	expectation := "\nSOURCE  test-1\nID      DATE                           REVISION\n1       0001-01-01 00:00:00 +0000 UTC  1a\n2       0001-01-01 00:00:00 +0000 UTC  2a\n3       0001-01-01 00:00:00 +0000 UTC  3a\n\nSOURCE  test-2\nID      DATE                           REVISION\n1       0001-01-01 00:00:00 +0000 UTC  1b\n2       0001-01-01 00:00:00 +0000 UTC  2b\n3       0001-01-01 00:00:00 +0000 UTC  3b\n"
 
 	if output != expectation {
 		t.Fatalf("Incorrect print operation output %q, should be %q", output, expectation)