From bf4b687509fd4a5dd67c2352345859fe50770570 Mon Sep 17 00:00:00 2001 From: Louis Shawn Date: Fri, 6 Feb 2026 09:40:03 +0800 Subject: [PATCH] chore(lint): drop dot-import nolints in tests --- .golangci.yml | 3 ++- controllers/openstackcluster_controller_test.go | 4 ++-- controllers/openstackfloatingippool_controller_test.go | 4 ++-- controllers/openstackmachine_controller_test.go | 4 ++-- controllers/openstackmachinetemplate_controller_test.go | 2 +- controllers/openstackserver_controller_test.go | 4 ++-- controllers/suite_test.go | 4 ++-- pkg/cloud/services/compute/instance_test.go | 2 +- pkg/cloud/services/compute/instance_types_test.go | 2 +- pkg/cloud/services/compute/referenced_resources_test.go | 2 +- pkg/cloud/services/loadbalancer/loadbalancer_test.go | 2 +- pkg/cloud/services/networking/floatingip_test.go | 2 +- pkg/cloud/services/networking/network_test.go | 2 +- pkg/cloud/services/networking/port_test.go | 2 +- pkg/cloud/services/networking/router_test.go | 2 +- pkg/cloud/services/networking/securitygroups_test.go | 2 +- pkg/cloud/services/networking/trunk_test.go | 2 +- pkg/webhooks/openstackcluster_webhook_test.go | 2 +- pkg/webhooks/openstackmachinetemplate_webhook_test.go | 2 +- pkg/webhooks/openstackserver_webhook_test.go | 2 +- 20 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index c0aa7e39da..a77c1517bc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -163,7 +163,8 @@ linters: - linters: - revive - staticcheck - path: (test)/.*.go + path: '.*_test\.go$' + source: '\. "github\.com/onsi/(ginkgo|gomega)' text: should not use dot imports - linters: - revive diff --git a/controllers/openstackcluster_controller_test.go b/controllers/openstackcluster_controller_test.go index 23f46c2dac..b9b1a61e23 100644 --- a/controllers/openstackcluster_controller_test.go +++ b/controllers/openstackcluster_controller_test.go @@ -27,8 +27,8 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/openstackfloatingippool_controller_test.go b/controllers/openstackfloatingippool_controller_test.go index 77adbd7f5d..db3d2169d4 100644 --- a/controllers/openstackfloatingippool_controller_test.go +++ b/controllers/openstackfloatingippool_controller_test.go @@ -19,8 +19,8 @@ package controllers import ( "fmt" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" diff --git a/controllers/openstackmachine_controller_test.go b/controllers/openstackmachine_controller_test.go index 6c11cd8916..e051b64854 100644 --- a/controllers/openstackmachine_controller_test.go +++ b/controllers/openstackmachine_controller_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/go-logr/logr" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/openstackmachinetemplate_controller_test.go b/controllers/openstackmachinetemplate_controller_test.go index 3d0c61afc7..c2790da732 100644 --- a/controllers/openstackmachinetemplate_controller_test.go +++ b/controllers/openstackmachinetemplate_controller_test.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors" "github.com/gophercloud/gophercloud/v2/openstack/image/v2/images" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/controllers/openstackserver_controller_test.go b/controllers/openstackserver_controller_test.go index 17ea7efbd0..22b453ea24 100644 --- a/controllers/openstackserver_controller_test.go +++ b/controllers/openstackserver_controller_test.go @@ -30,8 +30,8 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/portsbinding" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 7312e54cdd..63ad93cf28 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -21,8 +21,8 @@ import ( "path/filepath" "testing" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/cloud/services/compute/instance_test.go b/pkg/cloud/services/compute/instance_test.go index da86f66117..d7bd51cdc9 100644 --- a/pkg/cloud/services/compute/instance_test.go +++ b/pkg/cloud/services/compute/instance_test.go @@ -31,7 +31,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/keypairs" "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/v2/openstack/image/v2/images" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloud/services/compute/instance_types_test.go b/pkg/cloud/services/compute/instance_types_test.go index 4416ed31f4..7693f26dd6 100644 --- a/pkg/cloud/services/compute/instance_types_test.go +++ b/pkg/cloud/services/compute/instance_types_test.go @@ -21,7 +21,7 @@ import ( "github.com/go-logr/logr/testr" "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/cloud/services/compute/referenced_resources_test.go b/pkg/cloud/services/compute/referenced_resources_test.go index 52ae552a45..9530abcb95 100644 --- a/pkg/cloud/services/compute/referenced_resources_test.go +++ b/pkg/cloud/services/compute/referenced_resources_test.go @@ -27,7 +27,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors" "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servergroups" "github.com/gophercloud/gophercloud/v2/openstack/image/v2/images" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/pkg/cloud/services/loadbalancer/loadbalancer_test.go b/pkg/cloud/services/loadbalancer/loadbalancer_test.go index 9a2ec0d61e..52c970c4ad 100644 --- a/pkg/cloud/services/loadbalancer/loadbalancer_test.go +++ b/pkg/cloud/services/loadbalancer/loadbalancer_test.go @@ -30,7 +30,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/monitors" "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/pools" "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/providers" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/pkg/cloud/services/networking/floatingip_test.go b/pkg/cloud/services/networking/floatingip_test.go index 96a125166c..c8f3b7d67b 100644 --- a/pkg/cloud/services/networking/floatingip_test.go +++ b/pkg/cloud/services/networking/floatingip_test.go @@ -21,7 +21,7 @@ import ( "github.com/go-logr/logr/testr" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" "k8s.io/utils/ptr" diff --git a/pkg/cloud/services/networking/network_test.go b/pkg/cloud/services/networking/network_test.go index 01f86191c7..aceb39ddb8 100644 --- a/pkg/cloud/services/networking/network_test.go +++ b/pkg/cloud/services/networking/network_test.go @@ -25,7 +25,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/external" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" "k8s.io/utils/ptr" diff --git a/pkg/cloud/services/networking/port_test.go b/pkg/cloud/services/networking/port_test.go index a215e2efe8..2a6e2f5597 100644 --- a/pkg/cloud/services/networking/port_test.go +++ b/pkg/cloud/services/networking/port_test.go @@ -30,7 +30,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "github.com/onsi/gomega/types" "go.uber.org/mock/gomock" "k8s.io/utils/ptr" diff --git a/pkg/cloud/services/networking/router_test.go b/pkg/cloud/services/networking/router_test.go index 63ffc98f97..0fe7e53f2d 100644 --- a/pkg/cloud/services/networking/router_test.go +++ b/pkg/cloud/services/networking/router_test.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud/v2" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" diff --git a/pkg/cloud/services/networking/securitygroups_test.go b/pkg/cloud/services/networking/securitygroups_test.go index 6dc01b49c2..a1dcd24d33 100644 --- a/pkg/cloud/services/networking/securitygroups_test.go +++ b/pkg/cloud/services/networking/securitygroups_test.go @@ -25,7 +25,7 @@ import ( "github.com/google/uuid" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/rules" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" "k8s.io/utils/ptr" diff --git a/pkg/cloud/services/networking/trunk_test.go b/pkg/cloud/services/networking/trunk_test.go index 8989e89889..340be9965d 100644 --- a/pkg/cloud/services/networking/trunk_test.go +++ b/pkg/cloud/services/networking/trunk_test.go @@ -21,7 +21,7 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" diff --git a/pkg/webhooks/openstackcluster_webhook_test.go b/pkg/webhooks/openstackcluster_webhook_test.go index 7ff7bcdba1..9f3b8c8ffb 100644 --- a/pkg/webhooks/openstackcluster_webhook_test.go +++ b/pkg/webhooks/openstackcluster_webhook_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" "k8s.io/utils/ptr" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" diff --git a/pkg/webhooks/openstackmachinetemplate_webhook_test.go b/pkg/webhooks/openstackmachinetemplate_webhook_test.go index 62ac98318f..5e52e7e597 100644 --- a/pkg/webhooks/openstackmachinetemplate_webhook_test.go +++ b/pkg/webhooks/openstackmachinetemplate_webhook_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" admissionv1 "k8s.io/api/admission/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/pkg/webhooks/openstackserver_webhook_test.go b/pkg/webhooks/openstackserver_webhook_test.go index 42fc21b4eb..bfb8cfeca8 100644 --- a/pkg/webhooks/openstackserver_webhook_test.go +++ b/pkg/webhooks/openstackserver_webhook_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega" admissionv1 "k8s.io/api/admission/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr"