Add the ability to fix linter issues

Author: JoelSpeed

Makefile

@@ -46,6 +46,14 @@ PULL_BASE_SHA ?= master
 lint:
 	hack/golangci-lint.sh run --new-from-rev=${PULL_BASE_SHA}
 
+# While https://github.com/golangci/golangci-lint/issues/1779 is not fixed,
+# we need to run the fix separately from the lint command.
+# GolangCI-Lint will not actually run the fixer for us.
+# In the future we can remove this and have the linter auto-fix.
+.PHONY: lint-fix
+lint-fix:
+	hack/lint-fix.sh
+
 .PHONY: verify-scripts
 verify-scripts:
 	bash -x hack/verify-deepcopy.sh

hack/lint-fix.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
+
+# Build codegen-crds when it's not present and not overriden for a specific file.
+if [ -z "${KAL:-}" ];then
+  ${TOOLS_MAKE} kal
+  KAL="${TOOLS_OUTPUT}/kal"
+fi
+
+"${KAL}" -fix ./...

tools/Makefile

@@ -46,9 +46,6 @@ publish-kubebuilder-tools:
 .PHONY:codegen
 codegen: $(OUTPUT_DIR)/codegen
 
-.PHONY:prerelease-lifecycle-gen
-prerelease-lifecycle-gen: $(OUTPUT_DIR)/prerelease-lifecycle-gen
-
 .PHONY:controller-gen
 controller-gen: $(OUTPUT_DIR)/controller-gen
 
@@ -61,9 +58,15 @@ go-to-protobuf: $(OUTPUT_DIR)/go-to-protobuf
 .PHONY:golangci-kal
 golangci-kal: $(OUTPUT_DIR)/golangci-kal
 
+.PHONY:kal
+kal: $(OUTPUT_DIR)/kal
+
 .PHONY:openapi-gen
 openapi-gen: $(OUTPUT_DIR)/openapi-gen
 
+.PHONY:prerelease-lifecycle-gen
+prerelease-lifecycle-gen: $(OUTPUT_DIR)/prerelease-lifecycle-gen
+
 .PHONY:protoc-gen-gogo
 protoc-gen-gogo: $(OUTPUT_DIR)/protoc-gen-gogo
 
@@ -111,6 +114,9 @@ $(OUTPUT_DIR)/golangci-kal: $(OUTPUT_DIR)/vendor-version $(OUTPUT_DIR)/golangci-
 	@ mv bin/golangci-kal $(OUTPUT_DIR)/golangci-kal
 	@ rmdir bin
 
+$(OUTPUT_DIR)/kal: $(OUTPUT_DIR)/vendor-version
+	go build -mod=vendor -o $(OUTPUT_DIR)/kal ./vendor/github.com/JoelSpeed/kal/cmd/kal
+
 $(OUTPUT_DIR)/openapi-gen: $(OUTPUT_DIR)/vendor-version
 	go build -mod=vendor -o $(OUTPUT_DIR)/openapi-gen ./vendor/k8s.io/code-generator/cmd/openapi-gen
 

tools/tools.go

@@ -5,6 +5,7 @@ package tools
 
 import (
 	_ "github.com/JoelSpeed/kal"
+	_ "github.com/JoelSpeed/kal/cmd/kal"
 	_ "github.com/gogo/protobuf/gogoproto"
 	_ "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/sortkeys"