First cut at removing mockery

Makefile

@@ -185,8 +185,6 @@ $(BIN)/thriftrw-plugin-yarpc: go.mod go.work
 $(BIN)/mockgen: internal/tools/go.mod go.work
 	$(call go_build_tool,go.uber.org/mock/mockgen)
 
-$(BIN)/mockery: internal/tools/go.mod go.work
-	$(call go_build_tool,github.com/vektra/mockery/v2,mockery)
 
 $(BIN)/enumer: internal/tools/go.mod go.work
 	$(call go_build_tool,github.com/dmarkham/enumer)
@@ -549,7 +547,7 @@ bins: $(BINS) ## Build all binaries, and any fast codegen needed (does not refre
 
 tools: $(TOOLS)
 
-go-generate: $(BIN)/mockgen $(BIN)/enumer $(BIN)/mockery  $(BIN)/gowrap ## Run `go generate` to regen mocks, enums, etc
+go-generate: $(BIN)/mockgen $(BIN)/enumer $(BIN)/gowrap ## Run `go generate` to regen mocks, enums, etc
 	$Q echo "running go generate ./..., this takes a minute or more..."
 	$Q # add our bins to PATH so `go generate` can find them
 	$Q $(BIN_PATH) go generate $(if $(verbose),-v) ./...

common/archiver/gcloud/connector/client.go

@@ -20,6 +20,8 @@
 
 package connector
 
+//go:generate mockgen -package mocks -destination mocks/Client.go github.com/uber/cadence/common/archiver/gcloud/connector Client
+
 import (
 	"bytes"
 	"context"

common/archiver/gcloud/connector/clientDelegate.go

@@ -20,6 +20,13 @@
 
 package connector
 
+//go:generate mockgen -package mocks -destination mocks/GcloudStorageClient.go github.com/uber/cadence/common/archiver/gcloud/connector GcloudStorageClient
+//go:generate mockgen -package mocks -destination mocks/BucketHandleWrapper.go github.com/uber/cadence/common/archiver/gcloud/connector BucketHandleWrapper
+//go:generate mockgen -package mocks -destination mocks/ObjectHandleWrapper.go github.com/uber/cadence/common/archiver/gcloud/connector ObjectHandleWrapper
+//go:generate mockgen -package mocks -destination mocks/WriterWrapper.go github.com/uber/cadence/common/archiver/gcloud/connector WriterWrapper
+//go:generate mockgen -package mocks -destination mocks/ReaderWrapper.go github.com/uber/cadence/common/archiver/gcloud/connector ReaderWrapper
+//go:generate mockgen -package mocks -destination mocks/ObjectIteratorWrapper.go github.com/uber/cadence/common/archiver/gcloud/connector ObjectIteratorWrapper
+
 import (
 	"context"
 	"io/ioutil"