Skip to content

Migrate to mockery v3 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slok merged 1 commit into from
May 2, 2025
Merged

Migrate to mockery v3 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .mockery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
dir: '{{.InterfaceDir}}/{{.SrcPackageName}}mock'
filename: mocks.go
force-file-write: true
structname: '{{.InterfaceName}}'
pkgname: '{{.SrcPackageName}}mock'
template: testify
packages:
github.com/slok/kube-code-generator/internal/generate: {interfaces: {BashExecutor}}
2 changes: 1 addition & 1 deletion docker/dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.24

ARG GOLANGCI_LINT_VERSION="1.64.8"
ARG MOCKERY_VERSION="2.53.3"
ARG MOCKERY_VERSION="3.2.5"
ARG ostype=Linux

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 0 additions & 2 deletions internal/generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ type BashExecutor interface {
BashExec(ctx context.Context, bashCmd string) (string, error)
}

//go:generate mockery --case underscore --output generatemock --outpkg generatemock --name BashExecutor

// StdBashExecutor is an standard bash executor.
var StdBashExecutor = stdBashExecutor(false)

Expand Down
56 changes: 0 additions & 56 deletions internal/generate/generatemock/bash_executor.go
View file
Open in desktop

This file was deleted.

93 changes: 93 additions & 0 deletions internal/generate/generatemock/mocks.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion scripts/gogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
set -o errexit
set -o nounset

go generate ./...
go generate ./...
mockery