CLOUDP-326299: List independentShardScaling flag should list only ISS… (#3989)

Author: blva

docs/command/atlas-clusters-list.txt

@@ -110,3 +110,11 @@ Examples
 
    # Return a JSON-formatted list of all clusters for the project with ID 5e2211c17a3e5a48f5497de3:
    atlas clusters list --projectId 5e2211c17a3e5a48f5497de3 --output json
+  
+   
+.. code-block::
+   :copyable: false
+
+   # Return a JSON-formatted list of all clusters for the project with ID 5e2211c17a3e5a48f5497de3 and with independent shard scaling mode:
+   atlas clusters list --projectId 5e2211c17a3e5a48f5497de3 --autoScalingMode independentShardScaling --output json
+   

internal/cli/clusters/list.go

@@ -36,6 +36,7 @@ type ClusterLister interface {
 	ProjectClusters(string, *store.ListOptions) (*atlasClustersPinned.PaginatedAdvancedClusterDescription, error)
 	ListFlexClusters(*atlasv2.ListFlexClustersApiParams) (*atlasv2.PaginatedFlexClusters20241113, error)
 	LatestProjectClusters(string, *store.ListOptions) (*atlasv2.PaginatedClusterDescription20240805, error)
+	GetClusterAutoScalingConfig(string, string) (*atlasv2.ClusterDescriptionAutoScalingModeConfiguration, error)
 }
 
 type ListOpts struct {
@@ -69,11 +70,15 @@ func (opts *ListOpts) Run() error {
 
 func (opts *ListOpts) RunDedicatedCluster() error {
 	listOpts := opts.NewAtlasListOptions()
-	if opts.autoScalingMode == independentShardScalingFlag {
+	if isIndependentShardScaling(opts.autoScalingMode) {
 		r, err := opts.store.LatestProjectClusters(opts.ConfigProjectID(), listOpts)
 		if err != nil {
 			return err
 		}
+		r, err = opts.filterClustersByAutoScalingMode(r)
+		if err != nil {
+			return err
+		}
 		return opts.Print(r)
 	}
 
@@ -85,6 +90,22 @@ func (opts *ListOpts) RunDedicatedCluster() error {
 	return opts.Print(r)
 }
 
+func (opts *ListOpts) filterClustersByAutoScalingMode(clusters *atlasv2.PaginatedClusterDescription20240805) (*atlasv2.PaginatedClusterDescription20240805, error) {
+	filteredClusters := make([]atlasv2.ClusterDescription20240805, 0)
+	for _, cluster := range clusters.GetResults() {
+		clusterAutoScalingConfig, err := opts.store.GetClusterAutoScalingConfig(opts.ConfigProjectID(), *cluster.Name)
+		if err != nil {
+			return nil, err
+		}
+		if isIndependentShardScaling(clusterAutoScalingConfig.GetAutoScalingMode()) {
+			filteredClusters = append(filteredClusters, cluster)
+		}
+	}
+
+	clusters.Results = &filteredClusters
+	return clusters, nil
+}
+
 func (opts *ListOpts) RunFlexCluster() error {
 	r, err := opts.store.ListFlexClusters(opts.newListFlexClustersAPIParams())
 	if err != nil {
@@ -118,7 +139,11 @@ func ListBuilder() *cobra.Command {
 			"output": listTemplate,
 		},
 		Example: `  # Return a JSON-formatted list of all clusters for the project with ID 5e2211c17a3e5a48f5497de3:
-  atlas clusters list --projectId 5e2211c17a3e5a48f5497de3 --output json`,
+  atlas clusters list --projectId 5e2211c17a3e5a48f5497de3 --output json
+ 
+  # Return a JSON-formatted list of all clusters for the project with ID 5e2211c17a3e5a48f5497de3 and with independent shard scaling mode:
+  atlas clusters list --projectId 5e2211c17a3e5a48f5497de3 --autoScalingMode independentShardScaling --output json
+  `,
 		PreRunE: func(cmd *cobra.Command, _ []string) error {
 			return opts.PreRunE(
 				opts.ValidateProjectID,

internal/cli/clusters/list_mock_test.go

@@ -90,6 +90,10 @@ func TestList_RunDedicatedCluster_IndependentShardScaling(t *testing.T) {
 				Name: pointer.Get("test"),
 				Id:   pointer.Get("123"),
 			},
+			{
+				Name: pointer.Get("nonISS"),
+				Id:   pointer.Get("124"),
+			},
 		},
 	}
 
@@ -98,6 +102,22 @@ func TestList_RunDedicatedCluster_IndependentShardScaling(t *testing.T) {
 		autoScalingMode: independentShardScalingFlag,
 	}
 
+	mockStore.
+		EXPECT().
+		GetClusterAutoScalingConfig(listOpts.ProjectID, *expected.GetResults()[0].Name).
+		Return(&atlasv2.ClusterDescriptionAutoScalingModeConfiguration{
+			AutoScalingMode: pointer.Get(independentShardScalingFlag),
+		}, nil).
+		Times(1)
+
+	mockStore.
+		EXPECT().
+		GetClusterAutoScalingConfig(listOpts.ProjectID, *expected.GetResults()[1].Name).
+		Return(&atlasv2.ClusterDescriptionAutoScalingModeConfiguration{
+			AutoScalingMode: pointer.Get(clusterWideScalingFlag),
+		}, nil).
+		Times(1)
+
 	mockStore.
 		EXPECT().
 		LatestProjectClusters(listOpts.ProjectID, listOpts.NewAtlasListOptions()).

internal/cli/clusters/list_test.go

@@ -0,0 +1,17 @@
+HTTP/2.0 200 OK
+Content-Length: 47
+Content-Type: application/vnd.atlas.2024-08-05+json;charset=utf-8
+Date: Wed, 18 Jun 2025 11:11:40 GMT
+Deprecation: Wed, 23 Oct 2024 00:00:00 GMT
+Referrer-Policy: strict-origin-when-cross-origin
+Server: mdbws
+Strict-Transport-Security: max-age=31536000; includeSubdomains;
+X-Content-Type-Options: nosniff
+X-Envoy-Upstream-Service-Time: 52
+X-Frame-Options: DENY
+X-Java-Method: ApiAtlasClusterDescriptionResource20240805::getAutoScalingMode
+X-Java-Version: 17.0.14+7
+X-Mongodb-Service-Version: gitHash=41f34161bc8088e7c5346d8c5a415d0e537c8c00; versionString=master
+X-Permitted-Cross-Domain-Policies: none
+
+{"autoScalingMode":"INDEPENDENT_SHARD_SCALING"}

test/e2e/testdata/.snapshots/TestIndependendShardScalingCluster/List_ISS_cluster/GET_api_atlas_v2_groups_b0123456789abcdef012345b_clusters_backupRestores2-537_autoScalingConfiguration_1.snaphost

@@ -0,0 +1,17 @@
+HTTP/2.0 200 OK
+Content-Length: 47
+Content-Type: application/vnd.atlas.2024-08-05+json;charset=utf-8
+Date: Wed, 18 Jun 2025 11:11:40 GMT
+Deprecation: Wed, 23 Oct 2024 00:00:00 GMT
+Referrer-Policy: strict-origin-when-cross-origin
+Server: mdbws
+Strict-Transport-Security: max-age=31536000; includeSubdomains;
+X-Content-Type-Options: nosniff
+X-Envoy-Upstream-Service-Time: 52
+X-Frame-Options: DENY
+X-Java-Method: ApiAtlasClusterDescriptionResource20240805::getAutoScalingMode
+X-Java-Version: 17.0.14+7
+X-Mongodb-Service-Version: gitHash=41f34161bc8088e7c5346d8c5a415d0e537c8c00; versionString=master
+X-Permitted-Cross-Domain-Policies: none
+
+{"autoScalingMode":"INDEPENDENT_SHARD_SCALING"}