Skip to content

Commit f4407d8

Browse files
committed
make mocks using versioned mockery, in tools.go
1 parent f700fb5 commit f4407d8

File tree

7 files changed

+198
-80
lines changed

7 files changed

+198
-80
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ canary:
55
go build -o bin/canary cmd/canary/*.go
66

77
mocks:
8-
cd pkg/aiven && mockery --inpackage --all --case snake
8+
cd pkg/aiven && go run github.com/vektra/mockery/v2 --inpackage --all --case snake
99

1010
test:
1111
go test ./... -count=1

go.mod

+24-12
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@ require (
1313
github.com/spf13/pflag v1.0.5
1414
github.com/spf13/viper v1.17.0
1515
github.com/stretchr/testify v1.8.4
16+
github.com/vektra/mockery/v2 v2.38.0
1617
gotest.tools v2.2.0+incompatible
17-
k8s.io/apimachinery v0.27.2
18-
k8s.io/client-go v0.27.2
19-
sigs.k8s.io/controller-runtime v0.15.1
18+
k8s.io/apimachinery v0.28.3
19+
k8s.io/client-go v0.28.3
20+
sigs.k8s.io/controller-runtime v0.16.3
2021
)
2122

2223
require (
2324
github.com/beorn7/perks v1.0.1 // indirect
2425
github.com/cespare/xxhash/v2 v2.2.0 // indirect
26+
github.com/chigopher/pathlib v0.15.0 // indirect
2527
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2628
github.com/eapache/go-resiliency v1.3.0 // indirect
2729
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
2830
github.com/eapache/queue v1.1.0 // indirect
29-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
31+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3032
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3133
github.com/fsnotify/fsnotify v1.6.0 // indirect
3234
github.com/go-logr/logr v1.2.4 // indirect
@@ -37,7 +39,7 @@ require (
3739
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3840
github.com/golang/protobuf v1.5.3 // indirect
3941
github.com/golang/snappy v0.0.4 // indirect
40-
github.com/google/gnostic v0.6.9 // indirect
42+
github.com/google/gnostic-models v0.6.8 // indirect
4143
github.com/google/gofuzz v1.2.0 // indirect
4244
github.com/google/uuid v1.3.0 // indirect
4345
github.com/hashicorp/errwrap v1.0.0 // indirect
@@ -46,18 +48,25 @@ require (
4648
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
4749
github.com/hashicorp/go-uuid v1.0.3 // indirect
4850
github.com/hashicorp/hcl v1.0.0 // indirect
51+
github.com/huandu/xstrings v1.4.0 // indirect
52+
github.com/iancoleman/strcase v0.2.0 // indirect
4953
github.com/imdario/mergo v0.3.16 // indirect
54+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5055
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
5156
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
5257
github.com/jcmturner/gofork v1.7.6 // indirect
5358
github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
5459
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
60+
github.com/jinzhu/copier v0.3.5 // indirect
5561
github.com/josharian/intern v1.0.0 // indirect
5662
github.com/json-iterator/go v1.1.12 // indirect
5763
github.com/klauspost/compress v1.17.0 // indirect
5864
github.com/magiconair/properties v1.8.7 // indirect
5965
github.com/mailru/easyjson v0.7.7 // indirect
66+
github.com/mattn/go-colorable v0.1.13 // indirect
67+
github.com/mattn/go-isatty v0.0.17 // indirect
6068
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
69+
github.com/mitchellh/go-homedir v1.1.0 // indirect
6170
github.com/mitchellh/hashstructure v1.1.0 // indirect
6271
github.com/mitchellh/mapstructure v1.5.0 // indirect
6372
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -71,35 +80,38 @@ require (
7180
github.com/prometheus/common v0.44.0 // indirect
7281
github.com/prometheus/procfs v0.11.1 // indirect
7382
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
83+
github.com/rs/zerolog v1.29.0 // indirect
7484
github.com/sagikazarmark/locafero v0.3.0 // indirect
7585
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7686
github.com/sourcegraph/conc v0.3.0 // indirect
7787
github.com/spf13/afero v1.10.0 // indirect
7888
github.com/spf13/cast v1.5.1 // indirect
89+
github.com/spf13/cobra v1.7.0 // indirect
7990
github.com/stretchr/objx v0.5.0 // indirect
8091
github.com/subosito/gotenv v1.6.0 // indirect
81-
go.uber.org/atomic v1.9.0 // indirect
82-
go.uber.org/multierr v1.9.0 // indirect
92+
go.uber.org/multierr v1.11.0 // indirect
8393
golang.org/x/crypto v0.14.0 // indirect
8494
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
95+
golang.org/x/mod v0.12.0 // indirect
8596
golang.org/x/net v0.17.0 // indirect
8697
golang.org/x/oauth2 v0.12.0 // indirect
8798
golang.org/x/sys v0.13.0 // indirect
8899
golang.org/x/term v0.13.0 // indirect
89100
golang.org/x/text v0.13.0 // indirect
90101
golang.org/x/time v0.3.0 // indirect
91-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
102+
golang.org/x/tools v0.13.0 // indirect
103+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
92104
google.golang.org/appengine v1.6.7 // indirect
93105
google.golang.org/protobuf v1.31.0 // indirect
94106
gopkg.in/inf.v0 v0.9.1 // indirect
95107
gopkg.in/ini.v1 v1.67.0 // indirect
96108
gopkg.in/yaml.v2 v2.4.0 // indirect
97109
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/api v0.27.2 // indirect
99-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
100-
k8s.io/component-base v0.27.2 // indirect
110+
k8s.io/api v0.28.3 // indirect
111+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
112+
k8s.io/component-base v0.28.3 // indirect
101113
k8s.io/klog/v2 v2.100.1 // indirect
102-
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
114+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
103115
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
104116
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
105117
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)