CLOUDP-275224 Only show containers that can be stopped when running atlas deployments stop (#3282)

Author: fmenezes

internal/cli/deployments/options/deployment_opts_pre_run.go

@@ -18,21 +18,22 @@ import (
 	"context"
 	"errors"
 	"runtime"
+	"slices"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/log"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20240805001/admin"
 )
 
-func (opts *DeploymentOpts) SelectDeployments(ctx context.Context, projectID string) (Deployment, error) {
+func (opts *DeploymentOpts) listDeployments(ctx context.Context, projectID string) ([]Deployment, error) {
 	var atlasDeployments, localDeployments []Deployment
 	var atlasErr, localErr error
 
 	if opts.IsAtlasDeploymentType() || opts.NoDeploymentTypeSet() {
 		if atlasDeployments, atlasErr = opts.AtlasDeployments(projectID); atlasErr != nil {
 			if opts.IsAtlasDeploymentType() {
-				return Deployment{}, atlasErr
+				return nil, atlasErr
 			}
 			if !isUnauthenticatedErr(atlasErr) {
 				_, _ = log.Warningf("Warning: failed to retrieve Atlas deployments because %q\n", atlasErr.Error())
@@ -43,29 +44,37 @@ func (opts *DeploymentOpts) SelectDeployments(ctx context.Context, projectID str
 	if opts.IsLocalDeploymentType() || opts.NoDeploymentTypeSet() {
 		if localErr = opts.LocalDeploymentPreRun(ctx); localErr != nil {
 			if opts.IsLocalDeploymentType() {
-				return Deployment{}, localErr
+				return nil, localErr
 			}
 			_, _ = log.Debugf("Warning: failed to retrieve Local deployments because %q\n", localErr.Error())
 		}
 
 		localDeployments, localErr = opts.GetLocalDeployments(ctx)
 		if localErr != nil {
 			if opts.IsLocalDeploymentType() {
-				return Deployment{}, localErr
+				return nil, localErr
 			}
 			_, _ = log.Warningf("Warning: failed to retrieve Local deployments because %q\n", localErr.Error())
 		}
 	}
 
 	if atlasErr != nil && localErr != nil {
-		return Deployment{}, errors.New("failed to retrieve atlas and local deployments")
+		return nil, errors.New("failed to retrieve atlas and local deployments")
 	}
 
-	if opts.DeploymentName == "" {
-		return opts.Select(append(localDeployments, atlasDeployments...))
+	return append(localDeployments, atlasDeployments...), nil
+}
+
+func (opts *DeploymentOpts) SelectDeployments(ctx context.Context, projectID string, states ...string) (Deployment, error) {
+	deployments, err := opts.listDeployments(ctx, projectID)
+	if err != nil {
+		return Deployment{}, errors.New("failed to retrieve atlas and local deployments")
 	}
 
-	return opts.findDeploymentByName(localDeployments, atlasDeployments)
+	deployments = opts.filterDeploymentByName(deployments...)
+	deployments = opts.filterDeploymentByState(deployments, states...)
+
+	return opts.Select(deployments)
 }
 
 func isUnauthenticatedErr(err error) bool {
@@ -77,21 +86,36 @@ func isUnauthenticatedErr(err error) bool {
 	return ok && target.GetReason() == "Unauthorized"
 }
 
-func (opts *DeploymentOpts) findDeploymentByName(localDeployments []Deployment, atlasDeployments []Deployment) (Deployment, error) {
-	deployments := make([]Deployment, 0)
-	for _, d := range localDeployments {
+func (opts *DeploymentOpts) filterDeploymentByName(deployments ...Deployment) []Deployment {
+	if opts.DeploymentName == "" {
+		return deployments
+	}
+
+	filteredDeployments := []Deployment{}
+
+	for _, d := range deployments {
 		if d.Name == opts.DeploymentName {
-			deployments = append(deployments, d)
+			filteredDeployments = append(filteredDeployments, d)
 		}
 	}
 
-	for _, d := range atlasDeployments {
-		if d.Name == opts.DeploymentName {
-			deployments = append(deployments, d)
+	return filteredDeployments
+}
+
+func (*DeploymentOpts) filterDeploymentByState(deployments []Deployment, states ...string) []Deployment {
+	if len(states) == 0 {
+		return deployments
+	}
+
+	filteredDeployments := []Deployment{}
+
+	for _, d := range deployments {
+		if slices.Contains(states, d.StateName) {
+			filteredDeployments = append(filteredDeployments, d)
 		}
 	}
 
-	return opts.Select(deployments)
+	return filteredDeployments
 }
 
 func (opts *DeploymentOpts) AtlasDeployments(projectID string) ([]Deployment, error) {

internal/cli/deployments/pause.go

@@ -57,7 +57,7 @@ func (opts *PauseOpts) initStore(ctx context.Context) func() error {
 }
 
 func (opts *PauseOpts) Run(ctx context.Context) error {
-	deployment, err := opts.SelectDeployments(ctx, opts.ConfigProjectID())
+	deployment, err := opts.SelectDeployments(ctx, opts.ConfigProjectID(), options.IdleState)
 	if err != nil {
 		return err
 	}

internal/cli/deployments/test/fixture/deployment_atlas.go

@@ -42,21 +42,25 @@ func NewMockAtlasDeploymentOpts(ctrl *gomock.Controller, deploymentName string)
 	}
 }
 
-func (m *MockDeploymentOpts) MockPaginatedAdvancedClusterDescription() *atlasClustersPinned.PaginatedAdvancedClusterDescription {
+func (m *MockDeploymentOpts) MockPaginatedAdvancedClusterDescription(state string) *atlasClustersPinned.PaginatedAdvancedClusterDescription {
 	return &atlasClustersPinned.PaginatedAdvancedClusterDescription{
 		Results: &[]atlasClustersPinned.AdvancedClusterDescription{
 			{
 				Name:           pointer.Get(m.Opts.DeploymentName),
 				Id:             pointer.Get("123"),
 				MongoDBVersion: pointer.Get("7.0.0"),
-				StateName:      pointer.Get("IDLE"),
+				StateName:      &state,
 				Paused:         pointer.Get(false),
 			},
 		},
 	}
 }
 
 func (m *MockDeploymentOpts) CommonAtlasMocks(projectID string) {
+	m.CommonAtlasMocksWithState(projectID, "IDLE")
+}
+
+func (m *MockDeploymentOpts) CommonAtlasMocksWithState(projectID string, state string) {
 	m.MockCredentialsGetter.
 		EXPECT().
 		AuthType().
@@ -66,7 +70,7 @@ func (m *MockDeploymentOpts) CommonAtlasMocks(projectID string) {
 	m.MockAtlasClusterListStore.
 		EXPECT().
 		ProjectClusters(projectID, gomock.Any()).
-		Return(m.MockPaginatedAdvancedClusterDescription(), nil).
+		Return(m.MockPaginatedAdvancedClusterDescription(state), nil).
 		Times(1)
 
 	m.MockDeploymentTelemetry.