Migrate to go.uber.org/mock

Right now we're using github.com/golang/mock, but that repository has
been archived. The project has been taken over by Uber, and nowadays
lives in a different location.

MODULE.bazel

@@ -16,7 +16,7 @@ bazel_dep(name = "toolchains_llvm", version = "1.0.0")
 
 git_override(
     module_name = "com_github_buildbarn_bb_storage",
-    commit = "c56df61c686606081a5e4ec5aafcd389a521f40c",
+    commit = "24d544b34a866f55838d576a0b110f4495f04450",
     remote = "https://github.com/buildbarn/bb-storage.git",
 )
 
@@ -60,7 +60,6 @@ use_repo(
     "cc_mvdan_gofumpt",
     "com_github_bazelbuild_buildtools",
     "com_github_bazelbuild_remote_apis",
-    "com_github_golang_mock",
     "com_github_golang_protobuf",
     "com_github_google_uuid",
     "com_github_gorilla_mux",
@@ -79,6 +78,7 @@ use_repo(
     "org_golang_x_lint",
     "org_golang_x_sync",
     "org_golang_x_sys",
+    "org_uber_go_mock",
 )
 
 go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
@@ -96,13 +96,6 @@ go_deps_dev.gazelle_override(
     ],
     path = "github.com/bazelbuild/remote-apis",
 )
-go_deps_dev.module_override(
-    patches = [
-        "@com_github_buildbarn_bb_storage//:patches/com_github_golang_mock/mocks-for-funcs.diff",
-        "//:patches/com_github_golang_mock/generics.diff",
-    ],
-    path = "github.com/golang/mock",
-)
 go_deps_dev.module_override(
     patches = ["@com_github_buildbarn_bb_storage//:patches/com_github_grpc_ecosystem_go_grpc_prometheus/client-metrics-prevent-handled-twice.diff"],
     path = "github.com/grpc-ecosystem/go-grpc-prometheus",
@@ -119,6 +112,13 @@ go_deps_dev.module_override(
     patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_lint/generic.diff"],
     path = "golang.org/x/lint",
 )
+go_deps_dev.module_override(
+    patches = [
+        "@com_github_buildbarn_bb_storage//:patches/org_uber_go_mock/mocks-for-funcs.diff",
+        "//:patches/org_uber_go_mock/generics.diff",
+    ],
+    path = "go.uber.org/mock",
+)
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 

go.mod

@@ -9,9 +9,8 @@ require (
 	cloud.google.com/go/longrunning v0.5.10
 	github.com/bazelbuild/buildtools v0.0.0-20240626162158-92a716d768c0
 	github.com/bazelbuild/remote-apis v0.0.0-20240703191324-0d21f29acdb9
-	github.com/buildbarn/bb-storage v0.0.0-20240712181055-c56df61c6866
+	github.com/buildbarn/bb-storage v0.0.0-20240714184744-24d544b34a86
 	github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89
-	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.4
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
@@ -23,6 +22,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/otel v1.28.0
 	go.opentelemetry.io/otel/trace v1.28.0
+	go.uber.org/mock v0.4.0
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
 	golang.org/x/sync v0.7.0
 	golang.org/x/sys v0.22.0

internal/mock/BUILD.bazel

@@ -12,6 +12,8 @@ gomock(
         "ReadCloser",
     ],
     library = "//internal/mock/aliases",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -22,6 +24,8 @@ gomock(
         "Authorizer",
     ],
     library = "@com_github_buildbarn_bb_storage//pkg/auth",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -30,6 +34,8 @@ gomock(
     out = "blobstore.go",
     interfaces = ["BlobAccess"],
     library = "@com_github_buildbarn_bb_storage//pkg/blobstore",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -38,6 +44,8 @@ gomock(
     out = "blobstore_slicing.go",
     interfaces = ["BlobSlicer"],
     library = "@com_github_buildbarn_bb_storage//pkg/blobstore/slicing",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -46,6 +54,8 @@ gomock(
     out = "blockdevice.go",
     interfaces = ["BlockDevice"],
     library = "@com_github_buildbarn_bb_storage//pkg/blockdevice",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -62,6 +72,8 @@ gomock(
         "UploadableDirectory",
     ],
     library = "//pkg/builder",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -75,6 +87,8 @@ gomock(
         "FileFetcher",
     ],
     library = "//pkg/cas",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -86,6 +100,8 @@ gomock(
         "ProcessTable",
     ],
     library = "//pkg/cleaner",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -97,6 +113,8 @@ gomock(
         "Timer",
     ],
     library = "@com_github_buildbarn_bb_storage//pkg/clock",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -105,6 +123,8 @@ gomock(
     out = "clock_re.go",
     interfaces = ["Suspendable"],
     library = "//pkg/clock",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -113,6 +133,8 @@ gomock(
     out = "completedactionlogger.go",
     interfaces = ["CompletedActionLogger_LogCompletedActionsClient"],
     library = "//pkg/proto/completedactionlogger",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -127,6 +149,8 @@ gomock(
         "FileWriter",
     ],
     library = "@com_github_buildbarn_bb_storage//pkg/filesystem",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -138,6 +162,8 @@ gomock(
         "UnreadDirectoryMonitor",
     ],
     library = "//pkg/filesystem/access",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -150,6 +176,8 @@ gomock(
         "SectorAllocator",
     ],
     library = "//pkg/filesystem",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -185,6 +213,8 @@ gomock(
         "Directory": "MockVirtualDirectory",
         "Leaf": "MockVirtualLeaf",
     },
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -198,6 +228,8 @@ gomock(
         "ServerCallbacks",
     ],
     library = "@com_github_hanwen_go_fuse_v2//fuse",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
     tags = ["manual"],
 )
@@ -210,6 +242,8 @@ gomock(
         "ClientStream",
     ],
     library = "@org_golang_google_grpc//:grpc",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -224,6 +258,8 @@ gomock(
         "StrategyCalculator",
     ],
     library = "//pkg/scheduler/initialsizeclass",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -233,6 +269,8 @@ gomock(
     interfaces = ["KeyExtractor"],
     library = "//pkg/scheduler/platform",
     mock_names = {"KeyExtractor": "MockPlatformKeyExtractor"},
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -244,6 +282,8 @@ gomock(
         "ThreadSafeGenerator",
     ],
     library = "@com_github_buildbarn_bb_storage//pkg/random",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -255,6 +295,8 @@ gomock(
         "Execution_WaitExecutionServer",
     ],
     library = "@com_github_bazelbuild_remote_apis//build/bazel/remote/execution/v2:execution",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -263,6 +305,8 @@ gomock(
     out = "remoteworker.go",
     interfaces = ["OperationQueueClient"],
     library = "//pkg/proto/remoteworker",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -271,6 +315,8 @@ gomock(
     out = "routing.go",
     interfaces = ["ActionRouter"],
     library = "//pkg/scheduler/routing",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -279,6 +325,8 @@ gomock(
     out = "runner.go",
     interfaces = ["AppleXcodeSDKRootResolver"],
     library = "//pkg/runner",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -290,6 +338,8 @@ gomock(
         "RunnerServer",
     ],
     library = "//pkg/proto/runner",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -298,6 +348,8 @@ gomock(
     out = "storage_builder.go",
     interfaces = ["BuildQueue"],
     library = "@com_github_buildbarn_bb_storage//pkg/builder",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -309,6 +361,8 @@ gomock(
         "UUIDGenerator",
     ],
     library = "@com_github_buildbarn_bb_storage//pkg/util",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -317,6 +371,8 @@ gomock(
     out = "sync.go",
     interfaces = ["TryLocker"],
     library = "//pkg/sync",
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -334,6 +390,8 @@ gomock(
         "Tracer": "BareMockTracer",
         "TracerProvider": "BareMockTracerProvider",
     },
+    mockgen_model_library = "@org_uber_go_mock//mockgen/model",
+    mockgen_tool = "@org_uber_go_mock//mockgen",
     package = "mock",
 )
 
@@ -409,7 +467,6 @@ go_library(
         "@com_github_buildbarn_bb_storage//pkg/filesystem/path",
         "@com_github_buildbarn_bb_storage//pkg/proto/iscc",
         "@com_github_buildbarn_bb_storage//pkg/util",
-        "@com_github_golang_mock//gomock",
         "@com_github_google_uuid//:uuid",
         "@com_google_cloud_go_longrunning//autogen/longrunningpb",
         "@io_opentelemetry_go_otel//attribute",
@@ -420,6 +477,7 @@ go_library(
         "@org_golang_google_grpc//metadata",
         "@org_golang_google_protobuf//types/known/anypb:go_default_library",
         "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
+        "@org_uber_go_mock//gomock",
     ] + select({
         "@rules_go//go/platform:darwin": [
             "@com_github_hanwen_go_fuse_v2//fuse",

internal/mock/trace_wrap.go

@@ -1,9 +1,9 @@
 package mock
 
 import (
-	"github.com/golang/mock/gomock"
-
 	"go.opentelemetry.io/otel/trace/embedded"
+
+	"go.uber.org/mock/gomock"
 )
 
 // WrappedMockSpan is a wrapper around the gomock stub for trace.Span.

pkg/blobstore/BUILD.bazel

@@ -45,12 +45,12 @@ go_test(
         "@com_github_buildbarn_bb_storage//pkg/digest",
         "@com_github_buildbarn_bb_storage//pkg/proto/iscc",
         "@com_github_buildbarn_bb_storage//pkg/testutil",
-        "@com_github_golang_mock//gomock",
         "@com_github_stretchr_testify//require",
         "@org_golang_google_genproto_googleapis_rpc//errdetails",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//status",
         "@org_golang_google_protobuf//types/known/timestamppb",
         "@org_golang_x_sync//semaphore",
+        "@org_uber_go_mock//gomock",
     ],
 )

pkg/blobstore/batched_store_blob_access_test.go

@@ -10,12 +10,13 @@ import (
 	"github.com/buildbarn/bb-storage/pkg/blobstore/buffer"
 	"github.com/buildbarn/bb-storage/pkg/digest"
 	"github.com/buildbarn/bb-storage/pkg/testutil"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
 	"golang.org/x/sync/semaphore"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+
+	"go.uber.org/mock/gomock"
 )
 
 func TestBatchedStoreBlobAccessSuccess(t *testing.T) {