refactor obj logic

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>

pkg/kube/client_test.go

@@ -658,7 +658,7 @@ func TestWaitDelete(t *testing.T) {
 }
 
 func TestReal(t *testing.T) {
-	// t.Skip("This is a live test, comment this line to run")
+	t.Skip("This is a live test, comment this line to run")
 	c, err := New(nil, StatusWaiterStrategy)
 	if err != nil {
 		t.Fatal(err)

pkg/kube/statuswait.go

@@ -24,7 +24,6 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/cli-utils/pkg/kstatus/polling/aggregator"
 	"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
 	"sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
@@ -61,13 +60,9 @@ func (w *statusWaiter) waitForDelete(ctx context.Context, resourceList ResourceL
 	w.log("beginning wait for %d resources to be deleted with timeout of %v", len(resourceList), time.Until(deadline))
 	cancelCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
-	runtimeObjs := []runtime.Object{}
-	for _, resource := range resourceList {
-		runtimeObjs = append(runtimeObjs, resource.Object)
-	}
 	resources := []object.ObjMetadata{}
-	for _, runtimeObj := range runtimeObjs {
+	for _, resource := range resourceList {
-		obj, err := object.RuntimeToObjMeta(runtimeObj)
+		obj, err := object.RuntimeToObjMeta(resource.Object)
 		if err != nil {
 			return err
 		}
@@ -104,7 +99,7 @@ func (w *statusWaiter) wait(ctx context.Context, resourceList ResourceList, wait
 	w.log("beginning wait for %d resources with timeout of %v", len(resourceList), deadline)
 	cancelCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
-	runtimeObjs := []runtime.Object{}
+	resources := []object.ObjMetadata{}
 	for _, resource := range resourceList {
 		switch value := AsVersioned(resource).(type) {
 		case *batchv1.Job:
@@ -116,16 +111,13 @@ func (w *statusWaiter) wait(ctx context.Context, resourceList ResourceList, wait
 				continue
 			}
 		}
-		runtimeObjs = append(runtimeObjs, resource.Object)
+		obj, err := object.RuntimeToObjMeta(resource.Object)
-	}
-	resources := []object.ObjMetadata{}
-	for _, runtimeObj := range runtimeObjs {
-		obj, err := object.RuntimeToObjMeta(runtimeObj)
 		if err != nil {
 			return err
 		}
 		resources = append(resources, obj)
 	}
+
 	eventCh := w.sw.Watch(cancelCtx, resources, watcher.Options{})
 	statusCollector := collector.NewResourceStatusCollector(resources)
 	go logResourceStatus(cancelCtx, resources, statusCollector, status.CurrentStatus, w.log)

pkg/kube/wait.go

@@ -40,7 +40,7 @@ import (
 )
 
 // HelmWaiter is the legacy implementation of the Waiter interface. This logic was used by default in Helm 3
-// Helm 4 now uses the StatusWaiter interface instead
+// Helm 4 now uses the StatusWaiter implementation instead
 type HelmWaiter struct {
 	c          ReadyChecker
 	log        func(string, ...interface{})