From 54bfdf2b7de08dcaa4b4df1dea1eb0f6eadb4fcc Mon Sep 17 00:00:00 2001 From: Tom van der Woerdt Date: Wed, 30 Jul 2025 16:17:59 -0400 Subject: [PATCH] Downgrade mockery to 2.x, rerun, and add to Makefile --- Makefile | 1 + devbox.json | 2 +- devbox.lock | 28 ++++++++++++---------------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index c12e64a668..b283ca1d10 100644 --- a/Makefile +++ b/Makefile @@ -289,6 +289,7 @@ generate: ${GO_SOURCES} ## Generate code ifdef EXPERIMENTAL controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./internal/nextapi/v1/..." endif + mockery $(MAKE) fmt .PHONY: check-missing-files diff --git a/devbox.json b/devbox.json index 2685e7f56a..e533eba825 100644 --- a/devbox.json +++ b/devbox.json @@ -23,7 +23,7 @@ "kubernetes-controller-tools@0.17.2", "setup-envtest@0.19.0", "awscli2@latest", - "go-mockery@latest", + "go-mockery@2", "docker-sbom@latest", "openshift@latest", "gci@latest" diff --git a/devbox.lock b/devbox.lock index e582790843..012e829ac1 100644 --- a/devbox.lock +++ b/devbox.lock @@ -525,55 +525,51 @@ } } }, - "github:NixOS/nixpkgs/nixpkgs-unstable": { - "last_modified": "2025-08-15T14:26:43Z", - "resolved": "github:NixOS/nixpkgs/32f313e49e42f715491e1ea7b306a87c16fe0388?lastModified=1755268003&narHash=sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj%2Fw%3D" - }, - "go-mockery@latest": { - "last_modified": "2025-08-08T08:05:48Z", - "resolved": "github:NixOS/nixpkgs/a3f3e3f2c983e957af6b07a1db98bafd1f87b7a1#go-mockery", + "go-mockery@2": { + "last_modified": "2025-07-13T22:45:35Z", + "resolved": "github:NixOS/nixpkgs/a421ac6595024edcfbb1ef950a3712b89161c359#go-mockery", "source": "devbox-search", - "version": "3.5.2", + "version": "2.53.3", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/invvvbcrzs6y6m5nfl4qdm28ggpz0bbn-go-mockery-3.5.2", + "path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3", "default": true } ], - "store_path": "/nix/store/invvvbcrzs6y6m5nfl4qdm28ggpz0bbn-go-mockery-3.5.2" + "store_path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/j7j71sgwgnvhj3avxqm9kwp91zmc2i6f-go-mockery-3.5.2", + "path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3", "default": true } ], - "store_path": "/nix/store/j7j71sgwgnvhj3avxqm9kwp91zmc2i6f-go-mockery-3.5.2" + "store_path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/zhffkpkqwjiwd68k3p2qly27nmsbd3cq-go-mockery-3.5.2", + "path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3", "default": true } ], - "store_path": "/nix/store/zhffkpkqwjiwd68k3p2qly27nmsbd3cq-go-mockery-3.5.2" + "store_path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/a756rmcg59ff3p4m89rja816w3gdm0h3-go-mockery-3.5.2", + "path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3", "default": true } ], - "store_path": "/nix/store/a756rmcg59ff3p4m89rja816w3gdm0h3-go-mockery-3.5.2" + "store_path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3" } } },