add go.uber.org/mock to tools.go, generate mocks using go run (#2080)

smallstep · Nov 21, 2024 · bc1accb · bc1accb
1 parent d327203
commit bc1accb
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 67 deletions.
diff --git a/cas/cloudcas/cloudcas_test.go b/cas/cloudcas/cloudcas_test.go
@@ -1,5 +1,5 @@
-//go:generate mockgen -package cloudcas -mock_names=CertificateAuthorityClient=MockCertificateAuthorityClient -destination mock_client_test.go github.com/smallstep/certificates/cas/cloudcas CertificateAuthorityClient
-//go:generate mockgen -package cloudcas -mock_names=OperationsServer=MockOperationsServer -destination mock_operation_server_test.go cloud.google.com/go/longrunning/autogen/longrunningpb OperationsServer
+//go:generate go run go.uber.org/mock/mockgen -package cloudcas -mock_names=CertificateAuthorityClient=MockCertificateAuthorityClient -destination mock_client_test.go github.com/smallstep/certificates/cas/cloudcas CertificateAuthorityClient
+//go:generate go run go.uber.org/mock/mockgen -package cloudcas -mock_names=OperationsServer=MockOperationsServer -destination mock_operation_server_test.go cloud.google.com/go/longrunning/autogen/longrunningpb OperationsServer
 
 package cloudcas
 
@@ -26,12 +26,12 @@ import (
 	"cloud.google.com/go/longrunning/autogen/longrunningpb"
 	privateca "cloud.google.com/go/security/privateca/apiv1"
 	pb "cloud.google.com/go/security/privateca/apiv1/privatecapb"
-	gomock "github.com/golang/mock/gomock"
 	"github.com/google/uuid"
-	gax "github.com/googleapis/gax-go/v2"
+	"github.com/googleapis/gax-go/v2"
 	"github.com/pkg/errors"
 	"github.com/smallstep/certificates/cas/apiv1"
 	kmsapi "go.step.sm/crypto/kms/apiv1"
+	"go.uber.org/mock/gomock"
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

diff --git a/cas/cloudcas/mock_client_test.go b/cas/cloudcas/mock_client_test.go
diff --git a/cas/cloudcas/mock_operation_server_test.go b/cas/cloudcas/mock_operation_server_test.go