Merge pull request #3982 from kaofelix/route53-zone-import-bug

Fix bug: route53_zone import saves name with trailing . in state causing plan to detect a change and try to recreate the zone
hashicorp · Apr 10, 2018 · 33ca6e8 · 33ca6e8
2 parents 6bd0b67 + 1959801
commit 33ca6e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/aws/diff_suppress_funcs.go b/aws/diff_suppress_funcs.go
@@ -85,3 +85,7 @@ func suppressAutoscalingGroupAvailabilityZoneDiffs(k, old, new string, d *schema
 
 	return false
 }
+
+func suppressRoute53ZoneNameWithTrailingDot(k, old, new string, d *schema.ResourceData) bool {
+	return strings.TrimSuffix(old, ".") == strings.TrimSuffix(new, ".")
+}
diff --git a/aws/resource_aws_route53_zone.go b/aws/resource_aws_route53_zone.go
@@ -28,9 +28,10 @@ func resourceAwsRoute53Zone() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: suppressRoute53ZoneNameWithTrailingDot,
 			},
 
 			"comment": &schema.Schema{