diff --git a/cmd/helm/get_test.go b/cmd/helm/get_test.go index 77d8d4d19..cfcc49968 100644 --- a/cmd/helm/get_test.go +++ b/cmd/helm/get_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/spf13/cobra" + "fmt" ) func TestGetCmd(t *testing.T) { @@ -29,7 +30,7 @@ func TestGetCmd(t *testing.T) { name: "get with a release", resp: releaseMock(&releaseOptions{name: "thomas-guide"}), args: []string{"thomas-guide"}, - expected: "REVISION: 1\nRELEASED: (.*)\nCHART: foo-0.1.0-beta.1\nUSER-SUPPLIED VALUES:\nname: \"value\"\nCOMPUTED VALUES:\nname: value\n\nHOOKS:\n---\n# pre-install-hook\n" + mockHookTemplate + "\nMANIFEST:", + expected: fmt.Sprintf("REVISION: 1\nRELEASED: (.*)\nRELEASED BY: %s\nCHART: foo-0.1.0-beta.1\nUSER-SUPPLIED VALUES:\nname: \"value\"\nCOMPUTED VALUES:\nname: value\n\nHOOKS:\n---\n# pre-install-hook\n" + mockHookTemplate + "\nMANIFEST:", username), }, { name: "get requires release name arg", diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go index b0a5075a7..1c5f9dd6d 100644 --- a/cmd/helm/helm_test.go +++ b/cmd/helm/helm_test.go @@ -59,6 +59,8 @@ type releaseOptions struct { namespace string } +var username = "John" + func releaseMock(opts *releaseOptions) *release.Release { date := timestamp.Timestamp{Seconds: 242085845, Nanos: 0} @@ -102,6 +104,7 @@ func releaseMock(opts *releaseOptions) *release.Release { LastDeployed: &date, Status: &release.Status{Code: scode}, Description: "Release mock", + Username: username, }, Chart: ch, Config: &chart.Config{Raw: `name: "value"`}, diff --git a/cmd/helm/history_test.go b/cmd/helm/history_test.go index 5f57e1748..953890037 100644 --- a/cmd/helm/history_test.go +++ b/cmd/helm/history_test.go @@ -22,6 +22,7 @@ import ( "testing" rpb "k8s.io/helm/pkg/proto/hapi/release" + "fmt" ) func TestHistoryCmd(t *testing.T) { @@ -50,7 +51,7 @@ func TestHistoryCmd(t *testing.T) { mk("angry-bird", 2, rpb.Status_SUPERSEDED), mk("angry-bird", 1, rpb.Status_SUPERSEDED), }, - xout: "REVISION\tUPDATED \tSTATUS \tCHART \tDESCRIPTION \n1 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\n2 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\n3 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\n4 \t(.*)\tDEPLOYED \tfoo-0.1.0-beta.1\tRelease mock\n", + xout: fmt.Sprintf("REVISION\tUPDATED \tSTATUS \tCHART \tDESCRIPTION \tRELEASED BY\n1 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\t%s \n2 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\t%s \n3 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\t%s \n4 \t(.*)\tDEPLOYED \tfoo-0.1.0-beta.1\tRelease mock\t%s \n", username, username, username, username), }, { cmds: "helm history --max=MAX RELEASE_NAME", @@ -60,7 +61,7 @@ func TestHistoryCmd(t *testing.T) { mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 3, rpb.Status_SUPERSEDED), }, - xout: "REVISION\tUPDATED \tSTATUS \tCHART \tDESCRIPTION \n3 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\n4 \t(.*)\tDEPLOYED \tfoo-0.1.0-beta.1\tRelease mock\n", + xout: fmt.Sprintf("REVISION\tUPDATED \tSTATUS \tCHART \tDESCRIPTION \tRELEASED BY\n3 \t(.*)\tSUPERSEDED\tfoo-0.1.0-beta.1\tRelease mock\t%s \n4 \t(.*)\tDEPLOYED \tfoo-0.1.0-beta.1\tRelease mock\t%s \n", username, username), }, } diff --git a/cmd/helm/list_test.go b/cmd/helm/list_test.go index 611f47973..4c0fc549c 100644 --- a/cmd/helm/list_test.go +++ b/cmd/helm/list_test.go @@ -22,6 +22,7 @@ import ( "testing" "k8s.io/helm/pkg/proto/hapi/release" + "fmt" ) func TestListCmd(t *testing.T) { @@ -45,7 +46,7 @@ func TestListCmd(t *testing.T) { resp: []*release.Release{ releaseMock(&releaseOptions{name: "atlas"}), }, - expected: "NAME \tREVISION\tUPDATED \tSTATUS \tCHART \tNAMESPACE\natlas\t1 \t(.*)\tDEPLOYED\tfoo-0.1.0-beta.1\tdefault \n", + expected: fmt.Sprintf("NAME \tREVISION\tUPDATED \tSTATUS \tCHART \tNAMESPACE\tRELEASED BY\natlas\t1 \t(.*)\tDEPLOYED\tfoo-0.1.0-beta.1\tdefault \t%s \n", username), }, { name: "list, one deployed, one failed", diff --git a/cmd/helm/status_test.go b/cmd/helm/status_test.go index 0ab0db08f..ba2e5f33c 100644 --- a/cmd/helm/status_test.go +++ b/cmd/helm/status_test.go @@ -50,7 +50,7 @@ func TestStatusCmd(t *testing.T) { { name: "get status of a deployed release", args: []string{"flummoxed-chickadee"}, - expected: outputWithStatus("DEPLOYED\n\n"), + expected: outputWithStatus("DEPLOYED", username+"\n\n"), rel: releaseMockWithStatus(&release.Status{ Code: release.Status_DEPLOYED, }), @@ -58,7 +58,7 @@ func TestStatusCmd(t *testing.T) { { name: "get status of a deployed release with notes", args: []string{"flummoxed-chickadee"}, - expected: outputWithStatus("DEPLOYED\n\nNOTES:\nrelease notes\n"), + expected: outputWithStatus("DEPLOYED", username+"\n\nNOTES:\nrelease notes\n"), rel: releaseMockWithStatus(&release.Status{ Code: release.Status_DEPLOYED, Notes: "release notes", @@ -67,7 +67,7 @@ func TestStatusCmd(t *testing.T) { { name: "get status of a deployed release with resources", args: []string{"flummoxed-chickadee"}, - expected: outputWithStatus("DEPLOYED\n\nRESOURCES:\nresource A\nresource B\n\n"), + expected: outputWithStatus("DEPLOYED", username+"\n\nRESOURCES:\nresource A\nresource B\n\n"), rel: releaseMockWithStatus(&release.Status{ Code: release.Status_DEPLOYED, Resources: "resource A\nresource B\n", @@ -76,10 +76,10 @@ func TestStatusCmd(t *testing.T) { { name: "get status of a deployed release with test suite", args: []string{"flummoxed-chickadee"}, - expected: outputWithStatus( - fmt.Sprintf("DEPLOYED\n\nTEST SUITE:\nLast Started: %s\nLast Completed: %s\n\n", dateString, dateString) + - fmt.Sprint("TEST \tSTATUS \tINFO \tSTARTED \tCOMPLETED \n") + - fmt.Sprintf("test run 1\tSUCCESS \textra info\t%s\t%s\n", dateString, dateString) + + expected: outputWithStatus("DEPLOYED", + fmt.Sprintf("%s\n\nTEST SUITE:\nLast Started: %s\nLast Completed: %s\n\n", username, dateString, dateString)+ + fmt.Sprint("TEST \tSTATUS \tINFO \tSTARTED \tCOMPLETED \n")+ + fmt.Sprintf("test run 1\tSUCCESS \textra info\t%s\t%s\n", dateString, dateString)+ fmt.Sprintf("test run 2\tFAILURE \t \t%s\t%s\n", dateString, dateString)), rel: releaseMockWithStatus(&release.Status{ Code: release.Status_DEPLOYED, @@ -131,10 +131,11 @@ func TestStatusCmd(t *testing.T) { } } -func outputWithStatus(status string) string { - return fmt.Sprintf("LAST DEPLOYED: %s\nNAMESPACE: \nSTATUS: %s", +func outputWithStatus(status string, username string) string { + return fmt.Sprintf("LAST DEPLOYED: %s\nNAMESPACE: \nSTATUS: %s\nRELEASED BY: %s", dateString, - status) + status, + username) } func releaseMockWithStatus(status *release.Status) *release.Release { @@ -144,6 +145,7 @@ func releaseMockWithStatus(status *release.Status) *release.Release { FirstDeployed: &date, LastDeployed: &date, Status: status, + Username: username, }, } }