From 92ece853be2969fd8f9716434c8fb062e1ebef9b Mon Sep 17 00:00:00 2001 From: mozillazg Date: Sat, 17 Apr 2021 16:07:19 +0800 Subject: [PATCH] Fix staticcheck failures for vendor/k8s.io/apiserver/pkg/registry/rest/resttest --- hack/.staticcheck_failures | 1 - .../pkg/registry/rest/resttest/resttest.go | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 4921e143c71..ba6791f3f69 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -8,7 +8,6 @@ vendor/k8s.io/apimachinery/pkg/util/strategicpatch vendor/k8s.io/apimachinery/pkg/util/wait vendor/k8s.io/apiserver/pkg/endpoints/filters vendor/k8s.io/apiserver/pkg/endpoints/metrics -vendor/k8s.io/apiserver/pkg/registry/rest/resttest vendor/k8s.io/apiserver/pkg/server/dynamiccertificates vendor/k8s.io/apiserver/pkg/server/filters vendor/k8s.io/apiserver/pkg/server/httplog diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go index 0f53a7edff3..b394da620fa 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go @@ -206,6 +206,8 @@ func (t *Tester) TestDelete(valid runtime.Object, createFn CreateFunc, getFn Get t.testDeleteNoGraceful(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, false) t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, dryRunOpts) t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, opts) + t.testDeleteWithResourceVersion(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, dryRunOpts) + t.testDeleteWithResourceVersion(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, opts) } // Test gracefully deleting an object. @@ -917,12 +919,16 @@ func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn Crea foo := obj.DeepCopyObject() t.setObjectMeta(foo, t.namer(1)) - objectMeta := t.getObjectMetaOrFail(foo) - objectMeta.SetResourceVersion("RV0000") if err := createFn(ctx, foo); err != nil { t.Errorf("unexpected error: %v", err) } - opts.Preconditions = metav1.NewRVDeletionPrecondition("RV1111").Preconditions + newObj, err := getFn(ctx, foo) + if err != nil { + t.Errorf("unexpected error: %v", err) + } + objectMeta := t.getObjectMetaOrFail(newObj) + + opts.Preconditions = metav1.NewRVDeletionPrecondition("wrongVersion").Preconditions _, wasDeleted, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts) if err == nil || !errors.IsConflict(err) { t.Errorf("unexpected error: %v", err) @@ -930,7 +936,7 @@ func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn Crea if wasDeleted { t.Errorf("unexpected, object %s should not have been deleted immediately", objectMeta.GetName()) } - obj, _, err = t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, metav1.NewRVDeletionPrecondition("RV0000")) + obj, _, err = t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, metav1.NewRVDeletionPrecondition(objectMeta.GetResourceVersion())) if err != nil { t.Errorf("unexpected error: %v", err) }