Replace 'suppressUnsetContainerAttribute' with 'suppressMissingOption…

…alConfigurationBlock'.
hashicorp · Jul 5, 2019 · 6a39c96 · 6a39c96
1 parent 8a4e06d
commit 6a39c96
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/aws/diff_suppress_funcs.go b/aws/diff_suppress_funcs.go
@@ -132,14 +132,3 @@ func suppressRoute53ZoneNameWithTrailingDot(k, old, new string, d *schema.Resour
 	}
 	return strings.TrimSuffix(old, ".") == strings.TrimSuffix(new, ".")
 }
-
-// suppressUnsetContainerAttribute ignores a container attribute being unset
-// in the Terraform configuration. All child attribute differences still apply.
-// Useful when an unset container attribute is equivalent to a container attribute
-// populated with default values.
-func suppressUnsetContainerAttribute(k, old, new string, d *schema.ResourceData) bool {
-	if old == "1" && new == "0" {
-		return true
-	}
-	return false
-}
diff --git a/aws/resource_aws_s3_bucket_object.go b/aws/resource_aws_s3_bucket_object.go
@@ -164,7 +164,7 @@ func resourceAwsS3BucketObject() *schema.Resource {
 				Type:             schema.TypeList,
 				Optional:         true,
 				MaxItems:         1,
-				DiffSuppressFunc: suppressUnsetContainerAttribute,
+				DiffSuppressFunc: suppressMissingOptionalConfigurationBlock,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"status": {