From cb6d48e6ae553ddd95ac838ae45fb7c0aabbfa71 Mon Sep 17 00:00:00 2001
From: Austin Abro <AustinAbro321@gmail.com>
Date: Sun, 5 Jan 2025 15:11:05 +0000
Subject: [PATCH] status wait

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
---
 pkg/kube/client.go                             |  2 +-
 pkg/kube/{kwait.go => statuswait.go}           | 10 +++++-----
 pkg/kube/{kwait_test.go => statuswait_test.go} | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename pkg/kube/{kwait.go => statuswait.go} (92%)
 rename pkg/kube/{kwait_test.go => statuswait_test.go} (97%)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 45d842c4a..91b09eb65 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -123,7 +123,7 @@ func New(getter genericclioptions.RESTClientGetter, waiter Waiter) (*Client, err
 		if err != nil {
 			return nil, err
 		}
-		waiter = &kstatusWaiter{
+		waiter = &statusWaiter{
 			sw:  sw,
 			log: nopLogger,
 		}
diff --git a/pkg/kube/kwait.go b/pkg/kube/statuswait.go
similarity index 92%
rename from pkg/kube/kwait.go
rename to pkg/kube/statuswait.go
index 1eb1c2053..d58e34cdc 100644
--- a/pkg/kube/kwait.go
+++ b/pkg/kube/statuswait.go
@@ -33,24 +33,24 @@ import (
 	"sigs.k8s.io/cli-utils/pkg/object"
 )
 
-type kstatusWaiter struct {
+type statusWaiter struct {
 	sw  watcher.StatusWatcher
 	log func(string, ...interface{})
 }
 
-func (w *kstatusWaiter) Wait(resourceList ResourceList, timeout time.Duration) error {
+func (w *statusWaiter) Wait(resourceList ResourceList, timeout time.Duration) error {
 	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
 	defer cancel()
 	return w.wait(ctx, resourceList, false)
 }
 
-func (w *kstatusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Duration) error {
+func (w *statusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Duration) error {
 	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
 	defer cancel()
 	return w.wait(ctx, resourceList, true)
 }
 
-func (w *kstatusWaiter) waitForDelete(ctx context.Context, resourceList ResourceList) error {
+func (w *statusWaiter) waitForDelete(ctx context.Context, resourceList ResourceList) error {
 	cancelCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
 	runtimeObjs := []runtime.Object{}
@@ -109,7 +109,7 @@ func (w *kstatusWaiter) waitForDelete(ctx context.Context, resourceList Resource
 	return nil
 }
 
-func (w *kstatusWaiter) wait(ctx context.Context, resourceList ResourceList, waitForJobs bool) error {
+func (w *statusWaiter) wait(ctx context.Context, resourceList ResourceList, waitForJobs bool) error {
 	cancelCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
 	runtimeObjs := []runtime.Object{}
diff --git a/pkg/kube/kwait_test.go b/pkg/kube/statuswait_test.go
similarity index 97%
rename from pkg/kube/kwait_test.go
rename to pkg/kube/statuswait_test.go
index 1e67bfa75..31211d226 100644
--- a/pkg/kube/kwait_test.go
+++ b/pkg/kube/statuswait_test.go
@@ -116,7 +116,7 @@ func getGVR(t *testing.T, mapper meta.RESTMapper, obj *unstructured.Unstructured
 	return mapping.Resource
 }
 
-func TestKWaitForDelete(t *testing.T) {
+func TestStatusWaitForDelete(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		name        string
@@ -132,7 +132,7 @@ func TestKWaitForDelete(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// t.Parallel()
+			t.Parallel()
 			c := newTestClient(t)
 			fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme)
 			fakeMapper := testutil.NewFakeRESTMapper(
@@ -141,7 +141,7 @@ func TestKWaitForDelete(t *testing.T) {
 				batchv1.SchemeGroupVersion.WithKind("Job"),
 			)
 			statusWatcher := watcher.NewDefaultStatusWatcher(fakeClient, fakeMapper)
-			kwaiter := kstatusWaiter{
+			kwaiter := statusWaiter{
 				sw:  statusWatcher,
 				log: log.Printf,
 			}
@@ -180,7 +180,7 @@ func TestKWaitForDelete(t *testing.T) {
 
 }
 
-func TestKWait(t *testing.T) {
+func TestStatusWait(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		name        string
@@ -224,7 +224,7 @@ func TestKWait(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// t.Parallel()
+			t.Parallel()
 			c := newTestClient(t)
 			fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme)
 			fakeMapper := testutil.NewFakeRESTMapper(
@@ -244,7 +244,7 @@ func TestKWait(t *testing.T) {
 				err = fakeClient.Tracker().Create(gvr, resource, resource.GetNamespace())
 				assert.NoError(t, err)
 			}
-			kwaiter := kstatusWaiter{
+			kwaiter := statusWaiter{
 				sw:  statusWatcher,
 				log: log.Printf,
 			}