mockery v3

Author: moukoublen

.mockery.yaml

@@ -0,0 +1,17 @@
+all: false
+dir: '{{.InterfaceDir}}'
+filename: mocks_test.go
+force-file-write: true
+formatter: goimports
+log-level: info
+structname: '{{.Mock}}{{.InterfaceName}}'
+pkgname: '{{.SrcPackageName}}'
+recursive: false
+require-template-schema-exists: true
+template: testify
+template-schema: '{{.Template}}.schema.json'
+packages:
+  github.com/moukoublen/goboilerplate:
+    config:
+      all: true
+      recursive: true

.mockery.yml

@@ -18,7 +18,6 @@
     "gojq",
     "golangci",
     "gomod",
-    "GOPATH",
     "GOVERSION",
     "honnef",
     "httpcompress",

.vscode/cspell.json

@@ -6,8 +6,6 @@ GO_FILES = find . -type f -name '*.go' -not -path './vendor/*'
 
 export GO111MODULE := on
 #export GOFLAGS := -mod=vendor
-GOPATH := $(shell go env GOPATH)
-GO_VER := $(shell go env GOVERSION)
 BUILD_OUTPUT ?= $(CURDIR)/output
 
 

internal/zhttp/mock_http_client_test.go renamed to internal/zhttp/mocks_test.go

@@ -5,6 +5,8 @@
 ## NOTINTERMEDIATE requires make >=4.4
 .NOTINTERMEDIATE:
 
+GO_VER := $(shell go env GOVERSION)
+
 # https://www.gnu.org/software/make/manual/make.html#Automatic-Variables
 # https://www.gnu.org/software/make/manual/make.html#Prerequisite-Types
 
@@ -14,6 +16,9 @@ TOOLS_BIN ?= $(TOOLS_DIR)/bin
 export TOOLS_BIN
 export PATH := $(TOOLS_BIN):$(PATH)
 
+.PHONY: checks
+checks: vet gofumpt goimports golangci-lint
+
 .PHONY: tools
 tools: \
 	$(TOOLS_BIN)/goimports \
@@ -158,35 +163,17 @@ air: $(TOOLS_BIN)/air
 
 ## <mockery>
 # https://github.com/vektra/mockery/releases
-MOCKERY_MOD:=github.com/vektra/mockery/v2
+MOCKERY_MOD:=github.com/vektra/mockery/v3
 MOCKERY_VER:=$(call go_mod_ver,$(MOCKERY_MOD))
 $(TOOLS_BIN)/mockery: $(TOOLS_DB)/mockery.$(MOCKERY_VER).$(GO_VER).ver
 	$(call go_install,mockery,$(MOCKERY_MOD),$(MOCKERY_VER))
 
 .PHONY: mockery
 mockery: $(TOOLS_BIN)/mockery
 	grep --recursive --files-with-matches '// Code generated by mockery' . | grep -v 'scripts/tools.mk' | grep -v 'bin/mockery' | xargs rm || true
-	mockery --config ./.mockery.yaml
+	mockery --config ./.mockery.yml
 ## </mockery>
 
-## <protobuf>
-# https://github.com/protocolbuffers/protobuf/releases
-PROTOC_VER:=v29.2
-$(TOOLS_BIN)/protoc: $(TOOLS_DB)/protoc.$(PROTOC_VER).ver
-	./scripts/install-protoc --version $(PROTOC_VER) --destination $(TOOLS_DIR)
-
-# https://github.com/protocolbuffers/protobuf-go/releases
-PROTOC-GEN-GO_CMD:=google.golang.org/protobuf/cmd/protoc-gen-go
-PROTOC-GEN-GO_VER:=v1.36.1
-$(TOOLS_BIN)/protoc-gen-go: $(TOOLS_DB)/protoc-gen-go.$(PROTOC-GEN-GO_VER).$(GO_VER).ver
-	$(call go_install,protoc-gen-go,$(PROTOC-GEN-GO_CMD),$(PROTOC-GEN-GO_VER))
-
-.PHONY: proto
-proto: $(TOOLS_BIN)/protoc $(TOOLS_BIN)/protoc-gen-go
-	$(TOOLS_BIN)/protoc --version
-	$(TOOLS_BIN)/protoc-gen-go --version
-## </protobuf>
-
 ## <shfmt>
 # https://github.com/mvdan/sh/releases
 SHFMT_MOD:=mvdan.cc/sh/v3

scripts/go.mk

@@ -9,7 +9,7 @@ require (
 	github.com/air-verse/air v1.62.0
 	github.com/golangci/golangci-lint/v2 v2.1.6
 	github.com/itchyny/gojq v0.12.17
-	github.com/vektra/mockery/v2 v2.53.4
+	github.com/vektra/mockery/v3 v3.3.2
 	golang.org/x/tools v0.33.0
 	honnef.co/go/tools v0.6.1
 	mvdan.cc/gofumpt v0.8.0
@@ -47,6 +47,7 @@ require (
 	github.com/bombsimon/wsl/v4 v4.7.0 // indirect
 	github.com/breml/bidichk v0.3.3 // indirect
 	github.com/breml/errchkjson v0.4.1 // indirect
+	github.com/brunoga/deep v1.2.4 // indirect
 	github.com/butuzov/ireturn v0.4.0 // indirect
 	github.com/butuzov/mirror v1.3.0 // indirect
 	github.com/catenacyber/perfsprint v0.9.1 // indirect
@@ -70,6 +71,7 @@ require (
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/ettle/strcase v0.2.0 // indirect
 	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
 	github.com/firefart/nonamedreturns v1.0.6 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -108,18 +110,24 @@ require (
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/iancoleman/strcase v0.3.0 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/itchyny/timefmt-go v0.1.6 // indirect
+	github.com/jedib0t/go-pretty/v6 v6.6.7 // indirect
 	github.com/jgautheron/goconst v1.8.1 // indirect
 	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
-	github.com/jinzhu/copier v0.4.0 // indirect
 	github.com/jjti/go-spancheck v0.6.4 // indirect
 	github.com/julz/importas v0.2.0 // indirect
 	github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
 	github.com/kisielk/errcheck v1.9.0 // indirect
 	github.com/kkHAIKE/contextcheck v1.1.6 // indirect
+	github.com/knadh/koanf/maps v0.1.1 // indirect
+	github.com/knadh/koanf/parsers/yaml v0.1.0 // indirect
+	github.com/knadh/koanf/providers/env v1.0.0 // indirect
+	github.com/knadh/koanf/providers/file v1.1.2 // indirect
+	github.com/knadh/koanf/providers/posflag v0.1.0 // indirect
+	github.com/knadh/koanf/providers/structs v0.1.0 // indirect
+	github.com/knadh/koanf/v2 v2.1.2 // indirect
 	github.com/kulti/thelper v0.6.3 // indirect
 	github.com/kunwardeep/paralleltest v1.0.14 // indirect
 	github.com/lasiar/canonicalheader v1.1.2 // indirect
@@ -140,8 +148,9 @@ require (
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mgechev/revive v1.9.0 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moricho/tparallel v0.3.2 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/nakabonne/nestif v0.3.1 // indirect
@@ -200,6 +209,9 @@ require (
 	github.com/ultraware/whitespace v0.2.0 // indirect
 	github.com/uudashr/gocognit v1.2.0 // indirect
 	github.com/uudashr/iface v1.3.1 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xen0n/gosmopolitan v1.3.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/yagipy/maintidx v1.0.0 // indirect
@@ -213,6 +225,7 @@ require (
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
 	golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/sync v0.14.0 // indirect