CLOUDP-283287 Move local search index code to collection level

internal/cli/deployments/search/indexes/create.go

@@ -88,12 +88,12 @@ func (opts *CreateOpts) RunLocal(ctx context.Context) error {
 
 	telemetry.AppendOption(telemetry.WithSearchIndexType(opts.index.GetType()))
 
-	db := opts.mongodbClient.Database(opts.index.Database)
-	if idx, _ := db.SearchIndexByName(ctx, opts.index.Name, opts.index.CollectionName); idx != nil {
+	coll := opts.mongodbClient.Database(opts.index.Database).Collection(opts.index.CollectionName)
+	if idx, _ := coll.SearchIndexByName(ctx, opts.index.Name); idx != nil {
 		return ErrSearchIndexDuplicated
 	}
 
-	opts.index, err = db.CreateSearchIndex(ctx, opts.index.CollectionName, opts.index)
+	opts.index, err = coll.CreateSearchIndex(ctx, opts.index)
 	return err
 }
 
@@ -128,7 +128,7 @@ func (opts *CreateOpts) Run(ctx context.Context) error {
 
 func (opts *CreateOpts) initMongoDBClient(ctx context.Context) func() error {
 	return func() error {
-		opts.mongodbClient = mongodbclient.NewClientWithContext(ctx)
+		opts.mongodbClient = mongodbclient.NewClient(ctx)
 		return nil
 	}
 }

internal/cli/deployments/search/indexes/create_test.go

@@ -50,6 +50,7 @@ func TestCreate_RunLocal(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockMongodbClient := mocks.NewMockMongoDBClient(ctrl)
 	mockDB := mocks.NewMockDatabase(ctrl)
+	mockColl := mocks.NewMockCollection(ctrl)
 	ctx := context.Background()
 
 	testDeployments := fixture.NewMockLocalDeploymentOpts(ctrl, expectedLocalDeployment)
@@ -110,6 +111,11 @@ func TestCreate_RunLocal(t *testing.T) {
 		Database(expectedDB).
 		Return(mockDB).
 		Times(1)
+	mockDB.
+		EXPECT().
+		Collection(expectedCollection).
+		Return(mockColl).
+		Times(1)
 
 	index := &atlasv2.ClusterSearchIndex{
 		Analyzer:       &opts.Analyzer,
@@ -138,15 +144,15 @@ func TestCreate_RunLocal(t *testing.T) {
 		Type:           pointer.Get(search.DefaultType),
 	}
 
-	mockDB.
+	mockColl.
 		EXPECT().
-		SearchIndexByName(ctx, index.Name, index.CollectionName).
+		SearchIndexByName(ctx, index.Name).
 		Return(nil, mongodbclient.ErrSearchIndexNotFound).
 		Times(1)
 
-	mockDB.
+	mockColl.
 		EXPECT().
-		CreateSearchIndex(ctx, expectedCollection, gomock.Any()).
+		CreateSearchIndex(ctx, gomock.Any()).
 		Return(indexWithID, nil).
 		Times(1)
 
@@ -166,6 +172,7 @@ func TestCreate_Duplicated(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockMongodbClient := mocks.NewMockMongoDBClient(ctrl)
 	mockDB := mocks.NewMockDatabase(ctrl)
+	mockColl := mocks.NewMockCollection(ctrl)
 	ctx := context.Background()
 
 	testDeployments := fixture.NewMockLocalDeploymentOpts(ctrl, expectedLocalDeployment)
@@ -226,6 +233,11 @@ func TestCreate_Duplicated(t *testing.T) {
 		Database(expectedDB).
 		Return(mockDB).
 		Times(1)
+	mockDB.
+		EXPECT().
+		Collection(expectedCollection).
+		Return(mockColl).
+		Times(1)
 
 	index := &atlasv2.ClusterSearchIndex{
 		Analyzer:       &opts.Analyzer,
@@ -252,9 +264,9 @@ func TestCreate_Duplicated(t *testing.T) {
 		IndexID:        &indexID,
 	}
 
-	mockDB.
+	mockColl.
 		EXPECT().
-		SearchIndexByName(ctx, index.Name, index.CollectionName).
+		SearchIndexByName(ctx, index.Name).
 		Return(indexWithID, nil).
 		Times(1)
 	if err := opts.Run(ctx); err == nil || !errors.Is(err, ErrSearchIndexDuplicated) {

internal/cli/deployments/search/indexes/delete.go

@@ -94,7 +94,7 @@ func (opts *DeleteOpts) initStore(ctx context.Context) func() error {
 
 func (opts *DeleteOpts) initMongoDBClient(ctx context.Context) func() error {
 	return func() error {
-		opts.mongodbClient = mongodbclient.NewClientWithContext(ctx)
+		opts.mongodbClient = mongodbclient.NewClient(ctx)
 		return nil
 	}
 }

internal/cli/deployments/search/indexes/describe.go

@@ -95,7 +95,7 @@ func (opts *DescribeOpts) RunLocal(ctx context.Context) error {
 
 func (opts *DescribeOpts) initMongoDBClient(ctx context.Context) func() error {
 	return func() error {
-		opts.mongodbClient = mongodbclient.NewClientWithContext(ctx)
+		opts.mongodbClient = mongodbclient.NewClient(ctx)
 		return nil
 	}
 }

internal/cli/deployments/search/indexes/list.go

@@ -77,17 +77,19 @@ func (opts *ListOpts) RunLocal(ctx context.Context) error {
 	}
 	defer opts.mongodbClient.Disconnect()
 
-	r, err := opts.mongodbClient.Database(opts.DBName).SearchIndexes(ctx, opts.Collection)
+	r, err := opts.mongodbClient.Database(opts.DBName).Collection(opts.Collection).SearchIndexes(ctx)
 	if err != nil {
 		return err
 	}
 
 	return opts.Print(r)
 }
 
-func (opts *ListOpts) initMongoDBClient() error {
-	opts.mongodbClient = mongodbclient.NewClient()
-	return nil
+func (opts *ListOpts) initMongoDBClient(ctx context.Context) func() error {
+	return func() error {
+		opts.mongodbClient = mongodbclient.NewClient(ctx)
+		return nil
+	}
 }
 
 func (opts *ListOpts) initStore(ctx context.Context) func() error {
@@ -133,7 +135,7 @@ func ListBuilder() *cobra.Command {
 				opts.InitOutput(w, listTemplate),
 				opts.InitStore(cmd.Context(), cmd.OutOrStdout()),
 				opts.initStore(cmd.Context()),
-				opts.initMongoDBClient,
+				opts.initMongoDBClient(cmd.Context()),
 			)
 		},
 		RunE: func(cmd *cobra.Command, _ []string) error {

internal/cli/deployments/search/indexes/list_test.go

@@ -39,6 +39,7 @@ func TestList_RunLocal(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockMongodbClient := mocks.NewMockMongoDBClient(ctrl)
 	mockDB := mocks.NewMockDatabase(ctrl)
+	mockColl := mocks.NewMockCollection(ctrl)
 	ctx := context.Background()
 
 	const (
@@ -110,6 +111,12 @@ func TestList_RunLocal(t *testing.T) {
 		Return(mockDB).
 		Times(1)
 
+	mockDB.
+		EXPECT().
+		Collection(expectedCollection).
+		Return(mockColl).
+		Times(1)
+
 	expected := []*atlasv2.ClusterSearchIndex{
 		{
 			Name:           expectedName,
@@ -121,9 +128,9 @@ func TestList_RunLocal(t *testing.T) {
 		},
 	}
 
-	mockDB.
+	mockColl.
 		EXPECT().
-		SearchIndexes(ctx, expectedCollection).
+		SearchIndexes(ctx).
 		Return(expected, nil).
 		Times(1)
 

internal/cli/deployments/setup.go

@@ -118,7 +118,7 @@ type SetupOpts struct {
 
 func (opts *SetupOpts) initMongoDBClient(ctx context.Context) func() error {
 	return func() error {
-		opts.mongodbClient = mongodbclient.NewClientWithContext(ctx)
+		opts.mongodbClient = mongodbclient.NewClient(ctx)
 		return nil
 	}
 }

internal/mongodbclient/client.go

@@ -28,7 +28,7 @@ import (
 
 var errConnectFailed = errors.New("failed to connect to mongodb server")
 
-//go:generate mockgen -destination=../mocks/mock_mongodb_client.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mongodbclient MongoDBClient,Database,SearchIndex
+//go:generate mockgen -destination=../mocks/mock_mongodb_client.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mongodbclient MongoDBClient,Database,Collection
 
 type MongoDBClient interface {
 	Connect(connectionString string, waitSeconds int64) error
@@ -43,13 +43,7 @@ type mongodbClient struct {
 	ctx    context.Context
 }
 
-func NewClient() MongoDBClient {
-	return &mongodbClient{
-		ctx: context.Background(),
-	}
-}
-
-func NewClientWithContext(ctx context.Context) MongoDBClient {
+func NewClient(ctx context.Context) MongoDBClient {
 	return &mongodbClient{
 		ctx: ctx,
 	}