Skip to content

Commit 62a3848

Browse files
committed
Remove goimports_vendorlesspath overlay to fix counterfeiter conflict
The hack/overlays/goimports_vendorlesspath.go overlay was causing conflicts with counterfeiter mock generation because the vendored golang.org/x/tools/imports now includes VendorlessPath function. This overlay is no longer needed as the function is now available in the vendored dependency. Fixes: make verify counterfeiter errors
1 parent ca4b12e commit 62a3848

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,7 @@ mockgen: #HELP Generate mocks
340340
# Consider using counterfeiter:generate directives to speed things up.
341341
# See https://github.com/maxbrunsfeld/counterfeiter#step-2b---add-counterfeitergenerate-directives for more information.
342342
# Set the "COUNTERFEITER_NO_GENERATE_WARNING" environment variable to suppress this message.
343-
@set -e; \
344-
overlay_file=$$(mktemp "$(CURDIR)/hack/overlays/goimports_overlay.XXXXXX.json"); \
345-
trap 'rm -f "$$overlay_file"' EXIT; \
346-
printf '{\n "Replace": {\n "%s/vendor/golang.org/x/tools/imports/vendorlesspath.go": "%s/hack/overlays/goimports_vendorlesspath.go"\n }\n}\n' "$(CURDIR)" "$(CURDIR)" > "$$overlay_file"; \
347-
GO111MODULE=on GOWORK=off COUNTERFEITER_NO_GENERATE_WARNING=1 GOFLAGS="$$GOFLAGS -overlay=$$overlay_file" go generate ./pkg/...
343+
GO111MODULE=on GOWORK=off COUNTERFEITER_NO_GENERATE_WARNING=1 go generate ./pkg/...
348344

349345
#SECTION Verification
350346

hack/overlays/goimports_vendorlesspath.go

Lines changed: 0 additions & 14 deletions
This file was deleted.

pkg/api/wrappers/wrappersfakes/fake_install_strategy_deployment_interface.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)