INTMDB-405: [Terraform] Add cluster label to advanced clusters (#857)

* Update CHANGELOG.md (#849)

* INTMDB-405: Add default label if none supplied

* Add test for default label exising

* Flatten nested IF statement

Author: martinstibbe

mongodbatlas/resource_mongodbatlas_advanced_cluster.go

@@ -315,12 +315,10 @@ func resourceMongoDBAtlasAdvancedClusterCreate(ctx context.Context, d *schema.Re
 		request.EncryptionAtRestProvider = v.(string)
 	}
 
-	if _, ok := d.GetOk("labels"); ok {
-		if containsLabelOrKey(expandLabelSliceFromSetSchema(d), defaultLabel) {
-			return diag.FromErr(fmt.Errorf("you should not set `Infrastructure Tool` label, it is used for internal purposes"))
-		}
-		request.Labels = append(expandLabelSliceFromSetSchema(d), defaultLabel)
+	if _, ok := d.GetOk("labels"); ok && containsLabelOrKey(expandLabelSliceFromSetSchema(d), defaultLabel) {
+		return diag.FromErr(fmt.Errorf("you should not set `Infrastructure Tool` label, it is used for internal purposes"))
 	}
+	request.Labels = append(expandLabelSliceFromSetSchema(d), defaultLabel)
 
 	if v, ok := d.GetOk("mongo_db_major_version"); ok {
 		request.MongoDBMajorVersion = formatMongoDBMajorVersion(v.(string))

mongodbatlas/resource_mongodbatlas_advanced_cluster_test.go

@@ -48,6 +48,7 @@ func TestAccResourceMongoDBAtlasAdvancedCluster_basicTenant(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "name", rNameUpdated),
 					resource.TestCheckResourceAttrSet(resourceName, "replication_specs.#"),
 					resource.TestCheckResourceAttrSet(resourceName, "replication_specs.0.region_configs.#"),
+					resource.TestCheckResourceAttr(resourceName, "labels.#", "0"),
 				),
 			},
 			{