more

Author: gssbzn

internal/cli/serverless/backup/restores/create.go

@@ -36,6 +36,12 @@ const (
 	pointInTimeRestore = "pointInTime"
 )
 
+//go:generate mockgen -typed -destination=create_mock_test.go -package=restores . ServerlessRestoreJobsCreator
+
+type ServerlessRestoreJobsCreator interface {
+	ServerlessCreateRestoreJobs(string, string, *atlasv2.ServerlessBackupRestoreJob) (*atlasv2.ServerlessBackupRestoreJob, error)
+}
+
 type CreateOpts struct {
 	cli.ProjectOpts
 	cli.OutputOpts
@@ -47,7 +53,7 @@ type CreateOpts struct {
 	oplogInc              int
 	snapshotID            string
 	pointInTimeUTCSeconds int
-	store                 store.ServerlessRestoreJobsCreator
+	store                 ServerlessRestoreJobsCreator
 }
 
 func (opts *CreateOpts) initStore(ctx context.Context) func() error {

internal/cli/serverless/backup/restores/create_mock_test.go

@@ -19,14 +19,13 @@ package restores
 import (
 	"testing"
 
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
 	"go.uber.org/mock/gomock"
 )
 
 func TestCreate_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	mockStore := mocks.NewMockServerlessRestoreJobsCreator(ctrl)
+	mockStore := NewMockServerlessRestoreJobsCreator(ctrl)
 
 	expected := &atlasv2.ServerlessBackupRestoreJob{}
 

internal/cli/serverless/backup/restores/create_test.go

@@ -25,14 +25,21 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
 	"github.com/spf13/cobra"
+	atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
 )
 
+//go:generate mockgen -typed -destination=describe_mock_test.go -package=restores . ServerlessRestoreJobsDescriber
+
+type ServerlessRestoreJobsDescriber interface {
+	ServerlessRestoreJob(string, string, string) (*atlasv2.ServerlessBackupRestoreJob, error)
+}
+
 type DescribeOpts struct {
 	cli.ProjectOpts
 	cli.OutputOpts
 	id          string
 	clusterName string
-	store       store.ServerlessRestoreJobsDescriber
+	store       ServerlessRestoreJobsDescriber
 }
 
 func (opts *DescribeOpts) initStore(ctx context.Context) func() error {

internal/cli/serverless/backup/restores/describe.go

@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -32,7 +31,7 @@ import (
 
 func TestDescribeOpts_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	mockStore := mocks.NewMockServerlessRestoreJobsDescriber(ctrl)
+	mockStore := NewMockServerlessRestoreJobsDescriber(ctrl)
 
 	expiresAt, _ := time.Parse("01-02-2006", "01-01-2023")
 	expected := &atlasv2.ServerlessBackupRestoreJob{

internal/cli/serverless/backup/restores/describe_mock_test.go

@@ -24,14 +24,21 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
 	"github.com/spf13/cobra"
+	atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
 )
 
+//go:generate mockgen -typed -destination=list_mock_test.go -package=restores . ServerlessRestoreJobsLister
+
+type ServerlessRestoreJobsLister interface {
+	ServerlessRestoreJobs(string, string, *store.ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupRestoreJob, error)
+}
+
 type ListOpts struct {
 	cli.ProjectOpts
 	cli.OutputOpts
 	cli.ListOpts
 	clusterName string
-	store       store.ServerlessRestoreJobsLister
+	store       ServerlessRestoreJobsLister
 }
 
 func (opts *ListOpts) initStore(ctx context.Context) func() error {

internal/cli/serverless/backup/restores/describe_test.go

@@ -19,7 +19,6 @@ package restores
 import (
 	"testing"
 
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/test"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
@@ -28,7 +27,7 @@ import (
 
 func TestListOpts_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	mockStore := mocks.NewMockServerlessRestoreJobsLister(ctrl)
+	mockStore := NewMockServerlessRestoreJobsLister(ctrl)
 	defer ctrl.Finish()
 
 	expected := &atlasv2.PaginatedApiAtlasServerlessBackupRestoreJob{

internal/cli/serverless/backup/restores/list.go

@@ -33,7 +33,7 @@ type WatchOpts struct {
 	cli.WatchOpts
 	id          string
 	clusterName string
-	store       store.ServerlessRestoreJobsDescriber
+	store       ServerlessRestoreJobsDescriber
 }
 
 var watchTemplate = "\nRestore completed.\n"

internal/cli/serverless/backup/restores/list_mock_test.go

@@ -19,15 +19,14 @@ package restores
 import (
 	"testing"
 
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
 	"go.uber.org/mock/gomock"
 )
 
 func TestWatchOpts_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	mockStore := mocks.NewMockServerlessRestoreJobsDescriber(ctrl)
+	mockStore := NewMockServerlessRestoreJobsDescriber(ctrl)
 
 	expected := &atlasv2.ServerlessBackupRestoreJob{
 		Failed: pointer.Get(true),