Skip to content

Commit 1b32291

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1534 from shiftstack/linter
Update linter to v1.52.2
2 parents b7af958 + 764daa1 commit 1b32291

File tree

13 files changed

+37
-87
lines changed

13 files changed

+37
-87
lines changed

‎api/v1alpha3/conversion.go‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
5757
}
5858

5959
// Preserve Hub data on down-conversion except for metadata
60-
if err := utilconversion.MarshalData(src, r); err != nil {
61-
return err
62-
}
63-
64-
return nil
60+
return utilconversion.MarshalData(src, r)
6561
}
6662

6763
var _ ctrlconversion.Convertible = &OpenStackClusterList{}
@@ -94,11 +90,7 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
9490
}
9591

9692
// Preserve Hub data on down-conversion except for metadata
97-
if err := utilconversion.MarshalData(src, r); err != nil {
98-
return err
99-
}
100-
101-
return nil
93+
return utilconversion.MarshalData(src, r)
10294
}
10395

10496
var _ ctrlconversion.Convertible = &OpenStackMachineList{}
@@ -131,11 +123,7 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
131123
}
132124

133125
// Preserve Hub data on down-conversion except for metadata
134-
if err := utilconversion.MarshalData(src, r); err != nil {
135-
return err
136-
}
137-
138-
return nil
126+
return utilconversion.MarshalData(src, r)
139127
}
140128

141129
var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}
@@ -267,7 +255,7 @@ func Convert_Slice_v1alpha3_Network_To_Slice_v1alpha7_Network(in *[]Network, out
267255
return nil
268256
}
269257

270-
func Convert_v1alpha3_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, s conversion.Scope) error {
258+
func Convert_v1alpha3_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, _ conversion.Scope) error {
271259
out.Name = in.Name
272260
out.Description = in.Description
273261
if in.ProjectID != "" {
@@ -293,7 +281,7 @@ func Convert_v1alpha7_SubnetFilter_To_v1alpha3_SubnetFilter(in *infrav1.SubnetFi
293281
return autoConvert_v1alpha7_SubnetFilter_To_v1alpha3_SubnetFilter(in, out, s)
294282
}
295283

296-
func Convert_v1alpha3_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, s conversion.Scope) error {
284+
func Convert_v1alpha3_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, _ conversion.Scope) error {
297285
out.Name = in.Name
298286
out.Description = in.Description
299287
if in.ProjectID != "" {
@@ -309,7 +297,7 @@ func Convert_v1alpha3_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.
309297
return nil
310298
}
311299

312-
func Convert_v1alpha7_NetworkFilter_To_v1alpha3_Filter(in *infrav1.NetworkFilter, out *Filter, s conversion.Scope) error {
300+
func Convert_v1alpha7_NetworkFilter_To_v1alpha3_Filter(in *infrav1.NetworkFilter, out *Filter, _ conversion.Scope) error {
313301
out.Name = in.Name
314302
out.Description = in.Description
315303
out.ProjectID = in.ProjectID

‎api/v1alpha4/conversion.go‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
5454
}
5555

5656
// Preserve Hub data on down-conversion except for metadata
57-
if err := utilconversion.MarshalData(src, r); err != nil {
58-
return err
59-
}
60-
61-
return nil
57+
return utilconversion.MarshalData(src, r)
6258
}
6359

6460
var _ ctrlconversion.Convertible = &OpenStackClusterList{}
@@ -101,11 +97,7 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
10197
}
10298

10399
// Preserve Hub data on down-conversion except for metadata
104-
if err := utilconversion.MarshalData(src, r); err != nil {
105-
return err
106-
}
107-
108-
return nil
100+
return utilconversion.MarshalData(src, r)
109101
}
110102

111103
var _ ctrlconversion.Convertible = &OpenStackClusterTemplateList{}
@@ -148,11 +140,7 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
148140
}
149141

150142
// Preserve Hub data on down-conversion except for metadata
151-
if err := utilconversion.MarshalData(src, r); err != nil {
152-
return err
153-
}
154-
155-
return nil
143+
return utilconversion.MarshalData(src, r)
156144
}
157145

158146
var _ ctrlconversion.Convertible = &OpenStackMachineList{}
@@ -195,11 +183,7 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
195183
}
196184

197185
// Preserve Hub data on down-conversion except for metadata
198-
if err := utilconversion.MarshalData(src, r); err != nil {
199-
return err
200-
}
201-
202-
return nil
186+
return utilconversion.MarshalData(src, r)
203187
}
204188

205189
var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}
@@ -216,7 +200,7 @@ func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) er
216200
return Convert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha4_OpenStackMachineTemplateList(src, r, nil)
217201
}
218202

219-
func Convert_v1alpha4_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, s conversion.Scope) error {
203+
func Convert_v1alpha4_SubnetFilter_To_v1alpha7_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, _ conversion.Scope) error {
220204
out.Name = in.Name
221205
out.Description = in.Description
222206
if in.ProjectID != "" {
@@ -242,7 +226,7 @@ func Convert_v1alpha7_SubnetFilter_To_v1alpha4_SubnetFilter(in *infrav1.SubnetFi
242226
return autoConvert_v1alpha7_SubnetFilter_To_v1alpha4_SubnetFilter(in, out, s)
243227
}
244228

245-
func Convert_v1alpha4_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, s conversion.Scope) error {
229+
func Convert_v1alpha4_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, _ conversion.Scope) error {
246230
out.Name = in.Name
247231
out.Description = in.Description
248232
if in.ProjectID != "" {
@@ -258,7 +242,7 @@ func Convert_v1alpha4_Filter_To_v1alpha7_NetworkFilter(in *Filter, out *infrav1.
258242
return nil
259243
}
260244

261-
func Convert_v1alpha7_NetworkFilter_To_v1alpha4_Filter(in *infrav1.NetworkFilter, out *Filter, s conversion.Scope) error {
245+
func Convert_v1alpha7_NetworkFilter_To_v1alpha4_Filter(in *infrav1.NetworkFilter, out *Filter, _ conversion.Scope) error {
262246
out.Name = in.Name
263247
out.Description = in.Description
264248
out.ProjectID = in.ProjectID

‎api/v1alpha5/conversion.go‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
5050
}
5151

5252
// 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)
5854
}
5955

6056
var _ ctrlconversion.Convertible = &OpenStackClusterList{}
@@ -97,11 +93,7 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
9793
}
9894

9995
// 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)
10597
}
10698

10799
var _ ctrlconversion.Convertible = &OpenStackMachine{}
@@ -130,11 +122,7 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
130122
}
131123

132124
// 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)
138126
}
139127

140128
var _ ctrlconversion.Convertible = &OpenStackMachineList{}
@@ -177,11 +165,7 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
177165
}
178166

179167
// 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)
185169
}
186170

187171
var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}

‎api/v1alpha7/openstackmachinetemplate_webhook.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (r *OpenStackMachineTemplateWebhook) SetupWebhookWithManager(mgr manager.Ma
4949
var _ webhook.CustomValidator = &OpenStackMachineTemplateWebhook{}
5050

5151
// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
52-
func (r *OpenStackMachineTemplateWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) error {
52+
func (r *OpenStackMachineTemplateWebhook) ValidateCreate(_ context.Context, obj runtime.Object) error {
5353
openStackMachineTemplate, ok := obj.(*OpenStackMachineTemplate)
5454
if !ok {
5555
return apierrors.NewBadRequest(fmt.Sprintf("expected an OpenStackMachineTemplate but got a %T", obj))

‎controllers/openstackmachine_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
388388
}
389389

390390
if openStackCluster.Spec.APIServerLoadBalancer.Enabled {
391-
err = r.reconcileLoadBalancerMember(scope, openStackCluster, machine, openStackMachine, instanceNS, clusterName)
391+
err = r.reconcileLoadBalancerMember(scope, openStackCluster, openStackMachine, instanceNS, clusterName)
392392
if err != nil {
393393
conditions.MarkFalse(openStackMachine, infrav1.APIServerIngressReadyCondition, infrav1.LoadBalancerMemberErrorReason, clusterv1.ConditionSeverityError, "Reconciling load balancer member failed: %v", err)
394394
return ctrl.Result{}, fmt.Errorf("reconcile load balancer member: %w", err)
@@ -508,14 +508,14 @@ func machineToInstanceSpec(openStackCluster *infrav1.OpenStackCluster, machine *
508508
return &instanceSpec
509509
}
510510

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 {
512512
ip := instanceNS.IP(openStackCluster.Status.Network.Name)
513513
loadbalancerService, err := loadbalancer.NewService(scope)
514514
if err != nil {
515515
return err
516516
}
517517

518-
return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, machine, openStackMachine, clusterName, ip)
518+
return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, openStackMachine, clusterName, ip)
519519
}
520520

521521
// OpenStackClusterToOpenStackMachines is a handler.ToRequestsFunc to be used to enqeue requests for reconciliation

‎hack/tools/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ROOT_DIR_RELATIVE := ../..
1616
include $(ROOT_DIR_RELATIVE)/common.mk
1717

18-
GOLANGCI_LINT_VERSION := v1.51.1
18+
GOLANGCI_LINT_VERSION := v1.52.2
1919

2020
UNAME := $(shell uname -s)
2121

‎pkg/clients/compute.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,30 +159,30 @@ func (e computeErrorClient) ListAvailabilityZones() ([]availabilityzones.Availab
159159
return nil, e.error
160160
}
161161

162-
func (e computeErrorClient) GetFlavorFromName(flavor string) (*flavors.Flavor, error) {
162+
func (e computeErrorClient) GetFlavorFromName(_ string) (*flavors.Flavor, error) {
163163
return nil, e.error
164164
}
165165

166-
func (e computeErrorClient) CreateServer(createOpts servers.CreateOptsBuilder) (*ServerExt, error) {
166+
func (e computeErrorClient) CreateServer(_ servers.CreateOptsBuilder) (*ServerExt, error) {
167167
return nil, e.error
168168
}
169169

170-
func (e computeErrorClient) DeleteServer(serverID string) error {
170+
func (e computeErrorClient) DeleteServer(_ string) error {
171171
return e.error
172172
}
173173

174-
func (e computeErrorClient) GetServer(serverID string) (*ServerExt, error) {
174+
func (e computeErrorClient) GetServer(_ string) (*ServerExt, error) {
175175
return nil, e.error
176176
}
177177

178-
func (e computeErrorClient) ListServers(listOpts servers.ListOptsBuilder) ([]ServerExt, error) {
178+
func (e computeErrorClient) ListServers(_ servers.ListOptsBuilder) ([]ServerExt, error) {
179179
return nil, e.error
180180
}
181181

182-
func (e computeErrorClient) ListAttachedInterfaces(serverID string) ([]attachinterfaces.Interface, error) {
182+
func (e computeErrorClient) ListAttachedInterfaces(_ string) ([]attachinterfaces.Interface, error) {
183183
return nil, e.error
184184
}
185185

186-
func (e computeErrorClient) DeleteAttachedInterface(serverID, portID string) error {
186+
func (e computeErrorClient) DeleteAttachedInterface(_, _ string) error {
187187
return e.error
188188
}

‎pkg/clients/image.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ func NewImageErrorClient(e error) ImageClient {
6161
return imageErrorClient{e}
6262
}
6363

64-
func (e imageErrorClient) ListImages(listOpts images.ListOptsBuilder) ([]images.Image, error) {
64+
func (e imageErrorClient) ListImages(_ images.ListOptsBuilder) ([]images.Image, error) {
6565
return nil, e.error
6666
}

‎pkg/clients/volume.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,18 @@ func NewVolumeErrorClient(e error) VolumeClient {
8282
return volumeErrorClient{e}
8383
}
8484

85-
func (e volumeErrorClient) ListVolumes(opts volumes.ListOptsBuilder) ([]volumes.Volume, error) {
85+
func (e volumeErrorClient) ListVolumes(_ volumes.ListOptsBuilder) ([]volumes.Volume, error) {
8686
return nil, e.error
8787
}
8888

89-
func (e volumeErrorClient) CreateVolume(opts volumes.CreateOptsBuilder) (*volumes.Volume, error) {
89+
func (e volumeErrorClient) CreateVolume(_ volumes.CreateOptsBuilder) (*volumes.Volume, error) {
9090
return nil, e.error
9191
}
9292

93-
func (e volumeErrorClient) DeleteVolume(volumeID string, opts volumes.DeleteOptsBuilder) error {
93+
func (e volumeErrorClient) DeleteVolume(_ string, _ volumes.DeleteOptsBuilder) error {
9494
return e.error
9595
}
9696

97-
func (e volumeErrorClient) GetVolume(volumeID string) (*volumes.Volume, error) {
97+
func (e volumeErrorClient) GetVolume(_ string) (*volumes.Volume, error) {
9898
return nil, e.error
9999
}

‎pkg/cloud/services/loadbalancer/loadbalancer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ func (s *Service) getOrCreateMonitor(openStackCluster *infrav1.OpenStackCluster,
386386
return nil
387387
}
388388

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 {
390390
if openStackCluster.Status.Network == nil {
391391
return errors.New("network is not yet available in openStackCluster.Status")
392392
}

0 commit comments

Comments
 (0)