fix: set the container id to avoid null in state (#667)

Author: coderGo93

mongodbatlas/data_source_mongodbatlas_cluster.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 func dataSourceMongoDBAtlasCluster() *schema.Resource {
@@ -445,6 +446,18 @@ func dataSourceMongoDBAtlasClusterRead(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(fmt.Errorf(errorClusterSetting, "version_release_system", clusterName, err))
 	}
 
+	if cluster.ProviderSettings != nil && cluster.ProviderSettings.ProviderName != "TENANT" {
+		containers, _, err := conn.Containers.List(ctx, projectID,
+			&matlas.ContainersListOptions{ProviderName: cluster.ProviderSettings.ProviderName})
+		if err != nil {
+			return diag.FromErr(fmt.Errorf(errorClusterRead, clusterName, err))
+		}
+
+		if err := d.Set("container_id", getContainerID(containers, cluster)); err != nil {
+			return diag.FromErr(fmt.Errorf(errorClusterSetting, "container_id", clusterName, err))
+		}
+	}
+
 	/*
 		Get the advaced configuration options and set up to the terraform state
 	*/

mongodbatlas/data_source_mongodbatlas_clusters.go

@@ -356,6 +356,16 @@ func flattenClusters(ctx context.Context, d *schema.ResourceData, conn *matlas.C
 		processArgs, _, err := conn.Clusters.GetProcessArgs(ctx, clusters[i].GroupID, clusters[i].Name)
 		log.Printf("[WARN] Error setting `advanced_configuration` for the cluster(%s): %s", clusters[i].ID, err)
 
+		var containerID string
+		if clusters[i].ProviderSettings != nil && clusters[i].ProviderSettings.ProviderName != "TENANT" {
+			containers, _, err := conn.Containers.List(ctx, clusters[i].GroupID,
+				&matlas.ContainersListOptions{ProviderName: clusters[i].ProviderSettings.ProviderName})
+			if err != nil {
+				log.Printf(errorClusterRead, clusters[i].Name, err)
+			}
+
+			containerID = getContainerID(containers, &clusters[i])
+		}
 		result := map[string]interface{}{
 			"advanced_configuration":                  flattenProcessArgs(processArgs),
 			"auto_scaling_compute_enabled":            clusters[i].AutoScaling.Compute.Enabled,
@@ -394,6 +404,7 @@ func flattenClusters(ctx context.Context, d *schema.ResourceData, conn *matlas.C
 			"labels":                                          flattenLabels(clusters[i].Labels),
 			"snapshot_backup_policy":                          snapshotBackupPolicy,
 			"version_release_system":                          clusters[i].VersionReleaseSystem,
+			"container_id":                                    containerID,
 		}
 		results = append(results, result)
 	}