Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] golangci-lint is unlocked to use the latest version again #489

Merged
merged 5 commits into from
Aug 29, 2024
Merged

[fix] golangci-lint is unlocked to use the latest version again #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be72911
'exportloopref' is deprecated replaced with copyloopvar
unnatiagg Aug 29, 2024
f971f31
reconfiguring to use latest lint verison
unnatiagg Aug 29, 2024
85d1fe3
port range is safe for int32 conversion, ignoring the nosec
unnatiagg Aug 29, 2024
cd4938c
always passing the formating string in required func
unnatiagg Aug 29, 2024
66d85e9
Merge remote-tracking branch 'origin' into govet-latest
unnatiagg Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go-analyze.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- name: lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.59.1
version: latest

- name: Nilcheck
run: make nilcheck
5 changes: 2 additions & 3 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,8 @@ linters:
- errname
- errorlint
- errcheck
- exportloopref
- copyloopvar
komer3 marked this conversation as resolved.
Show resolved Hide resolved
- exhaustive
- exportloopref
- forbidigo
- forcetypeassert
# - funlen
Expand Down Expand Up @@ -205,7 +204,7 @@ issues:
- errcheck
- dupl
- gosec
- exportloopref
- copyloopvar
- unparam
# conversion files rely on largely generated code so are very similar
- path: _conversion\.go
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ gosec: ## Run gosec against code.

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

.PHONY: nilcheck
nilcheck: nilaway ## Run nil check against code.
Expand Down
4 changes: 2 additions & 2 deletions controller/linodecluster_controller_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func handleDNS(clusterScope *scope.ClusterScope) {
}
clusterScope.LinodeCluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
Host: dnsHost,
Port: int32(apiLBPort),
Port: int32(apiLBPort), // #nosec G115: Integer overflow conversion is safe for port numbers
}
}

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

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

return nil
Expand Down
2 changes: 1 addition & 1 deletion controller/linodefirewall_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (r *LinodeFirewallReconciler) reconcile(
if err != nil {
fwScope.LinodeFirewall.Status.FailureReason = util.Pointer(failureReason)
fwScope.LinodeFirewall.Status.FailureMessage = util.Pointer(err.Error())
conditions.MarkFalse(fwScope.LinodeFirewall, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, err.Error())
conditions.MarkFalse(fwScope.LinodeFirewall, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, "%s", err.Error())
komer3 marked this conversation as resolved.
Show resolved Hide resolved
r.Recorder.Event(fwScope.LinodeFirewall, corev1.EventTypeWarning, string(failureReason), err.Error())
}

Expand Down
4 changes: 3 additions & 1 deletion controller/linodemachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ func (r *LinodeMachineReconciler) reconcile(ctx context.Context, logger logr.Log
if err != nil {
machineScope.LinodeMachine.Status.FailureReason = util.Pointer(failureReason)
machineScope.LinodeMachine.Status.FailureMessage = util.Pointer(err.Error())
conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, err.Error())

conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, string(failureReason), clusterv1.ConditionSeverityError, "%s", err.Error())

r.Recorder.Event(machineScope.LinodeMachine, corev1.EventTypeWarning, string(failureReason), err.Error())
}

Expand Down
7 changes: 4 additions & 3 deletions controller/linodemachine_controller_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@
ConditionPreflightAdditionalDisksCreated,
string(cerrs.CreateMachineError),
clusterv1.ConditionSeverityWarning,
"%s",
err.Error(),
)
return err
Expand All @@ -561,7 +562,7 @@
if err != nil {
logger.Error(err, "Failed to get default instance configuration")

conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResized, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, err.Error())
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResized, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, "%s", err.Error())

Check warning on line 565 in controller/linodemachine_controller_helpers.go

View check run for this annotation

Codecov / codecov/patch

controller/linodemachine_controller_helpers.go#L565 

Added line #L565 was not covered by tests
return err
}

Expand All @@ -579,7 +580,7 @@
if err != nil {
logger.Error(err, "Failed to get root disk for instance")

conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, err.Error())
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, "%s", err.Error())

Check warning on line 583 in controller/linodemachine_controller_helpers.go

View check run for this annotation

Codecov / codecov/patch

controller/linodemachine_controller_helpers.go#L583 

Added line #L583 was not covered by tests

return err
}
Expand All @@ -594,7 +595,7 @@
}

if err := machineScope.LinodeClient.ResizeInstanceDisk(ctx, linodeInstanceID, rootDiskID, diskSize); err != nil {
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, err.Error())
conditions.MarkFalse(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing, string(cerrs.CreateMachineError), clusterv1.ConditionSeverityWarning, "%s", err.Error())

Check warning on line 598 in controller/linodemachine_controller_helpers.go

View check run for this annotation

Codecov / codecov/patch

controller/linodemachine_controller_helpers.go#L598 

Added line #L598 was not covered by tests
return err
}
conditions.MarkTrue(machineScope.LinodeMachine, ConditionPreflightRootDiskResizing)
Expand Down
2 changes: 1 addition & 1 deletion controller/linodeplacementgroup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (r *LinodePlacementGroupReconciler) reconcile(
pgScope.LinodePlacementGroup.Status.FailureReason = util.Pointer(failureReason)
pgScope.LinodePlacementGroup.Status.FailureMessage = util.Pointer(err.Error())

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

r.Recorder.Event(pgScope.LinodePlacementGroup, corev1.EventTypeWarning, string(failureReason), err.Error())
}
Expand Down
2 changes: 1 addition & 1 deletion controller/linodevpc_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (r *LinodeVPCReconciler) reconcile(
vpcScope.LinodeVPC.Status.FailureReason = util.Pointer(failureReason)
vpcScope.LinodeVPC.Status.FailureMessage = util.Pointer(err.Error())

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

r.Recorder.Event(vpcScope.LinodeVPC, corev1.EventTypeWarning, string(failureReason), err.Error())
}
Expand Down
4 changes: 2 additions & 2 deletions util/reconciler/conditions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ func HasConditionSeverity(from conditions.Getter, typ clusterv1.ConditionType, s
}

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

if HasStaleCondition(to, typ, timeout) {
conditions.MarkFalse(to, typ, reason, clusterv1.ConditionSeverityError, message)
conditions.MarkFalse(to, typ, reason, clusterv1.ConditionSeverityError, "%s", message)
return true
}

Expand Down
Loading