[helm3] Return deleted time if exists (#1436)

vmware-tanzu · Jan 13, 2020 · 0800ec4 · 0800ec4
1 parent 691135c
commit 0800ec4
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 8 deletions.
diff --git a/cmd/kubeops/internal/handler/dashboardcompat.go b/cmd/kubeops/internal/handler/dashboardcompat.go
@@ -5,9 +5,12 @@
 package handler
 
 import (
+	"fmt"
 	"strings"
 
+	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
+	"github.com/golang/protobuf/ptypes/timestamp"
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 	h3chart "helm.sh/helm/v3/pkg/chart"
@@ -16,16 +19,24 @@ import (
 	h2 "k8s.io/helm/pkg/proto/hapi/release"
 )
 
-func newDashboardCompatibleRelease(h3r h3.Release) h2.Release {
+func newDashboardCompatibleRelease(h3r h3.Release) (h2.Release, error) {
+	var deleted *timestamp.Timestamp
+	if !h3r.Info.Deleted.IsZero() {
+		var err error
+		deleted, err = ptypes.TimestampProto(h3r.Info.Deleted.Time)
+		if err != nil {
+			return h2.Release{}, fmt.Errorf("Failed to parse deletion time %v", err)
+		}
+	}
 	return h2.Release{
 		Name:      h3r.Name,
-		Info:      &h2.Info{Status: compatibleStatus(*h3r.Info)},
+		Info:      &h2.Info{Status: compatibleStatus(*h3r.Info), Deleted: deleted},
 		Chart:     compatibleChart(*h3r.Chart),
 		Config:    compatibleConfig(h3r),
 		Manifest:  h3r.Manifest,
 		Version:   int32(h3r.Version),
 		Namespace: h3r.Namespace,
-	}
+	}, nil
 }
 
 func compatibleChart(h3c h3chart.Chart) *h2chart.Chart {

diff --git a/cmd/kubeops/internal/handler/dashboardcompat_test.go b/cmd/kubeops/internal/handler/dashboardcompat_test.go
@@ -124,7 +124,10 @@ func TestNewDashboardCompatibleRelease(t *testing.T) {
 				}
 			}()
 			// Perform conversion
-			compatibleH3rls := newDashboardCompatibleRelease(test.Helm3Release)
+			compatibleH3rls, err := newDashboardCompatibleRelease(test.Helm3Release)
+			if err != nil {
+				t.Fatalf("Unexpected error: %v", err)
+			}
 			// Marshall both: Compatible H3Release and H2Release
 			h3Marshalled := test.MarshallingFunction(compatibleH3rls)
 			t.Logf("Marshalled Helm 3 Release %s", h3Marshalled)

diff --git a/cmd/kubeops/internal/handler/handler.go b/cmd/kubeops/internal/handler/handler.go
@@ -167,8 +167,12 @@ func upgradeRelease(cfg Config, w http.ResponseWriter, req *http.Request, params
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return
 	}
-	response.NewDataResponse(newDashboardCompatibleRelease(*rel)).Write(w)
-
+	compatRelease, err := newDashboardCompatibleRelease(*rel)
+	if err != nil {
+		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
+		return
+	}
+	response.NewDataResponse(compatRelease).Write(w)
 }
 
 // GetRelease returns a release
@@ -180,7 +184,12 @@ func GetRelease(cfg Config, w http.ResponseWriter, req *http.Request, params han
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return
 	}
-	response.NewDataResponse(newDashboardCompatibleRelease(*release)).Write(w)
+	compatRelease, err := newDashboardCompatibleRelease(*release)
+	if err != nil {
+		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
+		return
+	}
+	response.NewDataResponse(compatRelease).Write(w)
 }
 
 // DeleteRelease deletes a release

diff --git a/cmd/kubeops/internal/handler/handler_test.go b/cmd/kubeops/internal/handler/handler_test.go
@@ -8,6 +8,7 @@ import (
 	"sort"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/kubeapps/kubeapps/pkg/auth"
@@ -19,12 +20,17 @@ import (
 	kubefake "helm.sh/helm/v3/pkg/kube/fake"
 	"helm.sh/helm/v3/pkg/storage"
 	"helm.sh/helm/v3/pkg/storage/driver"
+	helmTime "helm.sh/helm/v3/pkg/time"
 
 	"helm.sh/helm/v3/pkg/release"
 )
 
 const defaultListLimit = 256
 
+var (
+	testingTime, _ = helmTime.Parse(time.RFC3339, "1977-09-02T22:04:05Z")
+)
+
 // newConfigFixture returns a Config with fake clients
 // and memory storage.
 func newConfigFixture(t *testing.T) *Config {
@@ -191,6 +197,25 @@ func TestActions(t *testing.T) {
 			},
 			ResponseBody: `{"data":{"name":"foobar","info":{"status":{"code":1}},"chart":{"metadata":{"name":"foo"},"values":{"raw":"{}\n"}},"config":{"raw":"{}\n"},"version":1,"namespace":"default"}}`,
 		},
+		{
+			// Scenario params
+			Description: "Get a deleted release",
+			ExistingReleases: []release.Release{
+				createRelease("foo", "foobar", "default", 1, release.StatusUninstalled),
+			},
+			DisableAuth: true,
+			// Request params
+			RequestBody:  "",
+			RequestQuery: "",
+			Action:       "get",
+			Params:       map[string]string{"namespace": "default", "releaseName": "foobar"},
+			// Expected result
+			StatusCode: 200,
+			RemainingReleases: []release.Release{
+				createRelease("foo", "foobar", "default", 1, release.StatusUninstalled),
+			},
+			ResponseBody: `{"data":{"name":"foobar","info":{"status":{"code":2},"deleted":{"seconds":242085845}},"chart":{"metadata":{"name":"foo"},"values":{"raw":"{}\n"}},"config":{"raw":"{}\n"},"version":1,"namespace":"default"}}`,
+		},
 		{
 			// Scenario params
 			Description: "Delete and purge a simple release with purge=1",
@@ -305,11 +330,15 @@ func derefReleases(storage *storage.Storage) []release.Release {
 }
 
 func createRelease(chartName, name, namespace string, version int, status release.Status) release.Release {
+	deleted := helmTime.Time{}
+	if status == release.StatusUninstalled {
+		deleted = testingTime
+	}
 	return release.Release{
 		Name:      name,
 		Namespace: namespace,
 		Version:   version,
-		Info:      &release.Info{Status: status},
+		Info:      &release.Info{Status: status, Deleted: deleted},
 		Chart: &chart.Chart{
 			Metadata: &chart.Metadata{
 				Name: chartName,