Skip to content

Commit 369f8b7

Browse files
authored
build: bind mockery into go mod (#173)
Signed-off-by: Artur Troian <troian.ap@gmail.com>
1 parent 3952c34 commit 369f8b7

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ require (
2828
github.com/spf13/viper v1.16.0
2929
github.com/stretchr/testify v1.8.4
3030
github.com/tendermint/tendermint v0.34.27
31+
github.com/vektra/mockery/v2 v2.40.1
3132
go.uber.org/zap v1.24.0
3233
golang.org/x/net v0.14.0
3334
golang.org/x/sync v0.3.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,6 +1893,8 @@ github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPU
18931893
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
18941894
github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
18951895
github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
1896+
github.com/vektra/mockery/v2 v2.14.0 h1:KZ1p5Hrn8tiY+LErRMr14HHle6khxo+JKOXLBW/yfqs=
1897+
github.com/vektra/mockery/v2 v2.14.0/go.mod h1:bnD1T8tExSgPD1ripLkDbr60JA9VtQeu12P3wgLZd7M=
18961898
github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
18971899
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
18981900
github.com/vmware/govmomi v0.18.0 h1:f7QxSmP7meCtoAmiKZogvVbLInT+CZx6Px6K5rYsJZo=

make/init.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ AKASHD_LOCAL_PATH := $(shell $(GO) list -mod=readonly -m -f '{{ .Dir
8888
AKASHD_VERSION := $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' $(AKASHD_MODULE) | cut -c2-)
8989
GRPC_GATEWAY_VERSION := $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/grpc-ecosystem/grpc-gateway)
9090
GOLANGCI_LINT_VERSION ?= v1.51.2
91-
GOLANG_VERSION ?= 1.16.1
9291
STATIK_VERSION ?= v0.1.7
9392
GIT_CHGLOG_VERSION ?= v0.15.1
94-
MOCKERY_VERSION ?= 2.32.0
93+
MOCKERY_PACKAGE_NAME := github.com/vektra/mockery/v2
94+
MOCKERY_VERSION ?= $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' $(MOCKERY_PACKAGE_NAME))
9595
K8S_CODE_GEN_VERSION ?= $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' k8s.io/code-generator)
9696

9797
AKASHD_BUILD_FROM_SRC := false

make/setup-cache.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $(GIT_CHGLOG): $(GIT_CHGLOG_VERSION_FILE)
7070
$(MOCKERY_VERSION_FILE): $(AP_DEVCACHE)
7171
@echo "installing mockery $(MOCKERY_VERSION) ..."
7272
rm -f $(MOCKERY)
73-
GOBIN=$(AP_DEVCACHE_BIN) go install -ldflags '-s -w -X github.com/vektra/mockery/v2/pkg/config.SemVer=$(MOCKERY_VERSION)' github.com/vektra/mockery/v2@v$(MOCKERY_VERSION)
73+
GOBIN=$(AP_DEVCACHE_BIN) go install -ldflags '-s -w -X $(MOCKERY_PACKAGE_NAME)/pkg/config.SemVer=$(MOCKERY_VERSION)' $(MOCKERY_PACKAGE_NAME)@$(MOCKERY_VERSION)
7474
rm -rf "$(dir $@)"
7575
mkdir -p "$(dir $@)"
7676
touch $@

tools.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package tools
44

55
// nolint
66
import (
7+
_ "github.com/vektra/mockery/v2"
78
_ "k8s.io/code-generator"
89
_ "sigs.k8s.io/kind"
910
)

0 commit comments

Comments
 (0)