From c5e9732a9fdda5c1bb74a1d29827cf60158d218c Mon Sep 17 00:00:00 2001
From: Abhilash Gnan <abhilashgnan@gmail.com>
Date: Wed, 23 Sep 2020 19:50:29 +0200
Subject: [PATCH] rename to time format flag

Signed-off-by: Abhilash Gnan <abhilashgnan@gmail.com>
---
 cmd/helm/list.go      | 12 ++++++------
 pkg/action/list.go    |  2 +-
 pkg/time/time.go      |  4 ++--
 pkg/time/time_test.go |  9 ++++++++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cmd/helm/list.go b/cmd/helm/list.go
index 4d65e824b..87f7f2ecc 100644
--- a/cmd/helm/list.go
+++ b/cmd/helm/list.go
@@ -105,17 +105,17 @@ func newListCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 					}
 					return nil
 				default:
-					return outfmt.Write(out, newReleaseListWriter(results, client.FormatTime))
+					return outfmt.Write(out, newReleaseListWriter(results, client.TimeFormat))
 				}
 			}
 
-			return outfmt.Write(out, newReleaseListWriter(results, client.FormatTime))
+			return outfmt.Write(out, newReleaseListWriter(results, client.TimeFormat))
 		},
 	}
 
 	f := cmd.Flags()
 	f.BoolVarP(&client.Short, "short", "q", false, "output short (quiet) listing format")
-	f.BoolVar(&client.FormatTime, "format-time", false, "format time")
+	f.StringVar(&client.TimeFormat, "time-format", "", "format time. Example: --time-format 2009-11-17 20:34:10 +0000 UTC")
 	f.BoolVarP(&client.ByDate, "date", "d", false, "sort by release date")
 	f.BoolVarP(&client.SortReverse, "reverse", "r", false, "reverse the sort order")
 	f.BoolVarP(&client.All, "all", "a", false, "show all releases without any filter applied")
@@ -149,7 +149,7 @@ type releaseListWriter struct {
 	releases []releaseElement
 }
 
-func newReleaseListWriter(releases []*release.Release, formatTime bool) *releaseListWriter {
+func newReleaseListWriter(releases []*release.Release, timeFormat string) *releaseListWriter {
 	// Initialize the array so no results returns an empty array instead of null
 	elements := make([]releaseElement, 0, len(releases))
 	for _, r := range releases {
@@ -164,8 +164,8 @@ func newReleaseListWriter(releases []*release.Release, formatTime bool) *release
 
 		t := "-"
 		if tspb := r.Info.LastDeployed; !tspb.IsZero() {
-			if formatTime {
-				t = helmtime.Format(tspb)
+			if timeFormat != "" {
+				t = helmtime.Format(tspb, timeFormat)
 			} else {
 				t = tspb.String()
 			}
diff --git a/pkg/action/list.go b/pkg/action/list.go
index c4686f2c8..ebbc56b01 100644
--- a/pkg/action/list.go
+++ b/pkg/action/list.go
@@ -122,7 +122,7 @@ type List struct {
 	// Filter is a filter that is applied to the results
 	Filter       string
 	Short        bool
-	FormatTime   bool
+	TimeFormat   string
 	Uninstalled  bool
 	Superseded   bool
 	Uninstalling bool
diff --git a/pkg/time/time.go b/pkg/time/time.go
index 93ebc8520..3309da735 100644
--- a/pkg/time/time.go
+++ b/pkg/time/time.go
@@ -91,6 +91,6 @@ func (t Time) Truncate(d time.Duration) Time { return Time{Time: t.Time.Truncate
 func (t Time) UTC() Time                     { return Time{Time: t.Time.UTC()} }
 
 // Format formats time in custom output format
-func Format(t Time) string {
-	return t.Format("2006-01-02 15:04:05 -0700 MST")
+func Format(t Time, format string) string {
+	return t.Format(format)
 }
diff --git a/pkg/time/time_test.go b/pkg/time/time_test.go
index c1eb4ba77..35c719033 100644
--- a/pkg/time/time_test.go
+++ b/pkg/time/time_test.go
@@ -84,8 +84,15 @@ func TestZeroValueUnmarshal(t *testing.T) {
 
 func TestFormat(t *testing.T) {
 	when := Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC)
+
 	expected := "2009-11-17 20:34:58 +0000 UTC"
-	got := Format(when)
+	got := Format(when, "2006-01-02 15:04:05 -0700 MST")
+	if expected != got {
+		t.Errorf("expected %s, got %s", expected, got)
+	}
+
+	expected = "2009-11-17 20:34 +0000 UTC"
+	got = Format(when, "2006-01-02 15:04 -0700 MST")
 	if expected != got {
 		t.Errorf("expected %s, got %s", expected, got)
 	}