Skip to content

Commit ec4db61

Browse files
authored
[fix] golangci-lint is unlocked to use the latest version again (#489)
* 'exportloopref' is deprecated replaced with copyloopvar * reconfiguring to use latest lint version * port range is safe for int32 conversion, ignoring the nosec * always passing the formatting string in required func
1 parent c6d8807 commit ec4db61

10 files changed

+18
-16
lines changed

.github/workflows/go-analyze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: lint
6969
uses: golangci/golangci-lint-action@v6
7070
with:
71-
version: v1.59.1
71+
version: latest
7272

7373
- name: Nilcheck
7474
run: make nilcheck

.golangci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,8 @@ linters:
138138
- errname
139139
- errorlint
140140
- errcheck
141-
- exportloopref
141+
- copyloopvar
142142
- exhaustive
143-
- exportloopref
144143
- forbidigo
145144
- forcetypeassert
146145
# - funlen
@@ -205,7 +204,7 @@ issues:
205204
- errcheck
206205
- dupl
207206
- gosec
208-
- exportloopref
207+
- copyloopvar
209208
- unparam
210209
# conversion files rely on largely generated code so are very similar
211210
- path: _conversion\.go

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ gosec: ## Run gosec against code.
125125

126126
.PHONY: lint
127127
lint: ## Run lint against code.
128-
docker run --rm -w /workdir -v $(PWD):/workdir golangci/golangci-lint:v1.59.1 golangci-lint run -c .golangci.yml --fix
128+
docker run --rm -w /workdir -v $(PWD):/workdir golangci/golangci-lint:latest golangci-lint run -c .golangci.yml --fix
129129

130130
.PHONY: nilcheck
131131
nilcheck: nilaway ## Run nil check against code.

controller/linodecluster_controller_helpers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func handleDNS(clusterScope *scope.ClusterScope) {
160160
}
161161
clusterScope.LinodeCluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
162162
Host: dnsHost,
163-
Port: int32(apiLBPort),
163+
Port: int32(apiLBPort), // #nosec G115: Integer overflow conversion is safe for port numbers
164164
}
165165
}
166166

@@ -196,7 +196,7 @@ func handleNBCreate(ctx context.Context, logger logr.Logger, clusterScope *scope
196196

197197
clusterScope.LinodeCluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
198198
Host: *linodeNB.IPv4,
199-
Port: int32(configs[0].Port),
199+
Port: int32(configs[0].Port), // #nosec G115: Integer overflow conversion is safe for port numbers
200200
}
201201

202202
return nil

controller/linodefirewall_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (r *LinodeFirewallReconciler) reconcile(
115115
if err != nil {
116116
fwScope.LinodeFirewall.Status.FailureReason = util.Pointer(failureReason)
117117
fwScope.LinodeFirewall.Status.FailureMessage = util.Pointer(err.Error())
118-
conditions.MarkFalse(fwScope.LinodeFirewall, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, err.Error())
118+
conditions.MarkFalse(fwScope.LinodeFirewall, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, "%s", err.Error())
119119
r.Recorder.Event(fwScope.LinodeFirewall, corev1.EventTypeWarning, string(failureReason), err.Error())
120120
}
121121

controller/linodemachine_controller.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ func (r *LinodeMachineReconciler) reconcile(ctx context.Context, logger logr.Log
171171
if err != nil {
172172
machineScope.LinodeMachine.Status.FailureReason = util.Pointer(failureReason)
173173
machineScope.LinodeMachine.Status.FailureMessage = util.Pointer(err.Error())
174-
conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, err.Error())
174+
175+
conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, "%s", err.Error())
176+
175177
r.Recorder.Event(machineScope.LinodeMachine, corev1.EventTypeWarning, string(failureReason), err.Error())
176178
}
177179

controller/linodemachine_controller_helpers.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ func createDisks(ctx context.Context, logger logr.Logger, machineScope *scope.Ma
537537
ConditionPreflightAdditionalDisksCreated,
538538
string(cerrs.CreateMachineError),
539539
clusterv1.ConditionSeverityWarning,
540+
"%s",
540541
err.Error(),
541542
)
542543
return err
@@ -561,7 +562,7 @@ func resizeRootDisk(ctx context.Context, logger logr.Logger, machineScope *scope
561562
if err != nil {
562563
logger.Error(err, "Failed to get default instance configuration")
563564

564-
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResized, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, err.Error())
565+
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResized, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, "%s", err.Error())
565566
return err
566567
}
567568

@@ -579,7 +580,7 @@ func resizeRootDisk(ctx context.Context, logger logr.Logger, machineScope *scope
579580
if err != nil {
580581
logger.Error(err, "Failed to get root disk for instance")
581582

582-
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, err.Error())
583+
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, "%s", err.Error())
583584

584585
return err
585586
}
@@ -594,7 +595,7 @@ func resizeRootDisk(ctx context.Context, logger logr.Logger, machineScope *scope
594595
}
595596

596597
if err := machineScope.LinodeClient.ResizeInstanceDisk(ctx, linodeInstanceID, rootDiskID, diskSize); err != nil {
597-
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, err.Error())
598+
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, "%s", err.Error())
598599
return err
599600
}
600601
conditions.MarkTrue(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing)

controller/linodeplacementgroup_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (r *LinodePlacementGroupReconciler) reconcile(
121121
pgScope.LinodePlacementGroup.Status.FailureReason = util.Pointer(failureReason)
122122
pgScope.LinodePlacementGroup.Status.FailureMessage = util.Pointer(err.Error())
123123

124-
conditions.MarkFalse(pgScope.LinodePlacementGroup, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, err.Error())
124+
conditions.MarkFalse(pgScope.LinodePlacementGroup, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, "%s", err.Error())
125125

126126
r.Recorder.Event(pgScope.LinodePlacementGroup, corev1.EventTypeWarning, string(failureReason), err.Error())
127127
}

controller/linodevpc_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (r *LinodeVPCReconciler) reconcile(
127127
vpcScope.LinodeVPC.Status.FailureReason = util.Pointer(failureReason)
128128
vpcScope.LinodeVPC.Status.FailureMessage = util.Pointer(err.Error())
129129

130-
conditions.MarkFalse(vpcScope.LinodeVPC, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, err.Error())
130+
conditions.MarkFalse(vpcScope.LinodeVPC, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, "%s", err.Error())
131131

132132
r.Recorder.Event(vpcScope.LinodeVPC, corev1.EventTypeWarning, string(failureReason), err.Error())
133133
}

util/reconciler/conditions.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ func HasConditionSeverity(from conditions.Getter, typ clusterv1.ConditionType, s
3131
}
3232

3333
func RecordDecayingCondition(to conditions.Setter, typ clusterv1.ConditionType, reason, message string, timeout time.Duration) bool {
34-
conditions.MarkFalse(to, typ, reason, clusterv1.ConditionSeverityWarning, message)
34+
conditions.MarkFalse(to, typ, reason, clusterv1.ConditionSeverityWarning, "%s", message)
3535

3636
if HasStaleCondition(to, typ, timeout) {
37-
conditions.MarkFalse(to, typ, reason, clusterv1.ConditionSeverityError, message)
37+
conditions.MarkFalse(to, typ, reason, clusterv1.ConditionSeverityError, "%s", message)
3838
return true
3939
}
4040

0 commit comments

Comments
 (0)