Merge pull request #1534 from shiftstack/linter

k8s-ci-robot · web-flow · commit 1b322910689d · 2023-05-03T05:10:12.000-07:00
Update linter to v1.52.2
diff --git a/api/v1alpha3/conversion.go b/api/v1alpha3/conversion.go
@@ -57,11 +57,7 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackClusterList{}
@@ -94,11 +90,7 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackMachineList{}
@@ -131,11 +123,7 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}
@@ -267,7 +255,7 @@ func Convert_Slice_v1alpha3_Network_To_Slice_v1alpha7_Network(in *[]Network, out
 	return nil
 }
 
-func Convert_v1alpha3_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, s conversion.Scope) error {
+func Convert_v1alpha3_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, _ conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -293,7 +281,7 @@ func Convert_v1alpha7_SubnetFilter_To_v1alpha3_SubnetFilter(in *infrav1.SubnetFi
 	return autoConvert_v1alpha7_SubnetFilter_To_v1alpha3_SubnetFilter(in, out, s)
 }
 
-func Convert_v1alpha3_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, s conversion.Scope) error {
+func Convert_v1alpha3_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, _ conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -309,7 +297,7 @@ func Convert_v1alpha3_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.
 	return nil
 }
 
-func Convert_v1alpha7_NetworkFilter_To_v1alpha3_Filter(in *infrav1.NetworkFilter, out *Filter, s conversion.Scope) error {
+func Convert_v1alpha7_NetworkFilter_To_v1alpha3_Filter(in *infrav1.NetworkFilter, out *Filter, _ conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	out.ProjectID = in.ProjectID
diff --git a/api/v1alpha4/conversion.go b/api/v1alpha4/conversion.go
@@ -54,11 +54,7 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackClusterList{}
@@ -101,11 +97,7 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackClusterTemplateList{}
@@ -148,11 +140,7 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackMachineList{}
@@ -195,11 +183,7 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}
@@ -216,7 +200,7 @@ func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) er
 	return Convert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha4_OpenStackMachineTemplateList(src, r, nil)
 }
 
-func Convert_v1alpha4_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, s conversion.Scope) error {
+func Convert_v1alpha4_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, _ conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -242,7 +226,7 @@ func Convert_v1alpha7_SubnetFilter_To_v1alpha4_SubnetFilter(in *infrav1.SubnetFi
 	return autoConvert_v1alpha7_SubnetFilter_To_v1alpha4_SubnetFilter(in, out, s)
 }
 
-func Convert_v1alpha4_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, s conversion.Scope) error {
+func Convert_v1alpha4_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, _ conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -258,7 +242,7 @@ func Convert_v1alpha4_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.
 	return nil
 }
 
-func Convert_v1alpha7_NetworkFilter_To_v1alpha4_Filter(in *infrav1.NetworkFilter, out *Filter, s conversion.Scope) error {
+func Convert_v1alpha7_NetworkFilter_To_v1alpha4_Filter(in *infrav1.NetworkFilter, out *Filter, _ conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	out.ProjectID = in.ProjectID
diff --git a/api/v1alpha5/conversion.go b/api/v1alpha5/conversion.go
@@ -50,11 +50,7 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackClusterList{}
@@ -97,11 +93,7 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackMachine{}
@@ -130,11 +122,7 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackMachineList{}
@@ -177,11 +165,7 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 	}
 
 	// Preserve Hub data on down-conversion except for metadata
-	if err := utilconversion.MarshalData(src, r); err != nil {
-		return err
-	}
-
-	return nil
+	return utilconversion.MarshalData(src, r)
 }
 
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}
diff --git a/api/v1alpha7/openstackmachinetemplate_webhook.go b/api/v1alpha7/openstackmachinetemplate_webhook.go
@@ -49,7 +49,7 @@ func (r *OpenStackMachineTemplateWebhook) SetupWebhookWithManager(mgr manager.Ma
 var _ webhook.CustomValidator = &OpenStackMachineTemplateWebhook{}
 
 // ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
-func (r *OpenStackMachineTemplateWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) error {
+func (r *OpenStackMachineTemplateWebhook) ValidateCreate(_ context.Context, obj runtime.Object) error {
 	openStackMachineTemplate, ok := obj.(*OpenStackMachineTemplate)
 	if !ok {
 		return apierrors.NewBadRequest(fmt.Sprintf("expected an OpenStackMachineTemplate but got a %T", obj))
diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
@@ -388,7 +388,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 	}
 
 	if openStackCluster.Spec.APIServerLoadBalancer.Enabled {
-		err = r.reconcileLoadBalancerMember(scope, openStackCluster, machine, openStackMachine, instanceNS, clusterName)
+		err = r.reconcileLoadBalancerMember(scope, openStackCluster, openStackMachine, instanceNS, clusterName)
 		if err != nil {
 			conditions.MarkFalse(openStackMachine, infrav1.APIServerIngressReadyCondition, infrav1.LoadBalancerMemberErrorReason, clusterv1.ConditionSeverityError, "Reconciling load balancer member failed: %v", err)
 			return ctrl.Result{}, fmt.Errorf("reconcile load balancer member: %w", err)
@@ -508,14 +508,14 @@ func machineToInstanceSpec(openStackCluster *infrav1.OpenStackCluster, machine *
 	return &instanceSpec
 }
 
-func (r *OpenStackMachineReconciler) reconcileLoadBalancerMember(scope scope.Scope, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, instanceNS *compute.InstanceNetworkStatus, clusterName string) error {
+func (r *OpenStackMachineReconciler) reconcileLoadBalancerMember(scope scope.Scope, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, instanceNS *compute.InstanceNetworkStatus, clusterName string) error {
 	ip := instanceNS.IP(openStackCluster.Status.Network.Name)
 	loadbalancerService, err := loadbalancer.NewService(scope)
 	if err != nil {
 		return err
 	}
 
-	return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, machine, openStackMachine, clusterName, ip)
+	return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, openStackMachine, clusterName, ip)
 }
 
 // OpenStackClusterToOpenStackMachines is a handler.ToRequestsFunc to be used to enqeue requests for reconciliation
diff --git 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.51.1
+GOLANGCI_LINT_VERSION := v1.52.2
 
 UNAME := $(shell uname -s)
 
diff --git a/pkg/clients/compute.go b/pkg/clients/compute.go
@@ -159,30 +159,30 @@ func (e computeErrorClient) ListAvailabilityZones() ([]availabilityzones.Availab
 	return nil, e.error
 }
 
-func (e computeErrorClient) GetFlavorFromName(flavor string) (*flavors.Flavor, error) {
+func (e computeErrorClient) GetFlavorFromName(_ string) (*flavors.Flavor, error) {
 	return nil, e.error
 }
 
-func (e computeErrorClient) CreateServer(createOpts servers.CreateOptsBuilder) (*ServerExt, error) {
+func (e computeErrorClient) CreateServer(_ servers.CreateOptsBuilder) (*ServerExt, error) {
 	return nil, e.error
 }
 
-func (e computeErrorClient) DeleteServer(serverID string) error {
+func (e computeErrorClient) DeleteServer(_ string) error {
 	return e.error
 }
 
-func (e computeErrorClient) GetServer(serverID string) (*ServerExt, error) {
+func (e computeErrorClient) GetServer(_ string) (*ServerExt, error) {
 	return nil, e.error
 }
 
-func (e computeErrorClient) ListServers(listOpts servers.ListOptsBuilder) ([]ServerExt, error) {
+func (e computeErrorClient) ListServers(_ servers.ListOptsBuilder) ([]ServerExt, error) {
 	return nil, e.error
 }
 
-func (e computeErrorClient) ListAttachedInterfaces(serverID string) ([]attachinterfaces.Interface, error) {
+func (e computeErrorClient) ListAttachedInterfaces(_ string) ([]attachinterfaces.Interface, error) {
 	return nil, e.error
 }
 
-func (e computeErrorClient) DeleteAttachedInterface(serverID, portID string) error {
+func (e computeErrorClient) DeleteAttachedInterface(_, _ string) error {
 	return e.error
 }
diff --git a/pkg/clients/image.go b/pkg/clients/image.go
@@ -61,6 +61,6 @@ func NewImageErrorClient(e error) ImageClient {
 	return imageErrorClient{e}
 }
 
-func (e imageErrorClient) ListImages(listOpts images.ListOptsBuilder) ([]images.Image, error) {
+func (e imageErrorClient) ListImages(_ images.ListOptsBuilder) ([]images.Image, error) {
 	return nil, e.error
 }
diff --git a/pkg/clients/volume.go b/pkg/clients/volume.go
@@ -82,18 +82,18 @@ func NewVolumeErrorClient(e error) VolumeClient {
 	return volumeErrorClient{e}
 }
 
-func (e volumeErrorClient) ListVolumes(opts volumes.ListOptsBuilder) ([]volumes.Volume, error) {
+func (e volumeErrorClient) ListVolumes(_ volumes.ListOptsBuilder) ([]volumes.Volume, error) {
 	return nil, e.error
 }
 
-func (e volumeErrorClient) CreateVolume(opts volumes.CreateOptsBuilder) (*volumes.Volume, error) {
+func (e volumeErrorClient) CreateVolume(_ volumes.CreateOptsBuilder) (*volumes.Volume, error) {
 	return nil, e.error
 }
 
-func (e volumeErrorClient) DeleteVolume(volumeID string, opts volumes.DeleteOptsBuilder) error {
+func (e volumeErrorClient) DeleteVolume(_ string, _ volumes.DeleteOptsBuilder) error {
 	return e.error
 }
 
-func (e volumeErrorClient) GetVolume(volumeID string) (*volumes.Volume, error) {
+func (e volumeErrorClient) GetVolume(_ string) (*volumes.Volume, error) {
 	return nil, e.error
 }
diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go
@@ -386,7 +386,7 @@ func (s *Service) getOrCreateMonitor(openStackCluster *infrav1.OpenStackCluster,
 	return nil
 }
 
-func (s *Service) ReconcileLoadBalancerMember(openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, clusterName, ip string) error {
+func (s *Service) ReconcileLoadBalancerMember(openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, clusterName, ip string) error {
 	if openStackCluster.Status.Network == nil {
 		return errors.New("network is not yet available in openStackCluster.Status")
 	}
diff --git a/pkg/scope/mock.go b/pkg/scope/mock.go
@@ -64,14 +64,14 @@ func (f *MockScopeFactory) SetClientScopeCreateError(err error) {
 	f.clientScopeCreateError = err
 }
 
-func (f *MockScopeFactory) NewClientScopeFromMachine(ctx context.Context, ctrlClient client.Client, openStackMachine *infrav1.OpenStackMachine, defaultCA []byte, logger logr.Logger) (Scope, error) {
+func (f *MockScopeFactory) NewClientScopeFromMachine(_ context.Context, _ client.Client, _ *infrav1.OpenStackMachine, _ []byte, _ logr.Logger) (Scope, error) {
 	if f.clientScopeCreateError != nil {
 		return nil, f.clientScopeCreateError
 	}
 	return f, nil
 }
 
-func (f *MockScopeFactory) NewClientScopeFromCluster(ctx context.Context, ctrlClient client.Client, openStackCluster *infrav1.OpenStackCluster, defaultCA []byte, logger logr.Logger) (Scope, error) {
+func (f *MockScopeFactory) NewClientScopeFromCluster(_ context.Context, _ client.Client, _ *infrav1.OpenStackCluster, _ []byte, _ logr.Logger) (Scope, error) {
 	if f.clientScopeCreateError != nil {
 		return nil, f.clientScopeCreateError
 	}
diff --git a/test/e2e/suites/e2e/e2e_suite_test.go b/test/e2e/suites/e2e/e2e_suite_test.go
@@ -58,6 +58,5 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 var _ = SynchronizedAfterSuite(func() {
 	shared.AllNodesAfterSuite(e2eCtx)
 }, func() {
-	cleanupTestVolumeType(e2eCtx)
 	shared.Node1AfterSuite(e2eCtx)
 })
diff --git a/test/e2e/suites/e2e/e2e_test.go b/test/e2e/suites/e2e/e2e_test.go
@@ -872,8 +872,3 @@ func createTestVolumeType(e2eCtx *shared.E2EContext) {
 	}
 	Expect(err).NotTo(HaveOccurred())
 }
-
-func cleanupTestVolumeType(e2eCtx *shared.E2EContext) {
-	// We don't delete the volume type because it's unnecessarily complex when we're going to delete the environment anyway.
-	// See https://bugs.launchpad.net/cinder/+bug/1823880 for a discussion of this same issue in an OpenStack tempest test.
-}

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,7 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// Preserve Hub data on down-conversion except for metadata`
`53`		`- if err := utilconversion.MarshalData(src, r); err != nil {`
`54`		`- return err`
`55`		`- }`
`56`		`-`
`57`		`- return nil`
	`53`	`+ return utilconversion.MarshalData(src, r)`
`58`	`54`	`}`
`59`	`55`
`60`	`56`	`var _ ctrlconversion.Convertible = &OpenStackClusterList{}`
`@@ -97,11 +93,7 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error`
`97`	`93`	`}`
`98`	`94`
`99`	`95`	`// Preserve Hub data on down-conversion except for metadata`
`100`		`- if err := utilconversion.MarshalData(src, r); err != nil {`
`101`		`- return err`
`102`		`- }`
`103`		`-`
`104`		`- return nil`
	`96`	`+ return utilconversion.MarshalData(src, r)`
`105`	`97`	`}`
`106`	`98`
`107`	`99`	`var _ ctrlconversion.Convertible = &OpenStackMachine{}`
`@@ -130,11 +122,7 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {`
`130`	`122`	`}`
`131`	`123`
`132`	`124`	`// Preserve Hub data on down-conversion except for metadata`
`133`		`- if err := utilconversion.MarshalData(src, r); err != nil {`
`134`		`- return err`
`135`		`- }`
`136`		`-`
`137`		`- return nil`
	`125`	`+ return utilconversion.MarshalData(src, r)`
`138`	`126`	`}`
`139`	`127`
`140`	`128`	`var _ ctrlconversion.Convertible = &OpenStackMachineList{}`
`@@ -177,11 +165,7 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error`
`177`	`165`	`}`
`178`	`166`
`179`	`167`	`// Preserve Hub data on down-conversion except for metadata`
`180`		`- if err := utilconversion.MarshalData(src, r); err != nil {`
`181`		`- return err`
`182`		`- }`
`183`		`-`
`184`		`- return nil`
	`168`	`+ return utilconversion.MarshalData(src, r)`
`185`	`169`	`}`
`186`	`170`
`187`	`171`	`var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`if openStackCluster.Spec.APIServerLoadBalancer.Enabled {`
`391`		`- err = r.reconcileLoadBalancerMember(scope, openStackCluster, machine, openStackMachine, instanceNS, clusterName)`
	`391`	`+ err = r.reconcileLoadBalancerMember(scope, openStackCluster, openStackMachine, instanceNS, clusterName)`
`392`	`392`	`if err != nil {`
`393`	`393`	`conditions.MarkFalse(openStackMachine, infrav1.APIServerIngressReadyCondition, infrav1.LoadBalancerMemberErrorReason, clusterv1.ConditionSeverityError, "Reconciling load balancer member failed: %v", err)`
`394`	`394`	`return ctrl.Result{}, fmt.Errorf("reconcile load balancer member: %w", err)`
`@@ -508,14 +508,14 @@ func machineToInstanceSpec(openStackCluster infrav1.OpenStackCluster, machine `
`508`	`508`	`return &instanceSpec`
`509`	`509`	`}`
`510`	`510`
`511`		`-func (r OpenStackMachineReconciler) reconcileLoadBalancerMember(scope scope.Scope, openStackCluster infrav1.OpenStackCluster, machine clusterv1.Machine, openStackMachine infrav1.OpenStackMachine, instanceNS *compute.InstanceNetworkStatus, clusterName string) error {`
	`511`	`+func (r OpenStackMachineReconciler) reconcileLoadBalancerMember(scope scope.Scope, openStackCluster infrav1.OpenStackCluster, openStackMachine infrav1.OpenStackMachine, instanceNS compute.InstanceNetworkStatus, clusterName string) error {`
`512`	`512`	`ip := instanceNS.IP(openStackCluster.Status.Network.Name)`
`513`	`513`	`loadbalancerService, err := loadbalancer.NewService(scope)`
`514`	`514`	`if err != nil {`
`515`	`515`	`return err`
`516`	`516`	`}`
`517`	`517`
`518`		`- return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, machine, openStackMachine, clusterName, ip)`
	`518`	`+ return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, openStackMachine, clusterName, ip)`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`// OpenStackClusterToOpenStackMachines is a handler.ToRequestsFunc to be used to enqeue requests for reconciliation`
Original file line number	Diff line number	Diff line change
`@@ -159,30 +159,30 @@ func (e computeErrorClient) ListAvailabilityZones() ([]availabilityzones.Availab`
`159`	`159`	`return nil, e.error`
`160`	`160`	`}`
`161`	`161`
`162`		`-func (e computeErrorClient) GetFlavorFromName(flavor string) (*flavors.Flavor, error) {`
	`162`	`+func (e computeErrorClient) GetFlavorFromName(_ string) (*flavors.Flavor, error) {`
`163`	`163`	`return nil, e.error`
`164`	`164`	`}`
`165`	`165`
`166`		`-func (e computeErrorClient) CreateServer(createOpts servers.CreateOptsBuilder) (*ServerExt, error) {`
	`166`	`+func (e computeErrorClient) CreateServer(_ servers.CreateOptsBuilder) (*ServerExt, error) {`
`167`	`167`	`return nil, e.error`
`168`	`168`	`}`
`169`	`169`
`170`		`-func (e computeErrorClient) DeleteServer(serverID string) error {`
	`170`	`+func (e computeErrorClient) DeleteServer(_ string) error {`
`171`	`171`	`return e.error`
`172`	`172`	`}`
`173`	`173`
`174`		`-func (e computeErrorClient) GetServer(serverID string) (*ServerExt, error) {`
	`174`	`+func (e computeErrorClient) GetServer(_ string) (*ServerExt, error) {`
`175`	`175`	`return nil, e.error`
`176`	`176`	`}`
`177`	`177`
`178`		`-func (e computeErrorClient) ListServers(listOpts servers.ListOptsBuilder) ([]ServerExt, error) {`
	`178`	`+func (e computeErrorClient) ListServers(_ servers.ListOptsBuilder) ([]ServerExt, error) {`
`179`	`179`	`return nil, e.error`
`180`	`180`	`}`
`181`	`181`
`182`		`-func (e computeErrorClient) ListAttachedInterfaces(serverID string) ([]attachinterfaces.Interface, error) {`
	`182`	`+func (e computeErrorClient) ListAttachedInterfaces(_ string) ([]attachinterfaces.Interface, error) {`
`183`	`183`	`return nil, e.error`
`184`	`184`	`}`
`185`	`185`
`186`		`-func (e computeErrorClient) DeleteAttachedInterface(serverID, portID string) error {`
	`186`	`+func (e computeErrorClient) DeleteAttachedInterface(_, _ string) error {`
`187`	`187`	`return e.error`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,6 @@ func NewImageErrorClient(e error) ImageClient {`
`61`	`61`	`return imageErrorClient{e}`
`62`	`62`	`}`
`63`	`63`
`64`		`-func (e imageErrorClient) ListImages(listOpts images.ListOptsBuilder) ([]images.Image, error) {`
	`64`	`+func (e imageErrorClient) ListImages(_ images.ListOptsBuilder) ([]images.Image, error) {`
`65`	`65`	`return nil, e.error`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,18 +82,18 @@ func NewVolumeErrorClient(e error) VolumeClient {`
`82`	`82`	`return volumeErrorClient{e}`
`83`	`83`	`}`
`84`	`84`
`85`		`-func (e volumeErrorClient) ListVolumes(opts volumes.ListOptsBuilder) ([]volumes.Volume, error) {`
	`85`	`+func (e volumeErrorClient) ListVolumes(_ volumes.ListOptsBuilder) ([]volumes.Volume, error) {`
`86`	`86`	`return nil, e.error`
`87`	`87`	`}`
`88`	`88`
`89`		`-func (e volumeErrorClient) CreateVolume(opts volumes.CreateOptsBuilder) (*volumes.Volume, error) {`
	`89`	`+func (e volumeErrorClient) CreateVolume(_ volumes.CreateOptsBuilder) (*volumes.Volume, error) {`
`90`	`90`	`return nil, e.error`
`91`	`91`	`}`
`92`	`92`
`93`		`-func (e volumeErrorClient) DeleteVolume(volumeID string, opts volumes.DeleteOptsBuilder) error {`
	`93`	`+func (e volumeErrorClient) DeleteVolume(_ string, _ volumes.DeleteOptsBuilder) error {`
`94`	`94`	`return e.error`
`95`	`95`	`}`
`96`	`96`
`97`		`-func (e volumeErrorClient) GetVolume(volumeID string) (*volumes.Volume, error) {`
	`97`	`+func (e volumeErrorClient) GetVolume(_ string) (*volumes.Volume, error) {`
`98`	`98`	`return nil, e.error`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ func (s Service) getOrCreateMonitor(openStackCluster infrav1.OpenStackCluster,`
`386`	`386`	`return nil`
`387`	`387`	`}`
`388`	`388`
`389`		`-func (s Service) ReconcileLoadBalancerMember(openStackCluster infrav1.OpenStackCluster, machine clusterv1.Machine, openStackMachine infrav1.OpenStackMachine, clusterName, ip string) error {`
	`389`	`+func (s Service) ReconcileLoadBalancerMember(openStackCluster infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, clusterName, ip string) error {`
`390`	`390`	`if openStackCluster.Status.Network == nil {`
`391`	`391`	`return errors.New("network is not yet available in openStackCluster.Status")`
`392`	`392`	`}`