Update linter version, fix linting:

Signed-off-by: Jacob Weinstock <[email protected]>

Author: jacobweinstock

Makefile

@@ -51,7 +51,7 @@ GO_INSTALL = ./scripts/go_install.sh
 # Binaries.
 CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/[email protected]
 
-GOLANGCI_LINT_VER := v1.61.0
+GOLANGCI_LINT_VER := v1.63.4
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 

controller/machine/scope.go

@@ -197,7 +197,7 @@ func (scope *machineReconcileScope) MachineScheduledForDeletion() bool {
 }
 
 // DeleteMachineWithDependencies removes template and workflow objects associated with given machine.
-func (scope *machineReconcileScope) DeleteMachineWithDependencies() error {
+func (scope *machineReconcileScope) DeleteMachineWithDependencies() error { //nolint:cyclop
 	scope.log.Info("Removing machine", "hardwareName", scope.tinkerbellMachine.Spec.HardwareName)
 	// Fetch hw for the machine.
 	hw := &tinkv1.Hardware{}
@@ -234,6 +234,7 @@ func (scope *machineReconcileScope) DeleteMachineWithDependencies() error {
 		if err := scope.releaseHardware(hw); err != nil {
 			return fmt.Errorf("error releasing Hardware: %w", err)
 		}
+
 		return scope.removeFinalizer()
 	}
 

controller/machine/tinkerbellmachine_test.go

@@ -582,7 +582,6 @@ func Test_Machine_reconciliation_workflow_complete(t *testing.T) {
 	})
 }
 
-//nolint:funlen
 func Test_Machine_reconciliation(t *testing.T) {
 	t.Parallel()