From be6b11299ecbb951c51fddda0ebaacdbd82eccad Mon Sep 17 00:00:00 2001 From: bufdev Date: Sat, 18 Oct 2025 14:16:23 -0400 Subject: [PATCH] Makego cleanup --- make/buf/all.mk | 4 --- make/go/bandeps.mk | 16 ----------- make/go/bufprivateusage.mk | 16 ----------- make/go/bufstyle.mk | 16 ----------- make/go/dep_govulncheck.mk | 25 +++++++++++++++++ make/go/go.mk | 56 +++++++++++++++++++++++++++++++++++++- make/go/godoclint.mk | 16 ----------- 7 files changed, 80 insertions(+), 69 deletions(-) delete mode 100644 make/go/bandeps.mk delete mode 100644 make/go/bufprivateusage.mk delete mode 100644 make/go/bufstyle.mk create mode 100644 make/go/dep_govulncheck.mk delete mode 100644 make/go/godoclint.mk diff --git a/make/buf/all.mk b/make/buf/all.mk index 3bc2fc1fa8..037ece353b 100644 --- a/make/buf/all.mk +++ b/make/buf/all.mk @@ -67,10 +67,6 @@ include make/go/dep_protoc_gen_connect_go.mk include make/go/go.mk include make/go/docker.mk include make/go/license_header.mk -include make/go/bandeps.mk -include make/go/bufprivateusage.mk -include make/go/bufstyle.mk -include make/go/godoclint.mk include make/go/buf.mk installtest:: $(PROTOC) $(PROTOC_GEN_GO) diff --git a/make/go/bandeps.mk b/make/go/bandeps.mk deleted file mode 100644 index 1b2c67ea02..0000000000 --- a/make/go/bandeps.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Managed by makego. DO NOT EDIT. - -# Must be set -$(call _assert_var,MAKEGO) -$(call _conditional_include,$(MAKEGO)/base.mk) -$(call _conditional_include,make/go/dep_bandeps.mk) - -BANDEPS_CONFIG ?= - -ifneq ($(BANDEPS_CONFIG),) -.PHONY: bandeps -bandeps: $(BANDEPS) - bandeps -f $(BANDEPS_CONFIG) - -postlonglint:: bandeps -endif diff --git a/make/go/bufprivateusage.mk b/make/go/bufprivateusage.mk deleted file mode 100644 index 9e80d409c5..0000000000 --- a/make/go/bufprivateusage.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Managed by makego. DO NOT EDIT. - -# Must be set -$(call _assert_var,MAKEGO) -$(call _conditional_include,$(MAKEGO)/base.mk) -$(call _conditional_include,make/go/dep_bufprivateusage.mk) - -BUFPRIVATEUSAGE_PKGS ?= - -ifneq ($(BUFPRIVATEUSAGE_PKGS),) -.PHONY: bufprivateusage -bufprivateusage: $(BUFPRIVATEUSAGE) - bufprivateusage $(BUFPRIVATEUSAGE_PKGS) - -postprepostgenerate:: bufprivateusage -endif diff --git a/make/go/bufstyle.mk b/make/go/bufstyle.mk deleted file mode 100644 index 5273367579..0000000000 --- a/make/go/bufstyle.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Managed by makego. DO NOT EDIT. - -# Must be set -$(call _assert_var,MAKEGO) -$(call _conditional_include,$(MAKEGO)/base.mk) -$(call _conditional_include,$(MAKEGO)/go.mk) -$(call _conditional_include,make/go/dep_bufstyle.mk) -# Must be set -$(call _assert_var,GOPKGS) - -.PHONY: bufstyle -bufstyle: $(BUFSTYLE) - @echo bufstyle GOPKGS - @bufstyle $(GOPKGS) - -postlint:: bufstyle diff --git a/make/go/dep_govulncheck.mk b/make/go/dep_govulncheck.mk new file mode 100644 index 0000000000..ad11e44dd6 --- /dev/null +++ b/make/go/dep_govulncheck.mk @@ -0,0 +1,25 @@ +# Managed by makego. DO NOT EDIT. +# +# Must be set +$(call _assert_var,MAKEGO) +$(call _conditional_include,$(MAKEGO)/base.mk) +$(call _assert_var,CACHE_VERSIONS) +$(call _assert_var,CACHE_BIN) + +# We want to ensure we rebuild govulncheck every time we require a new Go minor version. +# Otherwise, the cached version may not support the latest language features. +GOVULNCHECK_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2) + +# Settable +# https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck 20250106 checked 20250212 +GOVULNCHECK_VERSION ?= v1.1.4 + +GOVULNCHECK := $(CACHE_VERSIONS)/govulncheck/$(GOVULNCHECK_VERSION)-go$(GOVULNCHECK_GO_VERSION) +$(GOVULNCHECK): + @rm -f $(CACHE_BIN)/govulncheck + GOBIN=$(CACHE_BIN) go install golang.org/x/vuln/cmd/govulncheck@$(GOVULNCHECK_VERSION) + @rm -rf $(dir $(GOVULNCHECK)) + @mkdir -p $(dir $(GOVULNCHECK)) + @touch $(GOVULNCHECK) + +dockerdeps:: $(GOVULNCHECK) diff --git a/make/go/go.mk b/make/go/go.mk index 9086fc7cee..6155f56c44 100644 --- a/make/go/go.mk +++ b/make/go/go.mk @@ -3,7 +3,12 @@ # Must be set $(call _assert_var,MAKEGO) $(call _conditional_include,$(MAKEGO)/base.mk) +$(call _conditional_include,$(MAKEGO)/dep_bandeps.mk) +$(call _conditional_include,$(MAKEGO)/dep_bufstyle.mk) +$(call _conditional_include,$(MAKEGO)/dep_bufprivateusage.mk) +$(call _conditional_include,$(MAKEGO)/dep_godoclint.mk) $(call _conditional_include,$(MAKEGO)/dep_golangci_lint.mk) +$(call _conditional_include,$(MAKEGO)/dep_govulncheck.mk) $(call _conditional_include,$(MAKEGO)/dep_yq.mk) # Must be set $(call _assert_var,GO_MODULE) @@ -26,9 +31,19 @@ GO_MOD_TOOLCHAIN ?= # Settable GO_ALL_REPO_PKGS ?= ./cmd/... ./internal/... # Settable +SKIP_BUFSTYLE ?= +# Settable +SKIP_GODOCLINT ?= +# Settable SKIP_GOLANGCI_LINT ?= # Settable +SKIP_GOVULNCHECK ?= +# Settable DISALLOW_NOLINT ?= +# Settable +BUFPRIVATEUSAGE_PKGS ?= +# Settable +BANDEPS_CONFIG ?= # Runtime GOPKGS ?= $(GO_ALL_REPO_PKGS) @@ -103,6 +118,14 @@ endif format:: gofmtmodtidy +ifneq ($(BUFPRIVATEUSAGE_PKGS),) +.PHONY: bufprivateusage +bufprivateusage: $(BUFPRIVATEUSAGE) + bufprivateusage $(BUFPRIVATEUSAGE_PKGS) + +postprepostgenerate:: bufprivateusage +endif + .PHONY: checknolintlint checknolintlint: $(YQ) ifneq ($(DISALLOW_NOLINT),) @@ -114,6 +137,24 @@ else bash $(MAKEGO)/scripts/checknolintlint.bash endif +.PHONY: bufstyle +bufstyle: $(BUFSTYLE) +ifneq ($(SKIP_BUFSTYLE),) + @echo Skipping bufstyle... +else + @echo bufstyle GOPKGS + @bufstyle $(GOPKGS) +endif + +.PHONY: godoclint +godoclint: $(GODOCLINT) +ifneq ($(SKIP_GODOCLINT),) + @echo Skipping godoclint... +else + @echo godoclint GOPKGS + @godoclint $(GOPKGS) +endif + .PHONY: golangcilint golangcilint: $(GOLANGCI_LINT) ifneq ($(SKIP_GOLANGCI_LINT),) @@ -123,16 +164,29 @@ else golangci-lint run --timeout $(GOLANGCILINTTIMEOUT) endif +.PHONY: govulncheck +govulncheck: $(GOVULNCHECK) + @echo govulncheck GOPKGS + @govulncheck $(GOPKGS) + .PHONY: postlint postlint:: .PHONY: postlonglint postlonglint:: +ifneq ($(BANDEPS_CONFIG),) +.PHONY: bandeps +bandeps: $(BANDEPS) + bandeps -f $(BANDEPS_CONFIG) + +postlonglint:: bandeps +endif + .PHONY: shortlint shortlint: ## Run all linters but exclude long-running linters. @$(MAKE) checknodiffgenerated - @$(MAKE) checknolintlint golangcilint postlint + @$(MAKE) checknolintlint bufstyle godoclint golangcilint govulncheck postlint .PHONY: lint lint: ## Run all linters. diff --git a/make/go/godoclint.mk b/make/go/godoclint.mk deleted file mode 100644 index b579ada967..0000000000 --- a/make/go/godoclint.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Managed by makego. DO NOT EDIT. - -# Must be set -$(call _assert_var,MAKEGO) -$(call _conditional_include,$(MAKEGO)/base.mk) -$(call _conditional_include,$(MAKEGO)/go.mk) -$(call _conditional_include,make/go/dep_godoclint.mk) -# Must be set -$(call _assert_var,GOPKGS) - -.PHONY: godoclint -godoclint: $(GODOCLINT) - @echo godoclint GOPKGS - @godoclint $(GOPKGS) - -postlint:: godoclint