Remove mockery fork logic

Signed-off-by: Jason Parraga <[email protected]>
flyteorg · Feb 28, 2025 · 2272617 · 2272617
1 parent 37386ba
commit 2272617
Show file tree

Hide file tree

Showing 102 changed files with 104 additions and 120 deletions.
diff --git a/boilerplate/flyte/golang_test_targets/download_tooling.sh b/boilerplate/flyte/golang_test_targets/download_tooling.sh
@@ -35,22 +35,6 @@ pushd "$tmp_dir"
 for tool in "${tools[@]}"; do
 	echo "Installing ${tool}"
 	GO111MODULE=on go install $tool
-	# If tool is our mockery fork, we need to rename the binary to mockery-fork
-	if [[ $tool == "github.com/EngHabu/mockery/cmd/mockery" ]]; then
-		echo "Renaming mockery to mockery-fork"
-		mv $(go env GOPATH)/bin/mockery $(go env GOPATH)/bin/mockery-fork
-	fi
-	# If tool is named vektra/mockery/v2, we need to rename the binary to mockery-v2
-	if [[ $tool == "github.com/vektra/mockery/[email protected]" ]]; then
-		echo "Renaming mockery to mockery-v2"
-		mv $(go env GOPATH)/bin/mockery $(go env GOPATH)/bin/mockery-v2
-	fi
 done
 
-# Rename the mockery-fork binary to mockery to maintain compatibility with the existing uses
-if [ -f $(go env GOPATH)/bin/mockery-fork ]; then
-	echo "Renaming mockery-fork to mockery"
-	mv $(go env GOPATH)/bin/mockery-fork $(go env GOPATH)/bin/mockery
-fi
-
 popd
diff --git a/datacatalog/pkg/manager/interfaces/artifact.go b/datacatalog/pkg/manager/interfaces/artifact.go
@@ -6,7 +6,7 @@ import (
 	idl_datacatalog "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog"
 )
 
-//go:generate mockery-v2 --name=ArtifactManager --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=ArtifactManager --output=../mocks --case=underscore --with-expecter
 
 type ArtifactManager interface {
 	CreateArtifact(ctx context.Context, request *idl_datacatalog.CreateArtifactRequest) (*idl_datacatalog.CreateArtifactResponse, error)

diff --git a/datacatalog/pkg/repositories/interfaces/artifact_repo.go b/datacatalog/pkg/repositories/interfaces/artifact_repo.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
 )
 
-//go:generate mockery-v2 --name=ArtifactRepo --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=ArtifactRepo --output=../mocks --case=underscore --with-expecter
 
 type ArtifactRepo interface {
 	Create(ctx context.Context, in models.Artifact) error

diff --git a/datacatalog/pkg/repositories/interfaces/dataset_repo.go b/datacatalog/pkg/repositories/interfaces/dataset_repo.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
 )
 
-//go:generate mockery-v2 --name=DatasetRepo --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=DatasetRepo --output=../mocks --case=underscore --with-expecter
 
 type DatasetRepo interface {
 	Create(ctx context.Context, in models.Dataset) error

diff --git a/datacatalog/pkg/repositories/interfaces/partition_repo.go b/datacatalog/pkg/repositories/interfaces/partition_repo.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
 )
 
-//go:generate mockery-v2 --name=PartitionRepo --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=PartitionRepo --output=../mocks --case=underscore --with-expecter
 
 type PartitionRepo interface {
 	Create(ctx context.Context, in models.Partition) error

diff --git a/datacatalog/pkg/repositories/interfaces/reservation_repo.go b/datacatalog/pkg/repositories/interfaces/reservation_repo.go
@@ -7,7 +7,7 @@ import (
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
 )
 
-//go:generate mockery-v2 --name=ReservationRepo --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=ReservationRepo --output=../mocks --case=underscore --with-expecter
 
 // Interface to interact with Reservation Table
 type ReservationRepo interface {

diff --git a/datacatalog/pkg/repositories/interfaces/tag_repo.go b/datacatalog/pkg/repositories/interfaces/tag_repo.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
 )
 
-//go:generate mockery-v2 --name=TagRepo --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=TagRepo --output=../mocks --case=underscore --with-expecter
 
 type TagRepo interface {
 	Create(ctx context.Context, in models.Tag) error

diff --git a/flyteadmin/auth/interfaces/context.go b/flyteadmin/auth/interfaces/context.go
@@ -17,7 +17,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 )
 
-//go:generate mockery-v2 --all --case=underscore --with-expecter
+//go:generate mockery --all --case=underscore --with-expecter
 
 type HandlerRegisterer interface {
 	HandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request))

diff --git a/flyteadmin/auth/interfaces/cookie.go b/flyteadmin/auth/interfaces/cookie.go
@@ -9,7 +9,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 )
 
-//go:generate mockery-v2 --name=CookieHandler --output=mocks/ --case=underscore --with-expecter
+//go:generate mockery --name=CookieHandler --output=mocks/ --case=underscore --with-expecter
 
 type CookieHandler interface {
 	SetTokenCookies(ctx context.Context, writer http.ResponseWriter, token *oauth2.Token) error

diff --git a/flyteadmin/pkg/async/cloudevent/interfaces/publisher.go b/flyteadmin/pkg/async/cloudevent/interfaces/publisher.go
@@ -6,7 +6,7 @@ import (
 	"github.com/golang/protobuf/proto"
 )
 
-//go:generate mockery-v2 --name=Publisher --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=Publisher --output=../mocks --case=underscore --with-expecter
 
 // Publisher Defines the interface for Publishing execution event to other services (AWS pub/sub, Kafka).
 type Publisher interface {

diff --git a/flyteadmin/pkg/async/cloudevent/interfaces/sender.go b/flyteadmin/pkg/async/cloudevent/interfaces/sender.go
@@ -6,7 +6,7 @@ import (
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 )
 
-//go:generate mockery-v2 --name=Sender --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=Sender --output=../mocks --case=underscore --with-expecter
 
 // Sender Defines the interface for sending cloudevents.
 type Sender interface {

diff --git a/flyteadmin/pkg/async/events/interfaces/node_execution.go b/flyteadmin/pkg/async/events/interfaces/node_execution.go
@@ -4,7 +4,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=NodeExecutionEventWriter --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=NodeExecutionEventWriter --output=../mocks --case=underscore --with-expecter
 
 type NodeExecutionEventWriter interface {
 	Run()

diff --git a/flyteadmin/pkg/async/events/interfaces/workflow_execution.go b/flyteadmin/pkg/async/events/interfaces/workflow_execution.go
@@ -4,7 +4,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=WorkflowExecutionEventWriter --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=WorkflowExecutionEventWriter --output=../mocks --case=underscore --with-expecter
 
 type WorkflowExecutionEventWriter interface {
 	Run()

diff --git a/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer.go b/flyteadmin/pkg/async/notifications/implementations/sendgrid_emailer.go
@@ -19,7 +19,7 @@ import (
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
 )
 
-//go:generate mockery-v2 --all --case=underscore --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --all --case=underscore --output=../mocks --case=underscore --with-expecter
 
 type SendgridClient interface {
 	Send(email *mail.SGMailV3) (*rest.Response, error)

diff --git a/flyteadmin/pkg/async/notifications/interfaces/emailer.go b/flyteadmin/pkg/async/notifications/interfaces/emailer.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=Emailer --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=Emailer --output=../mocks --case=underscore --with-expecter
 
 // The implementation of Emailer needs to be passed to the implementation of Processor
 // in order for emails to be sent.

diff --git a/flyteadmin/pkg/async/notifications/interfaces/processor.go b/flyteadmin/pkg/async/notifications/interfaces/processor.go
@@ -1,6 +1,6 @@
 package interfaces
 
-//go:generate mockery-v2 --name=Processor --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=Processor --output=../mocks --case=underscore --with-expecter
 
 // Exposes the common methods required for a subscriber.
 // There is one ProcessNotification per type.

diff --git a/flyteadmin/pkg/async/notifications/interfaces/publisher.go b/flyteadmin/pkg/async/notifications/interfaces/publisher.go
@@ -6,7 +6,7 @@ import (
 	"github.com/golang/protobuf/proto"
 )
 
-//go:generate mockery-v2 --name=Publisher --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=Publisher --output=../mocks --case=underscore --with-expecter
 
 // Note on Notifications
 

diff --git a/flyteadmin/pkg/async/notifications/interfaces/smtp_client.go b/flyteadmin/pkg/async/notifications/interfaces/smtp_client.go
@@ -8,7 +8,7 @@ import (
 
 // This interface is introduced to allow for mocking of the smtp.Client object.
 
-//go:generate mockery-v2 --name=SMTPClient --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=SMTPClient --output=../mocks --case=underscore --with-expecter
 type SMTPClient interface {
 	Hello(localName string) error
 	Extension(ext string) (bool, string)

diff --git a/flyteadmin/pkg/async/schedule/interfaces/event_scheduler.go b/flyteadmin/pkg/async/schedule/interfaces/event_scheduler.go
@@ -27,7 +27,7 @@ type RemoveScheduleInput struct {
 	ScheduleNamePrefix string
 }
 
-//go:generate mockery-v2 --name=EventScheduler --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=EventScheduler --output=../mocks --case=underscore --with-expecter
 
 type EventScheduler interface {
 	// Schedules an event.

diff --git a/flyteadmin/pkg/async/schedule/interfaces/workflow_executor.go b/flyteadmin/pkg/async/schedule/interfaces/workflow_executor.go
@@ -1,6 +1,6 @@
 package interfaces
 
-//go:generate mockery-v2 --name=WorkflowExecutor --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=WorkflowExecutor --output=../mocks --case=underscore --with-expecter
 
 // Handles responding to scheduled workflow execution events and creating executions.
 type WorkflowExecutor interface {

diff --git a/flyteadmin/pkg/clusterresource/interfaces/admin.go b/flyteadmin/pkg/clusterresource/interfaces/admin.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=FlyteAdminDataProvider --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=FlyteAdminDataProvider --output=../mocks --case=underscore --with-expecter
 
 type FlyteAdminDataProvider interface {
 	GetClusterResourceAttributes(ctx context.Context, project, domain string) (*admin.ClusterResourceAttributes, error)

diff --git a/flyteadmin/pkg/data/interfaces/remote.go b/flyteadmin/pkg/data/interfaces/remote.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=RemoteURLInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=RemoteURLInterface --output=../mocks --case=underscore --with-expecter
 
 // Defines an interface for fetching pre-signed URLs.
 type RemoteURLInterface interface {

diff --git a/flyteadmin/pkg/executioncluster/interfaces/execution_target_provider.go b/flyteadmin/pkg/executioncluster/interfaces/execution_target_provider.go
@@ -7,7 +7,7 @@ import (
 	"github.com/flyteorg/flyte/flyteadmin/pkg/runtime/interfaces"
 )
 
-//go:generate mockery-v2 --all --case=underscore --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --all --case=underscore --output=../mocks --case=underscore --with-expecter
 
 type ExecutionTargetProvider interface {
 	GetExecutionTarget(initializationErrorCounter prometheus.Counter, k8sCluster interfaces.ClusterConfig) (*executioncluster.ExecutionTarget, error)

diff --git a/flyteadmin/pkg/manager/interfaces/execution.go b/flyteadmin/pkg/manager/interfaces/execution.go
@@ -7,7 +7,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=ExecutionInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=ExecutionInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Workflow Executions
 type ExecutionInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/launch_plan.go b/flyteadmin/pkg/manager/interfaces/launch_plan.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=LaunchPlanInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=LaunchPlanInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Launch Plans
 type LaunchPlanInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/metrics.go b/flyteadmin/pkg/manager/interfaces/metrics.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=MetricsInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=MetricsInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte execution metrics
 type MetricsInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/named_entity.go b/flyteadmin/pkg/manager/interfaces/named_entity.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=NamedEntityInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=NamedEntityInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing metadata associated with NamedEntityIdentifiers
 type NamedEntityInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/node_execution.go b/flyteadmin/pkg/manager/interfaces/node_execution.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=NodeExecutionInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=NodeExecutionInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Workflow NodeExecutions
 type NodeExecutionInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/project.go b/flyteadmin/pkg/manager/interfaces/project.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=ProjectInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=ProjectInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing projects (and domains).
 type ProjectInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/resource.go b/flyteadmin/pkg/manager/interfaces/resource.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=ResourceInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=ResourceInterface --output=../mocks --case=underscore --with-expecter
 
 // ResourceInterface manages project, domain and workflow -specific attributes.
 type ResourceInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/signal.go b/flyteadmin/pkg/manager/interfaces/signal.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=SignalInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=SignalInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Signals
 type SignalInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/task.go b/flyteadmin/pkg/manager/interfaces/task.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=TaskInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=TaskInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Tasks
 type TaskInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/task_execution.go b/flyteadmin/pkg/manager/interfaces/task_execution.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=TaskExecutionInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=TaskExecutionInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Workflow TaskExecutions
 type TaskExecutionInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/version.go b/flyteadmin/pkg/manager/interfaces/version.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=VersionInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=VersionInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte admin version
 type VersionInterface interface {

diff --git a/flyteadmin/pkg/manager/interfaces/workflow.go b/flyteadmin/pkg/manager/interfaces/workflow.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery-v2 --name=WorkflowInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=WorkflowInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Workflows
 type WorkflowInterface interface {

diff --git a/flyteadmin/pkg/repositories/interfaces/execution_event_repo.go b/flyteadmin/pkg/repositories/interfaces/execution_event_repo.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models"
 )
 
-//go:generate mockery-v2 --name=ExecutionEventRepoInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=ExecutionEventRepoInterface --output=../mocks --case=underscore --with-expecter
 
 type ExecutionEventRepoInterface interface {
 	// Inserts a workflow execution event into the database store.

diff --git a/flyteadmin/pkg/repositories/interfaces/node_execution_event_repo.go b/flyteadmin/pkg/repositories/interfaces/node_execution_event_repo.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteadmin/pkg/repositories/models"
 )
 
-//go:generate mockery-v2 --name=NodeExecutionEventRepoInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=NodeExecutionEventRepoInterface --output=../mocks --case=underscore --with-expecter
 
 type NodeExecutionEventRepoInterface interface {
 	// Inserts a node execution event into the database store.

diff --git a/flyteadmin/pkg/repositories/interfaces/signal_repo.go b/flyteadmin/pkg/repositories/interfaces/signal_repo.go
@@ -7,7 +7,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 )
 
-//go:generate mockery-v2 --name=SignalRepoInterface --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name=SignalRepoInterface --output=../mocks --case=underscore --with-expecter
 
 // Defines the interface for interacting with signal models.
 type SignalRepoInterface interface {

diff --git a/flyteadmin/pkg/runtime/interfaces/cluster_configuration.go b/flyteadmin/pkg/runtime/interfaces/cluster_configuration.go
@@ -51,7 +51,7 @@ type Clusters struct {
 	DefaultExecutionLabel string                     `json:"defaultExecutionLabel"`
 }
 
-//go:generate mockery-v2 --name ClusterConfiguration --case=underscore --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name ClusterConfiguration --case=underscore --output=../mocks --case=underscore --with-expecter
 
 // Provides values set in runtime configuration files.
 // These files can be changed without requiring a full server restart.

diff --git a/flyteadmin/pkg/runtime/interfaces/cluster_pools.go b/flyteadmin/pkg/runtime/interfaces/cluster_pools.go
@@ -1,6 +1,6 @@
 package interfaces
 
-//go:generate mockery-v2 --name ClusterPoolAssignmentConfiguration --output=mocks --case=underscore --with-expecter
+//go:generate mockery --name ClusterPoolAssignmentConfiguration --output=mocks --case=underscore --with-expecter
 
 type ClusterPoolAssignment struct {
 	Pool string `json:"pool"`

diff --git a/flyteadmin/pkg/runtime/interfaces/namespace_configuration.go b/flyteadmin/pkg/runtime/interfaces/namespace_configuration.go
@@ -6,7 +6,7 @@ type NamespaceMappingConfig struct {
 	TemplateData TemplateData `json:"templateData"`
 }
 
-//go:generate mockery-v2 --name NamespaceMappingConfiguration --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name NamespaceMappingConfiguration --output=../mocks --case=underscore --with-expecter
 
 type NamespaceMappingConfiguration interface {
 	GetNamespaceTemplate() string

diff --git a/flyteadmin/pkg/runtime/interfaces/quality_of_service_configuration.go b/flyteadmin/pkg/runtime/interfaces/quality_of_service_configuration.go
@@ -8,7 +8,7 @@ import (
 type TierName = string
 
 // Just incrementally start using mockery, replace with -all when working on https://github.com/flyteorg/flyte/issues/149
-//go:generate mockery-v2 --name QualityOfServiceConfiguration --output=mocks --case=underscore --with-expecter
+//go:generate mockery --name QualityOfServiceConfiguration --output=mocks --case=underscore --with-expecter
 
 type QualityOfServiceSpec struct {
 	QueueingBudget config.Duration `json:"queueingBudget"`

diff --git a/flyteadmin/pkg/workflowengine/interfaces/builder.go b/flyteadmin/pkg/workflowengine/interfaces/builder.go
@@ -5,7 +5,7 @@ import (
 	"github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
 )
 
-//go:generate mockery-v2 --name FlyteWorkflowBuilder --output=../mocks --case=underscore --with-expecter
+//go:generate mockery --name FlyteWorkflowBuilder --output=../mocks --case=underscore --with-expecter
 
 // FlyteWorkflowBuilder produces a v1alpha1.FlyteWorkflow definition from a compiled workflow closure and execution inputs
 type FlyteWorkflowBuilder interface {