From 445cd35b5c28a5198ea2c1592482a5b2e07e159a Mon Sep 17 00:00:00 2001 From: "M. Habib Rosyad" Date: Tue, 11 Aug 2020 10:19:42 +0700 Subject: [PATCH] fix vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured staticcheck --- hack/.staticcheck_failures | 1 - .../apimachinery/pkg/apis/meta/v1/unstructured/helpers.go | 8 -------- .../apis/meta/v1/unstructured/unstructured_list_test.go | 4 ++-- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 94549364320..fa4158994ac 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -15,7 +15,6 @@ test/integration/scheduler_perf test/integration/ttlcontroller vendor/k8s.io/apimachinery/pkg/api/apitesting/roundtrip vendor/k8s.io/apimachinery/pkg/api/meta -vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation vendor/k8s.io/apimachinery/pkg/conversion diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/helpers.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/helpers.go index 54a231e4933..7b101ea5124 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/helpers.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/helpers.go @@ -282,14 +282,6 @@ func getNestedString(obj map[string]interface{}, fields ...string) string { return val } -func getNestedInt64(obj map[string]interface{}, fields ...string) int64 { - val, found, err := NestedInt64(obj, fields...) - if !found || err != nil { - return 0 - } - return val -} - func getNestedInt64Pointer(obj map[string]interface{}, fields ...string) *int64 { val, found, err := NestedInt64(obj, fields...) if !found || err != nil { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_list_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_list_test.go index 04ada449b95..d3c42b519a0 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_list_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_list_test.go @@ -71,7 +71,7 @@ func TestEmptyCreationTimestampIsOmitted(t *testing.T) { // set an initial creationTimestamp and ensure the field exists u.SetCreationTimestamp(now) metadata := u.Object["metadata"].(map[string]interface{}) - creationTimestamp, exists := metadata["creationTimestamp"] + _, exists := metadata["creationTimestamp"] if !exists { t.Fatalf("unexpected missing creationTimestamp") } @@ -79,7 +79,7 @@ func TestEmptyCreationTimestampIsOmitted(t *testing.T) { // set an empty timestamp and ensure the field no longer exists u.SetCreationTimestamp(metav1.Time{}) metadata = u.Object["metadata"].(map[string]interface{}) - creationTimestamp, exists = metadata["creationTimestamp"] + creationTimestamp, exists := metadata["creationTimestamp"] if exists { t.Errorf("unexpected creation timestamp field: %q", creationTimestamp) }