From e4b2fab92411128b2af02587d3850ca68fe36b6b Mon Sep 17 00:00:00 2001
From: Damyan Yordanov <damyan.yordanov@sap.com>
Date: Fri, 28 Jun 2024 11:56:09 +0200
Subject: [PATCH 1/2] Fix makefile `goimports` target

Missing `GOIMPORTS` and `GOIMPORTS_VERSION` variables leads to a
silently failing goimport target, as well as all its reverse dependency
targets. Example:
```
make fmt
w .
11:58  up 1 day, 37 mins, 6 users, load averages: 1.40 1.74 2.26
USER       TTY      FROM    LOGIN@  IDLE WHAT```
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index ba130fbe..435eadbc 100644
--- a/Makefile
+++ b/Makefile
@@ -170,6 +170,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen-$(CONTROLLER_TOOLS_VERSION)
 ENVTEST ?= $(LOCALBIN)/setup-envtest-$(ENVTEST_VERSION)
 GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 ADDLICENSE ?= $(LOCALBIN)/addlicense
+GOIMPORTS ?= $(LOCALBIN)/goimports
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.3.0
@@ -177,6 +178,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.14.0
 ENVTEST_VERSION ?= latest
 GOLANGCI_LINT_VERSION ?= v1.54.2
 ADDLICENSE_VERSION ?= v1.1.1
+GOIMPORTS_VERSION ?= v0.22.0
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

From e1c166dde7598c552ef3613c51f0428c7fe35757 Mon Sep 17 00:00:00 2001
From: Damyan Yordanov <damyan.yordanov@sap.com>
Date: Fri, 28 Jun 2024 12:06:13 +0200
Subject: [PATCH 2/2] Add version to downloaded goimports binary

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 435eadbc..6dbba41e 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen-$(CONTROLLER_TOOLS_VERSION)
 ENVTEST ?= $(LOCALBIN)/setup-envtest-$(ENVTEST_VERSION)
 GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 ADDLICENSE ?= $(LOCALBIN)/addlicense
-GOIMPORTS ?= $(LOCALBIN)/goimports
+GOIMPORTS ?= $(LOCALBIN)/goimports-$(GOIMPORTS_VERSION)
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.3.0