From 0a703e351728db9469d0b7bac98fba673bc0f1c4 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 24 Jan 2025 17:03:29 -0500 Subject: [PATCH] Linter to ensure go-cmp/cmp is used ONLY in tests Signed-off-by: Davanum Srinivas Kubernetes-commit: 4e05bc20db99ff89b2d2205218d24b9935a7fdd7 --- pkg/admission/testing/helpers.go | 2 +- pkg/endpoints/discovery/aggregated/fake.go | 2 +- pkg/storage/testing/store_tests.go | 2 +- pkg/storage/testing/utils.go | 2 +- pkg/util/flowcontrol/apf_controller.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/admission/testing/helpers.go b/pkg/admission/testing/helpers.go index 76dea6d5c..cd1a16528 100644 --- a/pkg/admission/testing/helpers.go +++ b/pkg/admission/testing/helpers.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp" //nolint:depguard apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/admission" diff --git a/pkg/endpoints/discovery/aggregated/fake.go b/pkg/endpoints/discovery/aggregated/fake.go index e3c7fcfa7..4146dc011 100644 --- a/pkg/endpoints/discovery/aggregated/fake.go +++ b/pkg/endpoints/discovery/aggregated/fake.go @@ -25,7 +25,7 @@ import ( "time" "github.com/emicklei/go-restful/v3" - "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp" //nolint:depguard apidiscoveryv2 "k8s.io/api/apidiscovery/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/storage/testing/store_tests.go b/pkg/storage/testing/store_tests.go index c70d774c0..be2100522 100644 --- a/pkg/storage/testing/store_tests.go +++ b/pkg/storage/testing/store_tests.go @@ -28,7 +28,7 @@ import ( "sync" "testing" - "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp" //nolint:depguard apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" diff --git a/pkg/storage/testing/utils.go b/pkg/storage/testing/utils.go index 2e107a237..b1e931658 100644 --- a/pkg/storage/testing/utils.go +++ b/pkg/storage/testing/utils.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp" //nolint:depguard "k8s.io/apimachinery/pkg/api/meta" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" diff --git a/pkg/util/flowcontrol/apf_controller.go b/pkg/util/flowcontrol/apf_controller.go index c707884e1..652ef57ab 100644 --- a/pkg/util/flowcontrol/apf_controller.go +++ b/pkg/util/flowcontrol/apf_controller.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp" //nolint:depguard apiequality "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"