wip: temp: fix govulncheck

Signed-off-by: Ashley Davis <[email protected]>

Author: SgtCoDFish

klone.yaml

@@ -13,9 +13,9 @@ targets:
       repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
       repo_path: modules/generate-verify
     - folder_name: go
-      repo_url: https://github.com/cert-manager/makefile-modules.git
-      repo_ref: main
-      repo_hash: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
+      repo_url: https://github.com/SgtCoDFish/cert-manager-makefile-modules.git
+      repo_ref: govulncheck-goprivate
+      repo_hash: b341741b2ef923b257763d809cb30e8bac512f32
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git

make/00_mod.mk

@@ -43,6 +43,7 @@ helm_chart_version := $(VERSION)
 helm_labels_template_name := preflight.labels
 
 govulncheck_generate_org := jetstack
+govulncheck_goprivate := github.com/jetstack/venafi-connection-lib
 
 # Allows us to replace the Helm values.yaml's image.repository and image.tag
 # with the right values.

make/_shared/go/01_mod.mk

@@ -58,6 +58,7 @@ generate-go-mod-tidy: | $(NEEDS_GO)
 shared_generate_targets += generate-go-mod-tidy
 
 default_govulncheck_generate_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
+
 # The base directory used to copy the govulncheck GH action from. This can be
 # overwritten with an action with extra authentication or with a totally different
 # pipeline (eg. a GitLab pipeline).
@@ -67,6 +68,10 @@ govulncheck_generate_base_dir ?= $(default_govulncheck_generate_base_dir)
 # being run on every fork of the repo.
 govulncheck_generate_org ?= cert-manager
 
+# Any closed-source or inaccessible Go modules that should be ignored by govulncheck; not needed
+# for most open-source projects.
+govulncheck_goprivate ?=
+
 .PHONY: generate-govulncheck
 ## Generate base files in the repository
 ## @category [shared] Generate/ Verify
@@ -96,7 +101,7 @@ verify-govulncheck: | $(NEEDS_GOVULNCHECK)
 				target=$$(dirname $${d}); \
 				echo "Running 'GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(bin_dir)/tools/govulncheck ./...' in directory '$${target}'"; \
 				pushd "$${target}" >/dev/null; \
-				GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(GOVULNCHECK) ./... || exit; \
+				GOPRIVATE=$(govulncheck_goprivate) GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(GOVULNCHECK) ./... || exit; \
 				popd >/dev/null; \
 				echo ""; \
 			done