CLOUDP-237254: Update remaining commands to append deployment type te…

…lemetry (#2803)

internal/cli/deployments/connect.go

@@ -28,6 +28,10 @@ func Run(ctx context.Context, opts *options.ConnectOpts) error {
 	return opts.Connect(ctx)
 }
 
+func PostRun(opts *options.ConnectOpts) {
+	opts.DeploymentTelemetry.AppendDeploymentType()
+}
+
 // atlas deployments connect [clusterName].
 func ConnectBuilder() *cobra.Command {
 	opts := &options.ConnectOpts{}
@@ -53,6 +57,9 @@ func ConnectBuilder() *cobra.Command {
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			return Run(cmd.Context(), opts)
 		},
+		PostRun: func(_ *cobra.Command, _ []string) {
+			PostRun(opts)
+		},
 	}
 
 	cmd.Flags().StringVar(&opts.ConnectWith, flag.ConnectWith, "", usage.ConnectWith)

internal/cli/deployments/connect_test.go

@@ -24,12 +24,11 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/test"
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/atlas-sdk/v20231115008/admin"
@@ -43,43 +42,20 @@ const (
 func TestRun_ConnectLocal(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	ctx := context.Background()
-	mockPodman := mocks.NewMockClient(ctrl)
 	buf := new(bytes.Buffer)
 
+	deploymenTest := fixture.NewMockLocalDeploymentOpts(ctrl, expectedLocalDeployment)
 	connectOpts := &options.ConnectOpts{
-		ConnectWith: "connectionString",
-		DeploymentOpts: options.DeploymentOpts{
-			PodmanClient:   mockPodman,
-			DeploymentName: expectedLocalDeployment,
-			DeploymentType: "local",
-		},
+		ConnectWith:    "connectionString",
+		DeploymentOpts: *deploymenTest.Opts,
 		OutputOpts: cli.OutputOpts{
 			OutWriter: buf,
 		},
 	}
 
-	expectedContainers := []*podman.Container{
-		{
-			Names:  []string{expectedLocalDeployment},
-			State:  "running",
-			Labels: map[string]string{"version": "6.0.9"},
-			ID:     expectedLocalDeployment,
-		},
-	}
-
-	mockPodman.
-		EXPECT().
-		Ready(ctx).
-		Return(nil).
-		Times(1)
+	deploymenTest.LocalMockFlow(ctx)
 
-	mockPodman.
-		EXPECT().
-		ListContainers(ctx, options.MongodHostnamePrefix).
-		Return(expectedContainers, nil).
-		Times(1)
-
-	mockPodman.
+	deploymenTest.MockPodman.
 		EXPECT().
 		ContainerInspect(ctx, options.MongodHostnamePrefix+"-"+expectedLocalDeployment).
 		Return([]*podman.InspectContainerData{
@@ -122,18 +98,12 @@ func TestRun_ConnectAtlas(t *testing.T) {
 	ctx := context.Background()
 	buf := new(bytes.Buffer)
 
-	mockAtlasClusterListStore := mocks.NewMockClusterLister(ctrl)
-	mockCredentialsGetter := mocks.NewMockCredentialsGetter(ctrl)
 	mockAtlasClusterDescriber := mocks.NewMockClusterDescriber(ctrl)
+	deploymenTest := fixture.NewMockAtlasDeploymentOpts(ctrl, expectedAtlasDeployment)
 
 	connectOpts := &options.ConnectOpts{
-		ConnectWith: "connectionString",
-		DeploymentOpts: options.DeploymentOpts{
-			AtlasClusterListStore: mockAtlasClusterListStore,
-			DeploymentName:        expectedAtlasDeployment,
-			DeploymentType:        "atlas",
-			CredStore:             mockCredentialsGetter,
-		},
+		ConnectWith:    "connectionString",
+		DeploymentOpts: *deploymenTest.Opts,
 		ConnectToAtlasOpts: options.ConnectToAtlasOpts{
 			Store: mockAtlasClusterDescriber,
 			GlobalOpts: cli.GlobalOpts{
@@ -161,29 +131,14 @@ func TestRun_ConnectAtlas(t *testing.T) {
 		},
 	}
 
-	mockAtlasClusterListStore.
-		EXPECT().
-		ProjectClusters(connectOpts.ProjectID,
-			&store.ListOptions{
-				PageNum:      cli.DefaultPage,
-				ItemsPerPage: options.MaxItemsPerPage,
-			},
-		).
-		Return(expectedAtlasClusters, nil).
-		Times(1)
+	deploymenTest.CommonAtlasMocks(connectOpts.ProjectID)
 
 	mockAtlasClusterDescriber.
 		EXPECT().
 		AtlasCluster(connectOpts.ProjectID, expectedAtlasDeployment).
 		Return(&expectedAtlasClusters.GetResults()[0], nil).
 		Times(1)
 
-	mockCredentialsGetter.
-		EXPECT().
-		AuthType().
-		Return(config.OAuth).
-		Times(1)
-
 	if err := Run(ctx, connectOpts); err != nil {
 		t.Fatalf("Run() unexpected error: %v", err)
 	}
@@ -192,6 +147,27 @@ func TestRun_ConnectAtlas(t *testing.T) {
 `, buf.String())
 }
 
+func TestPostRun(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	deploymentsTest := fixture.NewMockLocalDeploymentOpts(ctrl, "localDeployment")
+	buf := new(bytes.Buffer)
+
+	opts := &options.ConnectOpts{
+		DeploymentOpts: *deploymentsTest.Opts,
+		OutputOpts: cli.OutputOpts{
+			OutWriter: buf,
+		},
+	}
+
+	deploymentsTest.
+		MockDeploymentTelemetry.
+		EXPECT().
+		AppendDeploymentType().
+		Times(1)
+
+	PostRun(opts)
+}
+
 func TestConnectBuilder(t *testing.T) {
 	test.CmdValidator(
 		t,

internal/cli/deployments/delete_test.go

@@ -160,7 +160,7 @@ func TestDeleteBuilder(t *testing.T) {
 	)
 }
 
-func TestDelete_PostRun(t *testing.T) {
+func TestDeleteOpts_PostRun(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	deploymentsTest := fixture.NewMockLocalDeploymentOpts(ctrl, "localDeployment")
 	buf := new(bytes.Buffer)

internal/cli/deployments/list_test.go

@@ -149,7 +149,7 @@ func TestListBuilder(t *testing.T) {
 	)
 }
 
-func TestList_PostRun(t *testing.T) {
+func TestListOpts_PostRun(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	buf := new(bytes.Buffer)
 

internal/cli/deployments/logs.go

@@ -181,6 +181,10 @@ func (opts *DownloadOpts) validateAtlasFlags() error {
 	return nil
 }
 
+func (opts *DownloadOpts) PostRun() {
+	opts.DeploymentTelemetry.AppendDeploymentType()
+}
+
 // atlas deployments logs.
 func LogsBuilder() *cobra.Command {
 	opts := &DownloadOpts{
@@ -204,6 +208,9 @@ func LogsBuilder() *cobra.Command {
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			return opts.Run(cmd.Context())
 		},
+		PostRun: func(_ *cobra.Command, _ []string) {
+			opts.PostRun()
+		},
 	}
 
 	cmd.Flags().StringVar(&opts.DeploymentType, flag.TypeFlag, "", usage.DeploymentType)

internal/cli/deployments/logs_test.go

@@ -112,3 +112,24 @@ func TestLogs_RunAtlas(t *testing.T) {
 		t.Fatalf("Run() unexpected error: %v", err)
 	}
 }
+
+func TestDownloadOpts_PostRun(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	deploymentTest := fixture.NewMockLocalDeploymentOpts(ctrl, "localDeployment")
+	buf := new(bytes.Buffer)
+
+	opts := &DownloadOpts{
+		DeploymentOpts: *deploymentTest.Opts,
+		OutputOpts: cli.OutputOpts{
+			OutWriter: buf,
+		},
+	}
+
+	deploymentTest.
+		MockDeploymentTelemetry.
+		EXPECT().
+		AppendDeploymentType().
+		Times(1)
+
+	opts.PostRun()
+}

internal/cli/deployments/options/deployment_opts.go

@@ -261,5 +261,8 @@ func (opts *DeploymentOpts) IsAuthEnabled() bool {
 }
 
 func (opts *DeploymentOpts) UpdateDeploymentTelemetry() {
+	if opts.DeploymentTelemetry == nil {
+		opts.DeploymentTelemetry = NewDeploymentTypeTelemetry(opts)
+	}
 	opts.DeploymentTelemetry.AppendDeploymentType()
 }

internal/cli/deployments/options/deployment_opts_select.go

@@ -104,7 +104,7 @@ func (opts *DeploymentOpts) Select(deployments []Deployment) (Deployment, error)
 		opts.DeploymentName = deployments[0].Name
 		opts.DeploymentType = strings.ToLower(deployments[0].Type)
 
-		opts.AppendDeploymentType()
+		opts.UpdateDeploymentTelemetry()
 		return deployments[0], nil
 	}
 
@@ -131,6 +131,6 @@ func (opts *DeploymentOpts) Select(deployments []Deployment) (Deployment, error)
 	deployment := deploymentsByDisplayName[displayName]
 	opts.DeploymentName = deployment.Name
 	opts.DeploymentType = strings.ToLower(deployment.Type)
-	opts.AppendDeploymentType()
+	opts.UpdateDeploymentTelemetry()
 	return deployment, nil
 }

internal/cli/deployments/pause.go

@@ -122,6 +122,11 @@ func (opts *PauseOpts) StopMongoD(ctx context.Context, names string) error {
 	return opts.PodmanClient.Exec(ctx, "-d", names, "mongod", "--shutdown")
 }
 
+func (opts *PauseOpts) PostRun() error {
+	opts.DeploymentTelemetry.AppendDeploymentType()
+	return opts.PostRunMessages()
+}
+
 func PauseBuilder() *cobra.Command {
 	opts := &PauseOpts{}
 	cmd := &cobra.Command{
@@ -149,9 +154,8 @@ func PauseBuilder() *cobra.Command {
 			}
 			return opts.Run(cmd.Context())
 		},
-
 		PostRunE: func(_ *cobra.Command, _ []string) error {
-			return opts.PostRunMessages()
+			return opts.PostRun()
 		},
 	}
 

internal/cli/deployments/pause_test.go

@@ -121,6 +121,28 @@ func TestPause_RunAtlas(t *testing.T) {
 	t.Log(buf.String())
 }
 
+func TestPauseOpts_PostRun(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	deploymentTest := fixture.NewMockLocalDeploymentOpts(ctrl, deploymentName)
+	buf := new(bytes.Buffer)
+
+	opts := &PauseOpts{
+		DeploymentOpts: *deploymentTest.Opts,
+		OutputOpts: cli.OutputOpts{
+			OutWriter: buf,
+		},
+	}
+
+	deploymentTest.MockDeploymentTelemetry.
+		EXPECT().
+		AppendDeploymentType().
+		Times(1)
+
+	if err := opts.PostRun(); err != nil {
+		t.Fatalf("PostRun() unexpected error: %v", err)
+	}
+}
+
 func TestPauseBuilder(t *testing.T) {
 	test.CmdValidator(
 		t,

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

@@ -172,6 +172,7 @@ func (opts *CreateOpts) watch(ctx context.Context) (any, bool, error) {
 }
 
 func (opts *CreateOpts) PostRun(ctx context.Context) error {
+	opts.AppendDeploymentType()
 	if !opts.EnableWatch {
 		return opts.Print(opts.index)
 	}

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

@@ -159,7 +159,6 @@ func TestCreate_RunLocal(t *testing.T) {
 	if err := opts.Run(ctx); err != nil {
 		t.Fatalf("Run() unexpected error: %v", err)
 	}
-
 	if err := opts.PostRun(ctx); err != nil {
 		t.Fatalf("PostRun() unexpected error: %v", err)
 	}

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

@@ -99,6 +99,10 @@ func (opts *DeleteOpts) initMongoDBClient(ctx context.Context) func() error {
 	}
 }
 
+func (opts *DeleteOpts) PostRun() {
+	opts.DeploymentTelemetry.AppendDeploymentType()
+}
+
 func DeleteBuilder() *cobra.Command {
 	opts := &DeleteOpts{
 		DeleteOpts: cli.NewDeleteOpts(deletedMessage, deleteMessageFailed),
@@ -127,6 +131,9 @@ func DeleteBuilder() *cobra.Command {
 
 			return opts.Run(cmd.Context())
 		},
+		PostRun: func(_ *cobra.Command, _ []string) {
+			opts.PostRun()
+		},
 	}
 
 	cmd.Flags().StringVar(&opts.DeploymentName, flag.DeploymentName, "", usage.DeploymentName)

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

@@ -147,6 +147,22 @@ func TestDelete_RunAtlas(t *testing.T) {
 	}
 }
 
+func TestDeleteOpts_PostRun(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	deploymentTest := fixture.NewMockLocalDeploymentOpts(ctrl, "localDeployment")
+	opts := &DeleteOpts{
+		DeploymentOpts: *deploymentTest.Opts,
+	}
+
+	deploymentTest.
+		MockDeploymentTelemetry.
+		EXPECT().
+		AppendDeploymentType().
+		Times(1)
+
+	opts.PostRun()
+}
+
 func TestDeleteBuilder(t *testing.T) {
 	test.CmdValidator(
 		t,

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

@@ -103,6 +103,10 @@ func (opts *DescribeOpts) initStore(ctx context.Context) func() error {
 	}
 }
 
+func (opts *DescribeOpts) PostRun() {
+	opts.DeploymentTelemetry.AppendDeploymentType()
+}
+
 func DescribeBuilder() *cobra.Command {
 	opts := &DescribeOpts{}
 	cmd := &cobra.Command{
@@ -129,6 +133,9 @@ func DescribeBuilder() *cobra.Command {
 			}
 			return opts.Run(cmd.Context())
 		},
+		PostRun: func(_ *cobra.Command, _ []string) {
+			opts.PostRun()
+		},
 	}
 
 	cmd.Flags().StringVar(&opts.DeploymentType, flag.TypeFlag, "", usage.DeploymentType)