From 190e0b4a818df967215ad26a9cebdf114795614a Mon Sep 17 00:00:00 2001
From: Abhilash Gnan <abhilashgnan@gmail.com>
Date: Wed, 23 Sep 2020 19:28:57 +0200
Subject: [PATCH] refactor time formatting

Signed-off-by: Abhilash Gnan <abhilashgnan@gmail.com>
---
 cmd/helm/list.go | 47 +++++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/cmd/helm/list.go b/cmd/helm/list.go
index 957033714..4d65e824b 100644
--- a/cmd/helm/list.go
+++ b/cmd/helm/list.go
@@ -153,47 +153,30 @@ func newReleaseListWriter(releases []*release.Release, formatTime bool) *release
 	// Initialize the array so no results returns an empty array instead of null
 	elements := make([]releaseElement, 0, len(releases))
 	for _, r := range releases {
-		var element releaseElement
-
-		if formatTime {
-			element = timeFormattedElement(r)
-		} else {
-			element = releaseElement{
-				Name:       r.Name,
-				Namespace:  r.Namespace,
-				Revision:   strconv.Itoa(r.Version),
-				Status:     r.Info.Status.String(),
-				Chart:      fmt.Sprintf("%s-%s", r.Chart.Metadata.Name, r.Chart.Metadata.Version),
-				AppVersion: r.Chart.Metadata.AppVersion,
-			}
-			t := "-"
-			if tspb := r.Info.LastDeployed; !tspb.IsZero() {
+		element := releaseElement{
+			Name:       r.Name,
+			Namespace:  r.Namespace,
+			Revision:   strconv.Itoa(r.Version),
+			Status:     r.Info.Status.String(),
+			Chart:      fmt.Sprintf("%s-%s", r.Chart.Metadata.Name, r.Chart.Metadata.Version),
+			AppVersion: r.Chart.Metadata.AppVersion,
+		}
+
+		t := "-"
+		if tspb := r.Info.LastDeployed; !tspb.IsZero() {
+			if formatTime {
+				t = helmtime.Format(tspb)
+			} else {
 				t = tspb.String()
 			}
-			element.Updated = t
 		}
+		element.Updated = t
 
 		elements = append(elements, element)
 	}
 	return &releaseListWriter{elements}
 }
 
-func timeFormattedElement(r *release.Release) releaseElement {
-	t := "-"
-	if tspb := r.Info.LastDeployed; !tspb.IsZero() {
-		t = helmtime.Format(tspb)
-	}
-	return releaseElement{
-		Name:       r.Name,
-		Namespace:  r.Namespace,
-		Revision:   strconv.Itoa(r.Version),
-		Updated:    t,
-		Status:     r.Info.Status.String(),
-		Chart:      fmt.Sprintf("%s-%s", r.Chart.Metadata.Name, r.Chart.Metadata.Version),
-		AppVersion: r.Chart.Metadata.AppVersion,
-	}
-}
-
 func (r *releaseListWriter) WriteTable(out io.Writer) error {
 	table := uitable.New()
 	table.AddRow("NAME", "NAMESPACE", "REVISION", "UPDATED", "STATUS", "CHART", "APP VERSION")