chore: Uses blocks for Tags and Labels in TPF (#2901)

* move labels and tags from attrs to blocks

* don't convert labels and tags

* allow null value in Labels and Tags

* fix TestAccMockableAdvancedCluster_replicasetAdvConfigUpdate

Author: lantoli

internal/service/advancedclustertpf/model_to_ClusterDescription20240805.go

@@ -61,7 +61,7 @@ func newBiConnector(ctx context.Context, input types.Object, diags *diag.Diagnos
 	}
 }
 func newComponentLabel(ctx context.Context, input types.Set, diags *diag.Diagnostics) *[]admin.ComponentLabel {
-	if input.IsUnknown() || input.IsNull() {
+	if input.IsUnknown() {
 		return nil
 	}
 	elements := make([]TFLabelsModel, len(input.Elements()))
@@ -110,7 +110,7 @@ func resolveZoneNameOrUseDefault(item *TFReplicationSpecsModel) string {
 }
 
 func newResourceTag(ctx context.Context, input types.Set, diags *diag.Diagnostics) *[]admin.ResourceTag {
-	if input.IsUnknown() || input.IsNull() {
+	if input.IsUnknown() {
 		return nil
 	}
 	elements := make([]TFTagsModel, len(input.Elements()))

internal/service/advancedclustertpf/resource_test_cases_test.go

@@ -337,14 +337,14 @@ func replicasetAdvConfigUpdate(t *testing.T) *resource.TestCase {
 		enabled = true
 	}
 	# config_server_management_mode = "ATLAS_MANAGED" UNSTABLE: After applying this test step, the non-refresh plan was not empty
-	labels = [{
+	labels {
 		key   = "env"
 		value = "test"
-	}]
-	tags = [{
+	}
+	tags {
 		key   = "env"
 		value = "test"
-	}]
+	}
 	mongo_db_major_version = "8.0"
 	pit_enabled = true
 	redact_client_log_data = true

internal/service/advancedclustertpf/schema.go

@@ -12,7 +12,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/setdefault"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -155,24 +154,6 @@ func resourceSchema(ctx context.Context) schema.Schema {
 				Computed:            true,
 				MarkdownDescription: "Unique 24-hexadecimal digit string that identifies the cluster.",
 			},
-			"labels": schema.SetNestedAttribute{
-				Computed:            true,
-				Optional:            true,
-				Default:             setdefault.StaticValue(types.SetValueMust(LabelsObjType, nil)),
-				MarkdownDescription: "Collection of key-value pairs between 1 to 255 characters in length that tag and categorize the cluster. The MongoDB Cloud console doesn't display your labels.\n\nCluster labels are deprecated and will be removed in a future release. We strongly recommend that you use [resource tags](https://dochub.mongodb.org/core/add-cluster-tag-atlas) instead.",
-				NestedObject: schema.NestedAttributeObject{
-					Attributes: map[string]schema.Attribute{
-						"key": schema.StringAttribute{
-							Required:            true,
-							MarkdownDescription: "Key applied to tag and categorize this component.",
-						},
-						"value": schema.StringAttribute{
-							Required:            true,
-							MarkdownDescription: "Value set to the Key applied to tag and categorize this component.",
-						},
-					},
-				},
-			},
 			"mongo_db_major_version": schema.StringAttribute{
 				Computed: true,
 				Optional: true,
@@ -291,24 +272,6 @@ func resourceSchema(ctx context.Context) schema.Schema {
 				Computed:            true,
 				MarkdownDescription: "Human-readable label that indicates the current operating condition of this cluster.",
 			},
-			"tags": schema.SetNestedAttribute{
-				Computed:            true,
-				Optional:            true,
-				Default:             setdefault.StaticValue(types.SetValueMust(TagsObjType, nil)),
-				MarkdownDescription: "List that contains key-value pairs between 1 to 255 characters in length for tagging and categorizing the cluster.",
-				NestedObject: schema.NestedAttributeObject{
-					Attributes: map[string]schema.Attribute{
-						"key": schema.StringAttribute{
-							Required:            true,
-							MarkdownDescription: "Constant that defines the set of the tag. For example, `environment` in the `environment : production` tag.",
-						},
-						"value": schema.StringAttribute{
-							Required:            true,
-							MarkdownDescription: "Variable that belongs to the set of the tag. For example, `production` in the `environment : production` tag.",
-						},
-					},
-				},
-			},
 			"termination_protection_enabled": schema.BoolAttribute{
 				Computed:            true,
 				Optional:            true,
@@ -350,6 +313,38 @@ func resourceSchema(ctx context.Context) schema.Schema {
 				Delete: true,
 			}),
 		},
+		Blocks: map[string]schema.Block{
+			"labels": schema.SetNestedBlock{
+				MarkdownDescription: "Collection of key-value pairs between 1 to 255 characters in length that tag and categorize the cluster. The MongoDB Cloud console doesn't display your labels.\n\nCluster labels are deprecated and will be removed in a future release. We strongly recommend that you use [resource tags](https://dochub.mongodb.org/core/add-cluster-tag-atlas) instead.",
+				NestedObject: schema.NestedBlockObject{
+					Attributes: map[string]schema.Attribute{
+						"key": schema.StringAttribute{
+							Required:            true,
+							MarkdownDescription: "Key applied to tag and categorize this component.",
+						},
+						"value": schema.StringAttribute{
+							Required:            true,
+							MarkdownDescription: "Value set to the Key applied to tag and categorize this component.",
+						},
+					},
+				},
+			},
+			"tags": schema.SetNestedBlock{
+				MarkdownDescription: "List that contains key-value pairs between 1 to 255 characters in length for tagging and categorizing the cluster.",
+				NestedObject: schema.NestedBlockObject{
+					Attributes: map[string]schema.Attribute{
+						"key": schema.StringAttribute{
+							Required:            true,
+							MarkdownDescription: "Constant that defines the set of the tag. For example, `environment` in the `environment : production` tag.",
+						},
+						"value": schema.StringAttribute{
+							Required:            true,
+							MarkdownDescription: "Variable that belongs to the set of the tag. For example, `production` in the `environment : production` tag.",
+						},
+					},
+				},
+			},
+		},
 	}
 }
 

internal/testutil/acc/advanced_cluster_schema_v2.go

@@ -97,8 +97,6 @@ func ConvertAdvancedClusterToSchemaV2(t *testing.T, isAcc bool, def string) stri
 			continue
 		}
 		writeBody := resource.Body()
-		convertAttrs(t, "labels", writeBody, true, hcl.GetAttrVal)
-		convertAttrs(t, "tags", writeBody, true, hcl.GetAttrVal)
 		convertAttrs(t, "replication_specs", writeBody, true, getReplicationSpecs)
 		convertAttrs(t, "advanced_configuration", writeBody, false, hcl.GetAttrVal)
 		convertAttrs(t, "bi_connector_config", writeBody, false, hcl.GetAttrVal)

internal/testutil/acc/advanced_cluster_schema_v2_test.go

@@ -152,30 +152,33 @@ func TestConvertAdvancedClusterToSchemaV2(t *testing.T) {
 				cluster_type = "SHARDED"
 
 
-
-
-
-
-
-
 				
-				labels = [{
+ 				tags {
+					key   = "Key Tag 2"
+					value = "Value Tag 2"
+  			}
+
+ 				labels {
 					key   = "Key Label 1"
 					value = "Value Label 1"
-  			}, {
+  			}
+
+				tags {
+					key   = "Key Tag 1"
+					value = "Value Tag 1"
+			  }
+
+ 				labels {
 					key   = "Key Label 2"
 					value = "Value Label 2"
-  			}, {
+  			}
+
+ 				labels {
 					key   = "Key Label 3"
 					value = "Value Label 3"
-  			}]
-				tags = [{
-					key   = "Key Tag 2"
-					value = "Value Tag 2"
-  			}, {
-					key   = "Key Tag 1"
-					value = "Value Tag 1"
-  			}]
+  			}
+
+
 				replication_specs = [{
 						region_configs = [{
 							analytics_specs = {