diff --git a/.golangci.yml b/.golangci.yml index 35e2d1494a..7c87588c80 100644 --- a/.golangci.yml +++ b/.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 diff --git a/api/v1alpha6/conversion_test.go b/api/v1alpha6/conversion_test.go index 18dc2a0094..7d6855760e 100644 --- a/api/v1alpha6/conversion_test.go +++ b/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 { diff --git a/api/v1alpha6/openstackcluster_conversion.go b/api/v1alpha6/openstackcluster_conversion.go index 665977d7e1..bc67f5a9ea 100644 --- a/api/v1alpha6/openstackcluster_conversion.go +++ b/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, diff --git a/api/v1alpha7/openstackcluster_conversion.go b/api/v1alpha7/openstackcluster_conversion.go index 96e03b5c87..c7598b9aea 100644 --- a/api/v1alpha7/openstackcluster_conversion.go +++ b/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, diff --git a/controllers/openstackcluster_controller_test.go b/controllers/openstackcluster_controller_test.go index 21dc0dbe3d..847564800a 100644 --- a/controllers/openstackcluster_controller_test.go +++ b/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" diff --git a/controllers/openstackfloatingippool_controller.go b/controllers/openstackfloatingippool_controller.go index b739fb25e7..7d4d646551 100644 --- a/controllers/openstackfloatingippool_controller.go +++ b/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 diff --git a/controllers/openstackmachine_controller_test.go b/controllers/openstackmachine_controller_test.go index 4a82b3d850..edb471f6e4 100644 --- a/controllers/openstackmachine_controller_test.go +++ b/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" diff --git a/controllers/suite_test.go b/controllers/suite_test.go index d4497275b7..ea388bc4cb 100644 --- a/controllers/suite_test.go +++ b/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" diff --git a/hack/tools/Makefile b/hack/tools/Makefile index f39cfadfd6..8e2239322c 100644 --- a/hack/tools/Makefile +++ b/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) diff --git a/main_test.go b/main_test.go index fd1281f179..cc381c03d9 100644 --- a/main_test.go +++ b/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" ) diff --git a/pkg/cloud/services/compute/instance_test.go b/pkg/cloud/services/compute/instance_test.go index dcc069be3e..af464b47dd 100644 --- a/pkg/cloud/services/compute/instance_test.go +++ b/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, }, { diff --git a/pkg/cloud/services/compute/instance_types_test.go b/pkg/cloud/services/compute/instance_types_test.go index 650fda62ef..48cec9c32e 100644 --- a/pkg/cloud/services/compute/instance_types_test.go +++ b/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" diff --git a/pkg/cloud/services/compute/referenced_resources_test.go b/pkg/cloud/services/compute/referenced_resources_test.go index 4d9ae11ec7..a17fd06463 100644 --- a/pkg/cloud/services/compute/referenced_resources_test.go +++ b/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" diff --git a/pkg/cloud/services/compute/servergroup_test.go b/pkg/cloud/services/compute/servergroup_test.go index 5a8e757075..55acf55f82 100644 --- a/pkg/cloud/services/compute/servergroup_test.go +++ b/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", diff --git a/pkg/cloud/services/loadbalancer/loadbalancer_test.go b/pkg/cloud/services/loadbalancer/loadbalancer_test.go index bc8317e61e..67f5757413 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/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) { diff --git a/pkg/cloud/services/networking/floatingip_test.go b/pkg/cloud/services/networking/floatingip_test.go index 11148e88e4..6bab84629e 100644 --- a/pkg/cloud/services/networking/floatingip_test.go +++ b/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" diff --git a/pkg/cloud/services/networking/network_test.go b/pkg/cloud/services/networking/network_test.go index 3a3c519743..72bcd75351 100644 --- a/pkg/cloud/services/networking/network_test.go +++ b/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), diff --git a/pkg/cloud/services/networking/port_test.go b/pkg/cloud/services/networking/port_test.go index bbdc1cd018..7e32338547 100644 --- a/pkg/cloud/services/networking/port_test.go +++ b/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" diff --git a/pkg/cloud/services/networking/router_test.go b/pkg/cloud/services/networking/router_test.go index 722107e62f..8b31e10854 100644 --- a/pkg/cloud/services/networking/router_test.go +++ b/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{}) diff --git a/pkg/cloud/services/networking/securitygroups_test.go b/pkg/cloud/services/networking/securitygroups_test.go index a9f0ca3163..56019ed195 100644 --- a/pkg/cloud/services/networking/securitygroups_test.go +++ b/pkg/cloud/services/networking/securitygroups_test.go @@ -26,7 +26,7 @@ import ( "github.com/google/uuid" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules" - . "github.com/onsi/gomega" + . "github.com/onsi/gomega" //nolint:revive "k8s.io/utils/ptr" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" @@ -358,7 +358,7 @@ func TestReconcileGroupRules(t *testing.T) { Name: sgName, Rules: []rules.SecGroupRule{}, }, - mockExpect: func(m *mock.MockNetworkClientMockRecorder) {}, + mockExpect: func(*mock.MockNetworkClientMockRecorder) {}, wantSGStatus: infrav1.SecurityGroupStatus{}, }, { @@ -395,7 +395,7 @@ func TestReconcileGroupRules(t *testing.T) { }, }, }, - mockExpect: func(m *mock.MockNetworkClientMockRecorder) {}, + mockExpect: func(*mock.MockNetworkClientMockRecorder) {}, }, { name: "Different desiredSGSpec and observedSG produces changes", diff --git a/pkg/cloud/services/networking/trunk_test.go b/pkg/cloud/services/networking/trunk_test.go index 079f5e45f9..92913f8bb4 100644 --- a/pkg/cloud/services/networking/trunk_test.go +++ b/pkg/cloud/services/networking/trunk_test.go @@ -22,7 +22,7 @@ import ( "github.com/golang/mock/gomock" "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 infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" diff --git a/pkg/webhooks/openstackcluster_webhook_test.go b/pkg/webhooks/openstackcluster_webhook_test.go index edd60296a3..6872072a65 100644 --- a/pkg/webhooks/openstackcluster_webhook_test.go +++ b/pkg/webhooks/openstackcluster_webhook_test.go @@ -20,15 +20,13 @@ import ( "context" "testing" - . "github.com/onsi/gomega" + . "github.com/onsi/gomega" //nolint:revive "k8s.io/utils/ptr" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) func TestOpenStackCluster_ValidateUpdate(t *testing.T) { - g := NewWithT(t) - tests := []struct { name string oldTemplate *infrav1.OpenStackCluster @@ -515,7 +513,9 @@ func TestOpenStackCluster_ValidateUpdate(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { + g := NewWithT(t) ctx := context.TODO() + webhook := &openStackClusterWebhook{} warn, err := webhook.ValidateUpdate(ctx, tt.oldTemplate, tt.newTemplate) if tt.wantErr { @@ -530,8 +530,6 @@ func TestOpenStackCluster_ValidateUpdate(t *testing.T) { } func TestOpenStackCluster_ValidateCreate(t *testing.T) { - g := NewWithT(t) - tests := []struct { name string template *infrav1.OpenStackCluster @@ -600,7 +598,9 @@ func TestOpenStackCluster_ValidateCreate(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { + g := NewWithT(t) ctx := context.TODO() + webhook := &openStackClusterWebhook{} warn, err := webhook.ValidateCreate(ctx, tt.template) if tt.wantErr { diff --git a/pkg/webhooks/openstackmachinetemplate_webhook_test.go b/pkg/webhooks/openstackmachinetemplate_webhook_test.go index 1d767c1142..7eeda53912 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" + . "github.com/onsi/gomega" //nolint:revive admissionv1 "k8s.io/api/admission/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/test/e2e/shared/exec.go b/test/e2e/shared/exec.go index df85fcbdd0..04184317f5 100644 --- a/test/e2e/shared/exec.go +++ b/test/e2e/shared/exec.go @@ -84,7 +84,7 @@ func executeCommand(ctx context.Context, p commandParameter) error { Auth: []ssh.AuthMethod{ ssh.PublicKeys(p.signer), }, - HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error { return nil }, + HostKeyCallback: func(string, net.Addr, ssh.PublicKey) error { return nil }, Timeout: 60 * time.Second, } cfg.SetDefaults() @@ -117,7 +117,7 @@ func executeCommand(ctx context.Context, p commandParameter) error { Auth: []ssh.AuthMethod{ ssh.PublicKeys(p.signer), }, - HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error { return nil }, + HostKeyCallback: func(string, net.Addr, ssh.PublicKey) error { return nil }, Timeout: 60 * time.Second, } cfg.SetDefaults() diff --git a/test/e2e/shared/exec_test.go b/test/e2e/shared/exec_test.go index c76ddf5c5d..2e71b57b0f 100644 --- a/test/e2e/shared/exec_test.go +++ b/test/e2e/shared/exec_test.go @@ -83,7 +83,7 @@ func Test_commandsForMachine(t *testing.T) { }, } for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + t.Run(tt.name, func(_ *testing.T) { workingDir, err := os.Getwd() if err != nil { panic(err) diff --git a/test/helpers/fuzzerfuncs.go b/test/helpers/fuzzerfuncs.go index 21658dfcf6..10724d5a19 100644 --- a/test/helpers/fuzzerfuncs.go +++ b/test/helpers/fuzzerfuncs.go @@ -30,7 +30,7 @@ func filterInvalidTags(tags []infrav1.NeutronTag) []infrav1.NeutronTag { var ret []infrav1.NeutronTag for i := range tags { s := string(tags[i]) - if len(s) > 0 && !strings.Contains(s, ",") { + if s != "" && !strings.Contains(s, ",") { ret = append(ret, tags[i]) } } @@ -159,7 +159,7 @@ func InfraV1FuzzerFuncs() []interface{} { stringWithoutSpaces := func() string { for { s := c.RandString() - if !strings.Contains(s, " ") && len(s) > 0 { + if !strings.Contains(s, " ") && s != "" { return s } }