Skip to content

Commit abbedf8

Browse files
josvazgjosvazg
committed
Fix mockery for go 1.25 as a go tool
1 parent 027287f commit abbedf8

File tree

5 files changed

+89
-519
lines changed

5 files changed

+89
-519
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ generate: ${GO_SOURCES} ## Generate code
286286
ifdef EXPERIMENTAL
287287
controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./internal/nextapi/v1/..."
288288
endif
289-
mockery
289+
go tool -modfile=tools/toolbox/go.mod mockery
290290
$(MAKE) fmt
291291

292292
.PHONY: check-missing-files

‎devbox.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"[email protected]",
2424
"[email protected]",
2525
"awscli2@latest",
26-
"go-mockery@2",
2726
"docker-sbom@latest",
2827
"openshift@latest",
2928
"gh@latest",

‎devbox.lock‎

Lines changed: 8 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@
354354
}
355355
},
356356
"gettext@latest": {
357-
"last_modified": "2025-10-07T08:41:47Z",
358-
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#gettext",
357+
"last_modified": "2025-10-11T06:31:15Z",
358+
"resolved": "github:NixOS/nixpkgs/362791944032cb532aabbeed7887a441496d5e6e#gettext",
359359
"source": "devbox-search",
360360
"version": "0.25.1",
361361
"systems": {
@@ -550,8 +550,8 @@
550550
}
551551
},
552552
"git@latest": {
553-
"last_modified": "2025-10-09T02:37:25Z",
554-
"resolved": "github:NixOS/nixpkgs/2dad7af78a183b6c486702c18af8a9544f298377#git",
553+
"last_modified": "2025-10-07T08:41:47Z",
554+
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#git",
555555
"source": "devbox-search",
556556
"version": "2.51.0",
557557
"systems": {
@@ -622,56 +622,8 @@
622622
}
623623
},
624624
"github:NixOS/nixpkgs/nixpkgs-unstable": {
625-
"last_modified": "2025-10-16T06:36:44Z",
626-
"resolved": "github:NixOS/nixpkgs/3cbe716e2346710d6e1f7c559363d14e11c32a43?lastModified=1760596604&narHash=sha256-J%2Fi5K6AAz%2Fy5dBePHQOuzC7MbhyTOKsd%2FGLezSbEFiM%3D"
627-
},
628-
"go-mockery@2": {
629-
"last_modified": "2025-07-13T22:45:35Z",
630-
"resolved": "github:NixOS/nixpkgs/a421ac6595024edcfbb1ef950a3712b89161c359#go-mockery",
631-
"source": "devbox-search",
632-
"version": "2.53.3",
633-
"systems": {
634-
"aarch64-darwin": {
635-
"outputs": [
636-
{
637-
"name": "out",
638-
"path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3",
639-
"default": true
640-
}
641-
],
642-
"store_path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3"
643-
},
644-
"aarch64-linux": {
645-
"outputs": [
646-
{
647-
"name": "out",
648-
"path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3",
649-
"default": true
650-
}
651-
],
652-
"store_path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3"
653-
},
654-
"x86_64-darwin": {
655-
"outputs": [
656-
{
657-
"name": "out",
658-
"path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3",
659-
"default": true
660-
}
661-
],
662-
"store_path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3"
663-
},
664-
"x86_64-linux": {
665-
"outputs": [
666-
{
667-
"name": "out",
668-
"path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3",
669-
"default": true
670-
}
671-
],
672-
"store_path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3"
673-
}
674-
}
625+
"last_modified": "2025-10-20T04:25:18Z",
626+
"resolved": "github:NixOS/nixpkgs/87848bf0cc4f87717fc813a4575f07330c3e743c?lastModified=1760934318&narHash=sha256-%2FoUYsC0lUCBory65VK%2BUHqCCsCspbL1Vgfcf1KUYqVw%3D"
675627
},
676628
"go@latest": {
677629
"last_modified": "2025-10-07T08:41:47Z",
@@ -914,8 +866,8 @@
914866
}
915867
},
916868
"jq@latest": {
917-
"last_modified": "2025-10-13T09:56:54Z",
918-
"resolved": "github:NixOS/nixpkgs/c12c63cd6c5eb34c7b4c3076c6a99e00fcab86ec#jq",
869+
"last_modified": "2025-10-12T08:13:11Z",
870+
"resolved": "github:NixOS/nixpkgs/832e3b6db48508ae436c2c7bfc0cf914eac6938e#jq",
919871
"source": "devbox-search",
920872
"version": "1.8.1",
921873
"systems": {
@@ -1270,14 +1222,6 @@
12701222
"default": true
12711223
}
12721224
]
1273-
},
1274-
"x86_64-linux": {
1275-
"outputs": [
1276-
{
1277-
"path": "/nix/store/cyxijsvrvl4v986z606yirrdk4pzcqj8-kustomize-4.3.0",
1278-
"default": true
1279-
}
1280-
]
12811225
}
12821226
}
12831227
},

‎tools/toolbox/go.mod‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,64 @@ toolchain go1.25.1
66

77
tool github.com/daixiang0/gci
88

9-
tool fybrik.io/crdoc
9+
tool (
10+
fybrik.io/crdoc
11+
github.com/vektra/mockery/v2
12+
)
1013

1114
require (
1215
dario.cat/mergo v1.0.1 // indirect
1316
fybrik.io/crdoc v0.6.4 // indirect
1417
github.com/Masterminds/goutils v1.1.1 // indirect
1518
github.com/Masterminds/semver/v3 v3.3.0 // indirect
1619
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
20+
github.com/chigopher/pathlib v0.19.1 // indirect
1721
github.com/daixiang0/gci v0.13.7 // indirect
18-
github.com/fsnotify/fsnotify v1.6.0 // indirect
19-
github.com/go-logr/logr v1.3.0 // indirect
22+
github.com/fsnotify/fsnotify v1.8.0 // indirect
23+
github.com/go-logr/logr v1.4.2 // indirect
24+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
2025
github.com/gogo/protobuf v1.3.2 // indirect
2126
github.com/google/gofuzz v1.2.0 // indirect
2227
github.com/google/uuid v1.6.0 // indirect
23-
github.com/hashicorp/hcl v1.0.0 // indirect
2428
github.com/hexops/gotextdiff v1.0.3 // indirect
2529
github.com/huandu/xstrings v1.5.0 // indirect
30+
github.com/iancoleman/strcase v0.3.0 // indirect
2631
github.com/inconshreveable/mousetrap v1.1.0 // indirect
32+
github.com/jinzhu/copier v0.4.0 // indirect
2733
github.com/json-iterator/go v1.1.12 // indirect
28-
github.com/magiconair/properties v1.8.7 // indirect
34+
github.com/mattn/go-colorable v0.1.14 // indirect
35+
github.com/mattn/go-isatty v0.0.20 // indirect
2936
github.com/mitchellh/copystructure v1.2.0 // indirect
37+
github.com/mitchellh/go-homedir v1.1.0 // indirect
3038
github.com/mitchellh/mapstructure v1.5.0 // indirect
3139
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3240
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3341
github.com/modern-go/reflect2 v1.0.2 // indirect
34-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
35-
github.com/sagikazarmark/locafero v0.3.0 // indirect
36-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
42+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
43+
github.com/rs/zerolog v1.33.0 // indirect
44+
github.com/sagikazarmark/locafero v0.7.0 // indirect
3745
github.com/shopspring/decimal v1.4.0 // indirect
3846
github.com/sirupsen/logrus v1.9.3 // indirect
3947
github.com/sourcegraph/conc v0.3.0 // indirect
40-
github.com/spf13/afero v1.10.0 // indirect
41-
github.com/spf13/cast v1.7.0 // indirect
48+
github.com/spf13/afero v1.12.0 // indirect
49+
github.com/spf13/cast v1.7.1 // indirect
4250
github.com/spf13/cobra v1.8.1 // indirect
43-
github.com/spf13/pflag v1.0.5 // indirect
44-
github.com/spf13/viper v1.17.0 // indirect
51+
github.com/spf13/pflag v1.0.6 // indirect
52+
github.com/spf13/viper v1.20.0 // indirect
4553
github.com/subosito/gotenv v1.6.0 // indirect
54+
github.com/vektra/mockery/v2 v2.53.5 // indirect
4655
go.uber.org/atomic v1.9.0 // indirect
47-
go.uber.org/multierr v1.9.0 // indirect
56+
go.uber.org/multierr v1.11.0 // indirect
4857
go.uber.org/zap v1.24.0 // indirect
4958
golang.org/x/crypto v0.36.0 // indirect
50-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
51-
golang.org/x/mod v0.20.0 // indirect
59+
golang.org/x/mod v0.23.0 // indirect
5260
golang.org/x/net v0.38.0 // indirect
5361
golang.org/x/sync v0.12.0 // indirect
5462
golang.org/x/sys v0.31.0 // indirect
63+
golang.org/x/term v0.30.0 // indirect
5564
golang.org/x/text v0.23.0 // indirect
65+
golang.org/x/tools v0.30.0 // indirect
5666
gopkg.in/inf.v0 v0.9.1 // indirect
57-
gopkg.in/ini.v1 v1.67.0 // indirect
5867
gopkg.in/yaml.v2 v2.4.0 // indirect
5968
gopkg.in/yaml.v3 v3.0.1 // indirect
6069
k8s.io/api v0.27.4 // indirect

0 commit comments

Comments
 (0)