🌱 Bump Golang CI Lint to v1.57.2

.golangci.yml

@@ -56,7 +56,10 @@ linters-settings:
     # TODO(sbuerin) fix remaining findings and set to 20 afterwards
     max-complexity: 30
   gci:
-    local-prefixes: sigs.k8s.io/cluster-api-provider-openstack
+    sections:
+    - standard
+    - default
+    - prefix(sigs.k8s.io/cluster-api-provider-openstack)
   gocritic:
     enabled-tags:
       - diagnostic
@@ -129,10 +132,6 @@ linters-settings:
   nolintlint:
     # https://github.com/golangci/golangci-lint/issues/3228
     allow-unused: true
-  staticcheck:
-    go: "1.20"
-  stylecheck:
-    go: "1.20"
   nestif:
     # minimal complexity of if statements to report, 5 by default
     # TODO(sbuerin) fix remaining findings and set to 5 after:
@@ -174,12 +173,13 @@ issues:
     - stylecheck
     text: "ST1003: should not use underscores in Go names;"
     path: pkg/utils/conversioncommon/.*.go
+  exclude-files:
+  - "zz_generated.*\\.go$"
 
 run:
+  go: "1.22"
   timeout: 10m
   build-tags:
   - e2e
 
-  skip-files:
-    - "zz_generated.*\\.go$"
   allow-parallel-runners: true

api/v1alpha6/conversion_test.go

@@ -196,8 +196,6 @@ func TestFuzzyConversion(t *testing.T) {
 }
 
 func TestNetworksToPorts(t *testing.T) {
-	g := gomega.NewWithT(t)
-
 	const (
 		networkuuid = "55e18f0a-d89a-4d69-b18f-160fb142cb5d"
 		subnetuuid  = "a1b2c3d4-e5f6-7a8b-9c0d-1e2f3a4b5c6d"
@@ -432,6 +430,8 @@ func TestNetworksToPorts(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			g := gomega.NewWithT(t)
+
 			before := &OpenStackMachine{
 				Spec: tt.beforeMachineSpec,
 			}
@@ -448,11 +448,6 @@ func TestNetworksToPorts(t *testing.T) {
 // converted to SecurityGroupFilters, and merged with any existing
 // SecurityGroupFilters.
 func TestPortOptsConvertTo(t *testing.T) {
-	g := gomega.NewWithT(t)
-	scheme := runtime.NewScheme()
-	g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
-	g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
-
 	// Variables used in the tests
 	uuids := []string{"abc123", "123abc"}
 	securityGroupsUuids := []infrav1.SecurityGroupParam{
@@ -522,6 +517,11 @@ func TestPortOptsConvertTo(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			g := gomega.NewWithT(t)
+			scheme := runtime.NewScheme()
+			g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
+			g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
+
 			// The spoke machine template with added PortOpts
 			spokeMachineTemplate := OpenStackMachineTemplate{
 				Spec: OpenStackMachineTemplateSpec{
@@ -555,11 +555,6 @@ func TestPortOptsConvertTo(t *testing.T) {
 func TestMachineConversionControllerSpecFields(t *testing.T) {
 	// This tests that we still do field restoration when the controller modifies ProviderID and InstanceID in the spec
 
-	g := gomega.NewWithT(t)
-	scheme := runtime.NewScheme()
-	g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
-	g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
-
 	// This test machine contains a network definition. If we restore it on
 	// down-conversion it will still have a network definition. If we don't,
 	// the network definition will have become a port definition.
@@ -578,7 +573,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 	tests := []struct {
 		name              string
 		modifyUp          func(*infrav1.OpenStackMachine)
-		testAfter         func(*OpenStackMachine)
+		testAfter         func(gomega.Gomega, *OpenStackMachine)
 		expectNetworkDiff bool
 	}{
 		{
@@ -589,7 +584,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 			modifyUp: func(up *infrav1.OpenStackMachine) {
 				up.Spec.Flavor = "new-flavor"
 			},
-			testAfter: func(after *OpenStackMachine) {
+			testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
 				g.Expect(after.Spec.Flavor).To(gomega.Equal("new-flavor"))
 			},
 			expectNetworkDiff: true,
@@ -599,7 +594,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 			modifyUp: func(up *infrav1.OpenStackMachine) {
 				up.Spec.ProviderID = ptr.To("new-provider-id")
 			},
-			testAfter: func(after *OpenStackMachine) {
+			testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
 				g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
 			},
 			expectNetworkDiff: false,
@@ -609,7 +604,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 			modifyUp: func(up *infrav1.OpenStackMachine) {
 				up.Status.InstanceID = ptr.To("new-instance-id")
 			},
-			testAfter: func(after *OpenStackMachine) {
+			testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
 				g.Expect(after.Spec.InstanceID).To(gomega.Equal(ptr.To("new-instance-id")))
 			},
 			expectNetworkDiff: false,
@@ -620,7 +615,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 				up.Spec.ProviderID = ptr.To("new-provider-id")
 				up.Spec.Flavor = "new-flavor"
 			},
-			testAfter: func(after *OpenStackMachine) {
+			testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
 				g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
 				g.Expect(after.Spec.Flavor).To(gomega.Equal("new-flavor"))
 			},
@@ -630,6 +625,10 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			g := gomega.NewWithT(t)
+			scheme := runtime.NewScheme()
+			g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
+			g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
 			before := testMachine()
 
 			up := infrav1.OpenStackMachine{}
@@ -643,7 +642,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 			g.Expect(after.ConvertFrom(&up)).To(gomega.Succeed())
 
 			if tt.testAfter != nil {
-				tt.testAfter(&after)
+				tt.testAfter(g, &after)
 			}
 
 			if !tt.expectNetworkDiff {

api/v1alpha6/openstackcluster_conversion.go

@@ -277,7 +277,7 @@ func Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
 	}
 
 	// DNSNameservers without NodeCIDR doesn't make sense, so we drop that.
-	if len(in.NodeCIDR) > 0 {
+	if in.NodeCIDR != "" {
 		out.ManagedSubnets = []infrav1.SubnetSpec{
 			{
 				CIDR:           in.NodeCIDR,

api/v1alpha7/openstackcluster_conversion.go

@@ -274,7 +274,7 @@ func Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
 	}
 
 	// DNSNameservers without NodeCIDR doesn't make sense, so we drop that.
-	if len(in.NodeCIDR) > 0 {
+	if in.NodeCIDR != "" {
 		out.ManagedSubnets = []infrav1.SubnetSpec{
 			{
 				CIDR:           in.NodeCIDR,

controllers/openstackcluster_controller_test.go

@@ -30,8 +30,8 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive
+	. "github.com/onsi/gomega"    //nolint:revive
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"

controllers/openstackfloatingippool_controller.go

@@ -369,7 +369,7 @@ func (r *OpenStackFloatingIPPoolReconciler) getIP(ctx context.Context, scope *sc
 	defer func() {
 		tag := pool.GetFloatingIPTag()
 
-		err := wait.ExponentialBackoffWithContext(ctx, backoff, func(ctx context.Context) (bool, error) {
+		err := wait.ExponentialBackoffWithContext(ctx, backoff, func(context.Context) (bool, error) {
 			if err := networkingService.TagFloatingIP(fp.FloatingIP, tag); err != nil {
 				scope.Logger().Error(err, "Failed to tag floating IP, retrying", "ip", fp.FloatingIP, "tag", tag)
 				return false, err

controllers/openstackmachine_controller_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

controllers/suite_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive
+	. "github.com/onsi/gomega"    //nolint:revive
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

hack/tools/Makefile

@@ -15,7 +15,7 @@
 ROOT_DIR_RELATIVE := ../..
 include $(ROOT_DIR_RELATIVE)/common.mk
 
-GOLANGCI_LINT_VERSION := v1.54.2
+GOLANGCI_LINT_VERSION := v1.57.2
 
 UNAME := $(shell uname -s)
 

main_test.go

@@ -21,7 +21,7 @@ import (
 	"crypto/tls"
 	"testing"
 
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
 )

pkg/cloud/services/compute/instance_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	"k8s.io/utils/ptr"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
@@ -54,7 +54,7 @@ func TestService_getImageID(t *testing.T) {
 			testName: "Return image ID when ID given",
 			image:    infrav1.ImageParam{ID: &imageID},
 			want:     imageID,
-			expect:   func(m *mock.MockImageClientMockRecorder) {},
+			expect:   func(*mock.MockImageClientMockRecorder) {},
 			wantErr:  false,
 		},
 		{

pkg/cloud/services/compute/instance_types_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/go-logr/logr/testr"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	corev1 "k8s.io/api/core/v1"
 
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients"

pkg/cloud/services/compute/referenced_resources_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups"
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	"k8s.io/utils/ptr"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"

pkg/cloud/services/compute/servergroup_test.go

@@ -44,18 +44,16 @@ func TestService_GetServerGroupID(t *testing.T) {
 		{
 			testName:         "Return server group ID from filter if only filter (with ID) given",
 			serverGroupParam: &infrav1.ServerGroupParam{ID: ptr.To(serverGroupID1)},
-			expect: func(m *mock.MockComputeClientMockRecorder) {
-			},
-			want:    serverGroupID1,
-			wantErr: false,
+			expect:           func(*mock.MockComputeClientMockRecorder) {},
+			want:             serverGroupID1,
+			wantErr:          false,
 		},
 		{
 			testName:         "Return error if empty filter is given",
 			serverGroupParam: &infrav1.ServerGroupParam{},
-			expect: func(m *mock.MockComputeClientMockRecorder) {
-			},
-			want:    "",
-			wantErr: true,
+			expect:           func(*mock.MockComputeClientMockRecorder) {},
+			want:             "",
+			wantErr:          true,
 		},
 		{
 			testName:         "Return server group ID from filter if only filter (with name) given",

pkg/cloud/services/loadbalancer/loadbalancer_test.go

@@ -30,7 +30,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors"
 	"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
 	"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/providers"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
@@ -86,7 +86,7 @@ func Test_ReconcileLoadBalancer(t *testing.T) {
 	}{
 		{
 			name: "reconcile loadbalancer in non active state should wait for active state",
-			expectNetwork: func(m *mock.MockNetworkClientMockRecorder) {
+			expectNetwork: func(*mock.MockNetworkClientMockRecorder) {
 				// add network api call results here
 			},
 			expectLoadBalancer: func(m *mock.MockLbClientMockRecorder) {

pkg/cloud/services/networking/floatingip_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/go-logr/logr/testr"
 	"github.com/golang/mock/gomock"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	"k8s.io/utils/ptr"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"

pkg/cloud/services/networking/network_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	"k8s.io/utils/ptr"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
@@ -301,7 +301,7 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
 					},
 				},
 			},
-			expect: func(g Gomega, m *mock.MockNetworkClientMockRecorder) {
+			expect: func(_ Gomega, m *mock.MockNetworkClientMockRecorder) {
 				m.GetNetwork(fakeNetworkID).Return(nil, gophercloud.ErrDefault404{})
 			},
 			want: &infrav1.OpenStackCluster{
@@ -342,7 +342,7 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
 					DisableExternalNetwork: ptr.To(true),
 				},
 			},
-			expect: func(_ Gomega, m *mock.MockNetworkClientMockRecorder) {},
+			expect: func(Gomega, *mock.MockNetworkClientMockRecorder) {},
 			want: &infrav1.OpenStackCluster{
 				Spec: infrav1.OpenStackClusterSpec{
 					DisableExternalNetwork: ptr.To(true),

pkg/cloud/services/networking/port_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 	"github.com/onsi/gomega/types"
 	"k8s.io/utils/ptr"
 

pkg/cloud/services/networking/router_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:revive
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock"
@@ -78,7 +78,7 @@ func TestService_DeleteRouter(t *testing.T) {
 					},
 				},
 			},
-			expect: func(g Gomega, m *mock.MockNetworkClientMockRecorder) {
+			expect: func(_ Gomega, m *mock.MockNetworkClientMockRecorder) {
 				// Get by ID in status returns 404
 				// No further action
 				m.GetRouter(routerID).Return(&routers.Router{ID: routerID}, gophercloud.ErrDefault404{})
@@ -165,7 +165,7 @@ func TestService_DeleteRouter(t *testing.T) {
 					},
 				},
 			},
-			expect: func(g Gomega, m *mock.MockNetworkClientMockRecorder) {
+			expect: func(_ Gomega, m *mock.MockNetworkClientMockRecorder) {
 				// Get by ID in status returns 404
 				// Error
 				m.GetRouter(routerID).Return(nil, gophercloud.ErrDefault404{})