From d3578f465d1e41f6fb022f64117f51cbed90fd9d Mon Sep 17 00:00:00 2001 From: carlory Date: Mon, 26 Aug 2019 21:23:40 +0800 Subject: [PATCH] fix static check failures in staging pkg --- hack/.staticcheck_failures | 3 --- .../cli-runtime/pkg/resource/builder_test.go | 5 ++--- .../k8s.io/cli-runtime/pkg/resource/visitor.go | 4 ++-- .../cloud-provider/service/helpers/helper_test.go | 4 ++-- .../k8s.io/sample-controller/controller_test.go | 15 +++++++++------ 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 6d9f33f9d15..815303a8bc0 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -207,7 +207,6 @@ vendor/k8s.io/apiserver/pkg/util/wsstream vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook vendor/k8s.io/apiserver/plugin/pkg/authorizer/webhook -vendor/k8s.io/cli-runtime/pkg/resource vendor/k8s.io/client-go/discovery/cached/memory vendor/k8s.io/client-go/dynamic/fake vendor/k8s.io/client-go/metadata/fake @@ -217,7 +216,6 @@ vendor/k8s.io/client-go/restmapper vendor/k8s.io/client-go/tools/cache vendor/k8s.io/client-go/tools/leaderelection vendor/k8s.io/client-go/transport -vendor/k8s.io/cloud-provider/service/helpers vendor/k8s.io/code-generator/cmd/client-gen/generators/fake vendor/k8s.io/code-generator/cmd/client-gen/generators/util vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf @@ -246,4 +244,3 @@ vendor/k8s.io/kubectl/pkg/scale vendor/k8s.io/legacy-cloud-providers/aws vendor/k8s.io/legacy-cloud-providers/azure vendor/k8s.io/metrics/pkg/client/custom_metrics -vendor/k8s.io/sample-controller diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/builder_test.go b/staging/src/k8s.io/cli-runtime/pkg/resource/builder_test.go index b5d19b38842..a66da89f9a1 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/resource/builder_test.go +++ b/staging/src/k8s.io/cli-runtime/pkg/resource/builder_test.go @@ -54,9 +54,8 @@ import ( ) var ( - corev1GV = schema.GroupVersion{Version: "v1"} - corev1Codec = scheme.Codecs.CodecForVersions(scheme.Codecs.LegacyCodec(corev1GV), scheme.Codecs.UniversalDecoder(corev1GV), corev1GV, corev1GV) - metaAccessor = meta.NewAccessor() + corev1GV = schema.GroupVersion{Version: "v1"} + corev1Codec = scheme.Codecs.CodecForVersions(scheme.Codecs.LegacyCodec(corev1GV), scheme.Codecs.UniversalDecoder(corev1GV), corev1GV, corev1GV) ) func stringBody(body string) io.ReadCloser { diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/visitor.go b/staging/src/k8s.io/cli-runtime/pkg/resource/visitor.go index 946016c1349..d9f4786b14d 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/resource/visitor.go +++ b/staging/src/k8s.io/cli-runtime/pkg/resource/visitor.go @@ -44,8 +44,8 @@ import ( ) const ( - constSTDINstr string = "STDIN" - stopValidateMessage = "if you choose to ignore these errors, turn validation off with --validate=false" + constSTDINstr = "STDIN" + stopValidateMessage = "if you choose to ignore these errors, turn validation off with --validate=false" ) // Watchable describes a resource that can be watched for changes that occur on the server, diff --git a/staging/src/k8s.io/cloud-provider/service/helpers/helper_test.go b/staging/src/k8s.io/cloud-provider/service/helpers/helper_test.go index d342e5a5fa4..eaf8f7f9749 100644 --- a/staging/src/k8s.io/cloud-provider/service/helpers/helper_test.go +++ b/staging/src/k8s.io/cloud-provider/service/helpers/helper_test.go @@ -59,13 +59,13 @@ func TestGetLoadBalancerSourceRanges(t *testing.T) { annotations[v1.AnnotationLoadBalancerSourceRangesKey] = v svc := v1.Service{} svc.Annotations = annotations - cidrs, err := GetLoadBalancerSourceRanges(&svc) + _, err := GetLoadBalancerSourceRanges(&svc) if err != nil { t.Errorf("Unexpected error parsing: %q", v) } svc = v1.Service{} svc.Spec.LoadBalancerSourceRanges = strings.Split(v, ",") - cidrs, err = GetLoadBalancerSourceRanges(&svc) + cidrs, err := GetLoadBalancerSourceRanges(&svc) if err != nil { t.Errorf("Unexpected error parsing: %q", v) } diff --git a/staging/src/k8s.io/sample-controller/controller_test.go b/staging/src/k8s.io/sample-controller/controller_test.go index b24d87ed8ad..c6f103da966 100644 --- a/staging/src/k8s.io/sample-controller/controller_test.go +++ b/staging/src/k8s.io/sample-controller/controller_test.go @@ -175,8 +175,8 @@ func checkAction(expected, actual core.Action, t *testing.T) { } switch a := actual.(type) { - case core.CreateAction: - e, _ := expected.(core.CreateAction) + case core.CreateActionImpl: + e, _ := expected.(core.CreateActionImpl) expObject := e.GetObject() object := a.GetObject() @@ -184,8 +184,8 @@ func checkAction(expected, actual core.Action, t *testing.T) { t.Errorf("Action %s %s has wrong object\nDiff:\n %s", a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object)) } - case core.UpdateAction: - e, _ := expected.(core.UpdateAction) + case core.UpdateActionImpl: + e, _ := expected.(core.UpdateActionImpl) expObject := e.GetObject() object := a.GetObject() @@ -193,8 +193,8 @@ func checkAction(expected, actual core.Action, t *testing.T) { t.Errorf("Action %s %s has wrong object\nDiff:\n %s", a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object)) } - case core.PatchAction: - e, _ := expected.(core.PatchAction) + case core.PatchActionImpl: + e, _ := expected.(core.PatchActionImpl) expPatch := e.GetPatch() patch := a.GetPatch() @@ -202,6 +202,9 @@ func checkAction(expected, actual core.Action, t *testing.T) { t.Errorf("Action %s %s has wrong patch\nDiff:\n %s", a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expPatch, patch)) } + default: + t.Errorf("Uncaptured Action %s %s, you should explicitly add a case to capture it", + actual.GetVerb(), actual.GetResource().Resource) } }