From 6870dd94abe75ba5e1045df816816c0c372edc7c Mon Sep 17 00:00:00 2001 From: DongHo Jung Date: Tue, 5 Mar 2024 02:48:28 +0900 Subject: [PATCH 1/3] docs: use service-name instead of service-id (#17389) * use service-name instead of service-id Signed-off-by: DongHo Jung * trigger CICD Signed-off-by: DongHo Jung --------- Signed-off-by: DongHo Jung Signed-off-by: Mangaal --- docs/operator-manual/notifications/services/pagerduty_v2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operator-manual/notifications/services/pagerduty_v2.md b/docs/operator-manual/notifications/services/pagerduty_v2.md index 549cdc937b1500..d8a123606f2704 100755 --- a/docs/operator-manual/notifications/services/pagerduty_v2.md +++ b/docs/operator-manual/notifications/services/pagerduty_v2.md @@ -74,5 +74,5 @@ apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: annotations: - notifications.argoproj.io/subscribe.on-rollout-aborted.pagerdutyv2: "" + notifications.argoproj.io/subscribe.on-rollout-aborted.pagerdutyv2: "" ``` From 0855155a1af7830fb08c250b2f591d9c0eee71f3 Mon Sep 17 00:00:00 2001 From: Leonardo Luz Almeida Date: Tue, 5 Mar 2024 19:19:09 -0500 Subject: [PATCH 2/3] chore: add more unit tests around useDiffCache function (#17404) * chore: add more unit tests around useDiffCache function Signed-off-by: Leonardo Luz Almeida * fix doc Signed-off-by: Leonardo Luz Almeida --------- Signed-off-by: Leonardo Luz Almeida Signed-off-by: Mangaal --- docs/operator-manual/notifications/services/pagerduty_v2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operator-manual/notifications/services/pagerduty_v2.md b/docs/operator-manual/notifications/services/pagerduty_v2.md index d8a123606f2704..549cdc937b1500 100755 --- a/docs/operator-manual/notifications/services/pagerduty_v2.md +++ b/docs/operator-manual/notifications/services/pagerduty_v2.md @@ -74,5 +74,5 @@ apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: annotations: - notifications.argoproj.io/subscribe.on-rollout-aborted.pagerdutyv2: "" + notifications.argoproj.io/subscribe.on-rollout-aborted.pagerdutyv2: "" ``` From 12bb9f7080ff60d1238aa7e3ea731ccb4788e167 Mon Sep 17 00:00:00 2001 From: Mangaal Date: Thu, 14 Mar 2024 14:45:04 +0530 Subject: [PATCH 3/3] update print output Signed-off-by: Mangaal --- cmd/argocd/commands/app.go | 3 +-- cmd/argocd/commands/app_test.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index d96a4b348e7650..5841d0b9ce0c9f 100644 --- 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 index 5799feb2d65945..ab7bf2754992e7 100644 --- 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)