status wait

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
pull/13604/head
Austin Abro 9 months ago
parent 4dd6e19b1d
commit cb6d48e6ae
No known key found for this signature in database
GPG Key ID: 92EB5159E403F9D6

@ -123,7 +123,7 @@ func New(getter genericclioptions.RESTClientGetter, waiter Waiter) (*Client, err
if err != nil { if err != nil {
return nil, err return nil, err
} }
waiter = &kstatusWaiter{ waiter = &statusWaiter{
sw: sw, sw: sw,
log: nopLogger, log: nopLogger,
} }

@ -33,24 +33,24 @@ import (
"sigs.k8s.io/cli-utils/pkg/object" "sigs.k8s.io/cli-utils/pkg/object"
) )
type kstatusWaiter struct { type statusWaiter struct {
sw watcher.StatusWatcher sw watcher.StatusWatcher
log func(string, ...interface{}) 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) ctx, cancel := context.WithTimeout(context.TODO(), timeout)
defer cancel() defer cancel()
return w.wait(ctx, resourceList, false) 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) ctx, cancel := context.WithTimeout(context.TODO(), timeout)
defer cancel() defer cancel()
return w.wait(ctx, resourceList, true) 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) cancelCtx, cancel := context.WithCancel(ctx)
defer cancel() defer cancel()
runtimeObjs := []runtime.Object{} runtimeObjs := []runtime.Object{}
@ -109,7 +109,7 @@ func (w *kstatusWaiter) waitForDelete(ctx context.Context, resourceList Resource
return nil 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) cancelCtx, cancel := context.WithCancel(ctx)
defer cancel() defer cancel()
runtimeObjs := []runtime.Object{} runtimeObjs := []runtime.Object{}

@ -116,7 +116,7 @@ func getGVR(t *testing.T, mapper meta.RESTMapper, obj *unstructured.Unstructured
return mapping.Resource return mapping.Resource
} }
func TestKWaitForDelete(t *testing.T) { func TestStatusWaitForDelete(t *testing.T) {
t.Parallel() t.Parallel()
tests := []struct { tests := []struct {
name string name string
@ -132,7 +132,7 @@ func TestKWaitForDelete(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
// t.Parallel() t.Parallel()
c := newTestClient(t) c := newTestClient(t)
fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme) fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme)
fakeMapper := testutil.NewFakeRESTMapper( fakeMapper := testutil.NewFakeRESTMapper(
@ -141,7 +141,7 @@ func TestKWaitForDelete(t *testing.T) {
batchv1.SchemeGroupVersion.WithKind("Job"), batchv1.SchemeGroupVersion.WithKind("Job"),
) )
statusWatcher := watcher.NewDefaultStatusWatcher(fakeClient, fakeMapper) statusWatcher := watcher.NewDefaultStatusWatcher(fakeClient, fakeMapper)
kwaiter := kstatusWaiter{ kwaiter := statusWaiter{
sw: statusWatcher, sw: statusWatcher,
log: log.Printf, log: log.Printf,
} }
@ -180,7 +180,7 @@ func TestKWaitForDelete(t *testing.T) {
} }
func TestKWait(t *testing.T) { func TestStatusWait(t *testing.T) {
t.Parallel() t.Parallel()
tests := []struct { tests := []struct {
name string name string
@ -224,7 +224,7 @@ func TestKWait(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
// t.Parallel() t.Parallel()
c := newTestClient(t) c := newTestClient(t)
fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme) fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme)
fakeMapper := testutil.NewFakeRESTMapper( fakeMapper := testutil.NewFakeRESTMapper(
@ -244,7 +244,7 @@ func TestKWait(t *testing.T) {
err = fakeClient.Tracker().Create(gvr, resource, resource.GetNamespace()) err = fakeClient.Tracker().Create(gvr, resource, resource.GetNamespace())
assert.NoError(t, err) assert.NoError(t, err)
} }
kwaiter := kstatusWaiter{ kwaiter := statusWaiter{
sw: statusWatcher, sw: statusWatcher,
log: log.Printf, log: log.Printf,
} }
Loading…
Cancel
Save