github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100993 from mozillazg/fix-staticcheck-failed-registry-rest-resttest

Browse Source 
Fix staticcheck failures for vendor/k8s.io/apiserver/pkg/registry/rest/resttest
This commit is contained in:
Kubernetes Prow Robot 2021-05-06 07:07:16 -07:00 committed by GitHub
commit bd6f5c2e64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -8,7 +8,6 @@ vendor/k8s.io/apimachinery/pkg/util/strategicpatch
vendor/k8s.io/apimachinery/pkg/util/wait vendor/k8s.io/apimachinery/pkg/util/wait
vendor/k8s.io/apiserver/pkg/endpoints/filters vendor/k8s.io/apiserver/pkg/endpoints/filters
vendor/k8s.io/apiserver/pkg/endpoints/metrics 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/dynamiccertificates
vendor/k8s.io/apiserver/pkg/server/filters vendor/k8s.io/apiserver/pkg/server/filters
vendor/k8s.io/apiserver/pkg/server/httplog vendor/k8s.io/apiserver/pkg/server/httplog

14
staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go
View File

@ -206,6 +206,8 @@ func (t *Tester) TestDelete(valid runtime.Object, createFn CreateFunc, getFn Get
t.testDeleteNoGraceful(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, false) t.testDeleteNoGraceful(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, false)
t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, dryRunOpts) t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, dryRunOpts)
t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, opts) 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. // Test gracefully deleting an object.
@ -917,12 +919,16 @@ func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn Crea
foo := obj.DeepCopyObject() foo := obj.DeepCopyObject()
t.setObjectMeta(foo, t.namer(1)) t.setObjectMeta(foo, t.namer(1))
objectMeta := t.getObjectMetaOrFail(foo)
objectMeta.SetResourceVersion("RV0000")
if err := createFn(ctx, foo); err != nil { if err := createFn(ctx, foo); err != nil {
t.Errorf("unexpected error: %v", err) 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) _, wasDeleted, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts)
if err == nil || !errors.IsConflict(err) { if err == nil || !errors.IsConflict(err) {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
@ -930,7 +936,7 @@ func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn Crea
if wasDeleted { if wasDeleted {
t.Errorf("unexpected, object %s should not have been deleted immediately", objectMeta.GetName()) 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 { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }