From f58bc396144ac0724f945ed78303b7dcdb20610c Mon Sep 17 00:00:00 2001
From: Soujanya Mangipudi <somangip@microsoft.com>
Date: Fri, 9 Sep 2022 11:51:25 -0700
Subject: [PATCH] fix tests

Signed-off-by: Soujanya Mangipudi <somangip@microsoft.com>
---
 cmd/helm/status.go                                  |  2 +-
 cmd/helm/status_test.go                             | 12 ++----------
 cmd/helm/testdata/output/status-with-resources.json |  2 +-
 cmd/helm/testdata/output/status-with-resources.txt  |  3 ---
 pkg/kube/fake/printer.go                            |  5 +++--
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/cmd/helm/status.go b/cmd/helm/status.go
index 95c25b735..a482bf18d 100644
--- a/cmd/helm/status.go
+++ b/cmd/helm/status.go
@@ -130,7 +130,7 @@ func (s statusPrinter) WriteTable(out io.Writer) error {
 		fmt.Fprintf(out, "DESCRIPTION: %s\n", s.release.Info.Description)
 	}
 
-	if s.showResources && len(s.release.Info.Resources) > 0 {
+	if s.showResources && s.release.Info.Resources != nil && len(s.release.Info.Resources) > 0 {
 		buf := new(bytes.Buffer)
 		printFlags := get.NewHumanPrintFlags()
 		typePrinter, _ := printFlags.ToPrinter("")
diff --git a/cmd/helm/status_test.go b/cmd/helm/status_test.go
index f6067497e..1c46010d8 100644
--- a/cmd/helm/status_test.go
+++ b/cmd/helm/status_test.go
@@ -19,9 +19,7 @@ package main
 import (
 	"testing"
 	"time"
-
-	"k8s.io/apimachinery/pkg/runtime"
-
+	
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/release"
 	helmtime "helm.sh/helm/v3/pkg/time"
@@ -76,9 +74,6 @@ func TestStatusCmd(t *testing.T) {
 		golden: "output/status-with-resources.txt",
 		rels: releasesMockWithStatus(
 			&release.Info{
-				Resources: map[string][]runtime.Object{
-					"test": {},
-				},
 				Status: release.StatusDeployed,
 			},
 		),
@@ -87,10 +82,7 @@ func TestStatusCmd(t *testing.T) {
 		cmd:    "status --show-resources flummoxed-chickadee -o json",
 		golden: "output/status-with-resources.json",
 		rels: releasesMockWithStatus(
-			&release.Info{
-				Resources: map[string][]runtime.Object{
-					"test": {},
-				},
+			&release.Info{				
 				Status: release.StatusDeployed,
 			},
 		),
diff --git a/cmd/helm/testdata/output/status-with-resources.json b/cmd/helm/testdata/output/status-with-resources.json
index dcad16679..275e0cfc6 100644
--- a/cmd/helm/testdata/output/status-with-resources.json
+++ b/cmd/helm/testdata/output/status-with-resources.json
@@ -1 +1 @@
-{"name":"flummoxed-chickadee","info":{"first_deployed":"","last_deployed":"2016-01-16T00:00:00Z","deleted":"","status":"deployed","resources":{"test":[]}},"namespace":"default"}
+{"name":"flummoxed-chickadee","info":{"first_deployed":"","last_deployed":"2016-01-16T00:00:00Z","deleted":"","status":"deployed"},"namespace":"default"}
diff --git a/cmd/helm/testdata/output/status-with-resources.txt b/cmd/helm/testdata/output/status-with-resources.txt
index f7a10ce37..a326c3db0 100644
--- a/cmd/helm/testdata/output/status-with-resources.txt
+++ b/cmd/helm/testdata/output/status-with-resources.txt
@@ -3,7 +3,4 @@ LAST DEPLOYED: Sat Jan 16 00:00:00 2016
 NAMESPACE: default
 STATUS: deployed
 REVISION: 0
-RESOURCES:
-==> test
-
 TEST SUITE: None
diff --git a/pkg/kube/fake/printer.go b/pkg/kube/fake/printer.go
index d49ff15bb..5f55692d8 100644
--- a/pkg/kube/fake/printer.go
+++ b/pkg/kube/fake/printer.go
@@ -22,6 +22,7 @@ import (
 	"time"
 
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/resource"
 
 	"helm.sh/helm/v3/pkg/kube"
@@ -50,9 +51,9 @@ func (p *PrintingKubeClient) Create(resources kube.ResourceList) (*kube.Result,
 func (p *PrintingKubeClient) Get(resources kube.ResourceList, reader io.Reader) (string, error) {
 	_, err := io.Copy(p.Out, bufferize(resources))
 	if err != nil {
-		return "", err
+		return nil, err
 	}
-	return "", nil
+	return make(map[string][]runtime.Object), nil
 }
 
 func (p *PrintingKubeClient) Wait(resources kube.ResourceList, _ time.Duration) error {