diff --git a/go.mod b/go.mod index aec0b8f211..42c6fa7388 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/fsnotify/fsnotify v1.5.1 github.com/go-logr/logr v1.2.0 github.com/go-logr/zapr v1.2.0 - github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.1.1 github.com/onsi/gomega v1.18.0 github.com/prometheus/client_golang v1.11.0 @@ -43,6 +42,7 @@ require ( github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/common v0.28.0 // indirect github.com/prometheus/procfs v0.6.0 // indirect diff --git a/pkg/builder/builder_suite_test.go b/pkg/builder/builder_suite_test.go index 59f9dd3f9e..6e861afcb4 100644 --- a/pkg/builder/builder_suite_test.go +++ b/pkg/builder/builder_suite_test.go @@ -37,7 +37,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" ) -var suiteName = "application Suite" +const suiteName = "application Suite" func TestBuilder(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/cache/cache_suite_test.go b/pkg/cache/cache_suite_test.go index 5361001aad..1c41593040 100644 --- a/pkg/cache/cache_suite_test.go +++ b/pkg/cache/cache_suite_test.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Cache Suite" +const suiteName = "Cache Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/cache/internal/internal_suite_test.go b/pkg/cache/internal/internal_suite_test.go index 8b0e734c64..3f3af9d820 100644 --- a/pkg/cache/internal/internal_suite_test.go +++ b/pkg/cache/internal/internal_suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Cache Internal Suite" +const suiteName = "Cache Internal Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/client/apiutil/apiutil_suite_test.go b/pkg/client/apiutil/apiutil_suite_test.go index 3c1b8a118f..1619c0417b 100644 --- a/pkg/client/apiutil/apiutil_suite_test.go +++ b/pkg/client/apiutil/apiutil_suite_test.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "API Utilities Test Suite" +const suiteName = "API Utilities Test Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/client/client_suite_test.go b/pkg/client/client_suite_test.go index 73fc6962fd..3e5acc4a07 100644 --- a/pkg/client/client_suite_test.go +++ b/pkg/client/client_suite_test.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Client Suite" +const suiteName = "Client Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/client/config/config_suite_test.go b/pkg/client/config/config_suite_test.go index 56e0389a97..7a97214a44 100644 --- a/pkg/client/config/config_suite_test.go +++ b/pkg/client/config/config_suite_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Client Config Test Suite" +const suiteName = "Client Config Test Suite" func TestConfig(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/client/fake/client_suite_test.go b/pkg/client/fake/client_suite_test.go index d22fbbb8bb..d5b42ed413 100644 --- a/pkg/client/fake/client_suite_test.go +++ b/pkg/client/fake/client_suite_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Fake client Suite" +const suiteName = "Fake client Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/cluster/cluster_suite_test.go b/pkg/cluster/cluster_suite_test.go index 14c599fc1a..348b2bd5da 100644 --- a/pkg/cluster/cluster_suite_test.go +++ b/pkg/cluster/cluster_suite_test.go @@ -31,7 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Cluster Suite" +const suiteName = "Cluster Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/config/config_suite_test.go b/pkg/config/config_suite_test.go index f9728a575f..8b3eda86ae 100644 --- a/pkg/config/config_suite_test.go +++ b/pkg/config/config_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Config Suite" +const suiteName = "Config Suite" func TestScheme(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/controller/controller_suite_test.go b/pkg/controller/controller_suite_test.go index df99f70f72..a76e05bf3c 100644 --- a/pkg/controller/controller_suite_test.go +++ b/pkg/controller/controller_suite_test.go @@ -37,7 +37,7 @@ import ( crscheme "sigs.k8s.io/controller-runtime/pkg/scheme" ) -var suiteName = "Controller Integration Suite" +const suiteName = "Controller Integration Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/controller/controllerutil/controllerutil_suite_test.go b/pkg/controller/controllerutil/controllerutil_suite_test.go index e39805522f..11da263807 100644 --- a/pkg/controller/controllerutil/controllerutil_suite_test.go +++ b/pkg/controller/controllerutil/controllerutil_suite_test.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Controllerutil Suite" +const suiteName = "Controllerutil Suite" func TestControllerutil(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/envtest/envtest_suite_test.go b/pkg/envtest/envtest_suite_test.go index d4155601a1..278783093c 100644 --- a/pkg/envtest/envtest_suite_test.go +++ b/pkg/envtest/envtest_suite_test.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Envtest Suite" +const suiteName = "Envtest Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/finalizer/finalizer_test.go b/pkg/finalizer/finalizer_test.go index a984fdd9b5..5c32b945b8 100644 --- a/pkg/finalizer/finalizer_test.go +++ b/pkg/finalizer/finalizer_test.go @@ -23,7 +23,7 @@ func (f mockFinalizer) Finalize(context.Context, client.Object) (Result, error) return f.result, f.err } -var suiteName = "Finalizer Suite" +const suiteName = "Finalizer Suite" func TestFinalizer(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/handler/eventhandler_suite_test.go b/pkg/handler/eventhandler_suite_test.go index 963bda0b80..bec74253cc 100644 --- a/pkg/handler/eventhandler_suite_test.go +++ b/pkg/handler/eventhandler_suite_test.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Eventhandler Suite" +const suiteName = "Eventhandler Suite" func TestEventhandler(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/healthz/healthz_suite_test.go b/pkg/healthz/healthz_suite_test.go index 5f779a7571..c1ca64b8b2 100644 --- a/pkg/healthz/healthz_suite_test.go +++ b/pkg/healthz/healthz_suite_test.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Healthz Suite" +const suiteName = "Healthz Suite" func TestHealthz(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/internal/controller/controller_suite_test.go b/pkg/internal/controller/controller_suite_test.go index 777a02be0d..b13639aa94 100644 --- a/pkg/internal/controller/controller_suite_test.go +++ b/pkg/internal/controller/controller_suite_test.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Controller internal Suite" +const suiteName = "Controller internal Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/internal/recorder/recorder_suite_test.go b/pkg/internal/recorder/recorder_suite_test.go index 8a156fc754..77dc4d4f44 100644 --- a/pkg/internal/recorder/recorder_suite_test.go +++ b/pkg/internal/recorder/recorder_suite_test.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Recorder Integration Suite" +const suiteName = "Recorder Integration Suite" func TestRecorder(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/internal/testing/addr/addr_suite_test.go b/pkg/internal/testing/addr/addr_suite_test.go index 154a809766..4d4132fa7f 100644 --- a/pkg/internal/testing/addr/addr_suite_test.go +++ b/pkg/internal/testing/addr/addr_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Addr Suite" +const suiteName = "Addr Suite" func TestAddr(t *testing.T) { t.Parallel() diff --git a/pkg/internal/testing/certs/certs_suite_test.go b/pkg/internal/testing/certs/certs_suite_test.go index b3201210bc..dc1217f6a5 100644 --- a/pkg/internal/testing/certs/certs_suite_test.go +++ b/pkg/internal/testing/certs/certs_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "TinyCA (Internal Certs) Suite" +const suiteName = "TinyCA (Internal Certs) Suite" func TestInternal(t *testing.T) { t.Parallel() diff --git a/pkg/internal/testing/controlplane/controlplane_suite_test.go b/pkg/internal/testing/controlplane/controlplane_suite_test.go index 3874a44d8e..209f51cb91 100644 --- a/pkg/internal/testing/controlplane/controlplane_suite_test.go +++ b/pkg/internal/testing/controlplane/controlplane_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Control Plane Standup Unit Tests" +const suiteName = "Control Plane Standup Unit Tests" func TestIntegration(t *testing.T) { t.Parallel() diff --git a/pkg/internal/testing/process/process_suite_test.go b/pkg/internal/testing/process/process_suite_test.go index 039e82035d..614313aa40 100644 --- a/pkg/internal/testing/process/process_suite_test.go +++ b/pkg/internal/testing/process/process_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Envtest Process Launcher Suite" +const suiteName = "Envtest Process Launcher Suite" func TestInternal(t *testing.T) { t.Parallel() diff --git a/pkg/log/log_suite_test.go b/pkg/log/log_suite_test.go index bb276b41f3..bdc75d2912 100644 --- a/pkg/log/log_suite_test.go +++ b/pkg/log/log_suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Log Suite" +const suiteName = "Log Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/log/zap/zap_suite_test.go b/pkg/log/zap/zap_suite_test.go index 65e5f33e15..c151a07e06 100644 --- a/pkg/log/zap/zap_suite_test.go +++ b/pkg/log/zap/zap_suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Zap Log Suite" +const suiteName = "Zap Log Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/manager/manager_suite_test.go b/pkg/manager/manager_suite_test.go index 283976e90b..96b5eb4e76 100644 --- a/pkg/manager/manager_suite_test.go +++ b/pkg/manager/manager_suite_test.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics" ) -var suiteName = "Manager Suite" +const suiteName = "Manager Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/manager/signals/signals_suite_test.go b/pkg/manager/signals/signals_suite_test.go index 9dbdd28bd5..dc8375648b 100644 --- a/pkg/manager/signals/signals_suite_test.go +++ b/pkg/manager/signals/signals_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Runtime Signal Suite" +const suiteName = "Runtime Signal Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/predicate/predicate_suite_test.go b/pkg/predicate/predicate_suite_test.go index ddeb4b081c..a98b4b5a28 100644 --- a/pkg/predicate/predicate_suite_test.go +++ b/pkg/predicate/predicate_suite_test.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Predicate Suite" +const suiteName = "Predicate Suite" func TestPredicate(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/reconcile/reconcile_suite_test.go b/pkg/reconcile/reconcile_suite_test.go index 7c9074594a..da1a99dd4d 100644 --- a/pkg/reconcile/reconcile_suite_test.go +++ b/pkg/reconcile/reconcile_suite_test.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Reconcile Suite" +const suiteName = "Reconcile Suite" func TestReconcile(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/runtime/inject/inject_suite_test.go b/pkg/runtime/inject/inject_suite_test.go index 26cdbe4d42..c7d4244976 100644 --- a/pkg/runtime/inject/inject_suite_test.go +++ b/pkg/runtime/inject/inject_suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Runtime Injection Suite" +const suiteName = "Runtime Injection Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/scheme/scheme_suite_test.go b/pkg/scheme/scheme_suite_test.go index c9ecd30e7e..26c46ce0a4 100644 --- a/pkg/scheme/scheme_suite_test.go +++ b/pkg/scheme/scheme_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) -var suiteName = "Scheme Suite" +const suiteName = "Scheme Suite" func TestScheme(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/source/internal/internal_suite_test.go b/pkg/source/internal/internal_suite_test.go index dfa46ca4ff..75af16a26e 100644 --- a/pkg/source/internal/internal_suite_test.go +++ b/pkg/source/internal/internal_suite_test.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Source Internal Suite" +const suiteName = "Source Internal Suite" func TestInternal(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/source/source_suite_test.go b/pkg/source/source_suite_test.go index b7d2a48e28..13f580cf31 100644 --- a/pkg/source/source_suite_test.go +++ b/pkg/source/source_suite_test.go @@ -32,7 +32,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Source Suite" +const suiteName = "Source Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/webhook/admission/admission_suite_test.go b/pkg/webhook/admission/admission_suite_test.go index 243b9917f3..b3955a73cf 100644 --- a/pkg/webhook/admission/admission_suite_test.go +++ b/pkg/webhook/admission/admission_suite_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Admission Webhook Suite" +const suiteName = "Admission Webhook Suite" func TestAdmissionWebhook(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/webhook/authentication/authentication_suite_test.go b/pkg/webhook/authentication/authentication_suite_test.go index 6fd049daf6..9e9ecd81f1 100644 --- a/pkg/webhook/authentication/authentication_suite_test.go +++ b/pkg/webhook/authentication/authentication_suite_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Authentication Webhook Suite" +const suiteName = "Authentication Webhook Suite" func TestAuthenticationWebhook(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/webhook/conversion/conversion_suite_test.go b/pkg/webhook/conversion/conversion_suite_test.go index 0f75a44f32..44d7f0f28f 100644 --- a/pkg/webhook/conversion/conversion_suite_test.go +++ b/pkg/webhook/conversion/conversion_suite_test.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "CRD conversion Suite" +const suiteName = "CRD conversion Suite" func TestConversionWebhook(t *testing.T) { RegisterFailHandler(Fail) diff --git a/pkg/webhook/webhook_suite_test.go b/pkg/webhook/webhook_suite_test.go index 187c192994..4e18903ba8 100644 --- a/pkg/webhook/webhook_suite_test.go +++ b/pkg/webhook/webhook_suite_test.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" ) -var suiteName = "Webhook Integration Suite" +const suiteName = "Webhook Integration Suite" func TestSource(t *testing.T) { RegisterFailHandler(Fail)