Allow overriding binaries installed by hack/go-install.sh

Makefile targets for binary dependencies (i.e. code-generator,
openshift-goimports and golangci-lint) now use version-less
filepaths:

    `$(TOOLS_DIR)/<Binary>` instead of `$(TOOLS_DIR)/<Binary>-<Version>`

`$(TOOLS_DIR)/<Binary>` may be a symlink to the versioned executable file.

Secondly, hack/go-install.sh now adds a check for `$(TOOLS_DIR)/<Binary>`
to be present and executable, in which case it skips `go install` invocation.

This allows for making local changes to these dependencies (e.g. when working
on kcp-dev/code-generator) and generating client code.

On-behalf-of: SAP [email protected]
Signed-off-by: Robert Vasek <[email protected]>

Author: gman0

Makefile

@@ -42,39 +42,39 @@ endif
 
 CONTROLLER_GEN_VER := v0.16.1
 CONTROLLER_GEN_BIN := controller-gen
-CONTROLLER_GEN := $(TOOLS_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
+CONTROLLER_GEN := $(TOOLS_DIR)/$(CONTROLLER_GEN_BIN)
 export CONTROLLER_GEN # so hack scripts can use it
 
 YAML_PATCH_VER ?= v0.0.11
 YAML_PATCH_BIN := yaml-patch
-YAML_PATCH := $(TOOLS_DIR)/$(YAML_PATCH_BIN)-$(YAML_PATCH_VER)
+YAML_PATCH := $(TOOLS_DIR)/$(YAML_PATCH_BIN)
 export YAML_PATCH # so hack scripts can use it
 
 OPENSHIFT_GOIMPORTS_VER := c72f1dc2e3aacfa00aece3391d938c9bc734e791
 OPENSHIFT_GOIMPORTS_BIN := openshift-goimports
-OPENSHIFT_GOIMPORTS := $(TOOLS_DIR)/$(OPENSHIFT_GOIMPORTS_BIN)-$(OPENSHIFT_GOIMPORTS_VER)
+OPENSHIFT_GOIMPORTS := $(TOOLS_DIR)/$(OPENSHIFT_GOIMPORTS_BIN)
 export OPENSHIFT_GOIMPORTS # so hack scripts can use it
 
 GOLANGCI_LINT_VER := v1.62.2
 GOLANGCI_LINT_BIN := golangci-lint
-GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
+GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)
 
 HTTEST_VER := v0.3.2
 HTTEST_BIN := httest
 HTTEST := $(TOOLS_GOBIN_DIR)/$(HTTEST_BIN)-$(HTTEST_VER)
 
 GOTESTSUM_VER := v1.8.1
 GOTESTSUM_BIN := gotestsum
-GOTESTSUM := $(abspath $(TOOLS_DIR))/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)
+GOTESTSUM := $(abspath $(TOOLS_DIR))/$(GOTESTSUM_BIN)
 
 LOGCHECK_VER := v0.8.2
 LOGCHECK_BIN := logcheck
-LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER)
+LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)
 export LOGCHECK # so hack scripts can use it
 
 CODE_GENERATOR_VER := v2.3.0
 CODE_GENERATOR_BIN := code-generator
-CODE_GENERATOR := $(TOOLS_GOBIN_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER)
+CODE_GENERATOR := $(TOOLS_GOBIN_DIR)/$(CODE_GENERATOR_BIN)
 export CODE_GENERATOR # so hack scripts can use it
 
 KCP_APIGEN_BIN := apigen

hack/go-install.sh

@@ -49,6 +49,9 @@ function clean {
 }
 trap clean EXIT
 
+# An executable already exists, exit early.
+[[ -f "${GOBIN}/${2}" && -x $(realpath "${GOBIN}/${2}") ]] && exit 0
+
 rm "${GOBIN}/${2}"* > /dev/null 2>&1 || true
 
 cd "${tmp_dir}"
@@ -59,4 +62,4 @@ go mod init fake/mod
 # install the golang module specified as the first argument
 go install -tags kcptools "${1}@${3}"
 mv "${GOBIN}/${2}" "${GOBIN}/${2}-${3}"
-ln -sf "${GOBIN}/${2}-${3}" "${GOBIN}/${2}"
+ln -sf "${GOBIN}/${2}-${3}" "${GOBIN}/${2}"