r/lb+elb: Suppress diff for LBs w/ empty name (#2314)

* r/lb+elb: Suppress diff for LBs w/ empty name * Add explanatory comments
hashicorp · Nov 16, 2017 · 33df43f · 33df43f
1 parent db3c17e
commit 33df43f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/aws/resource_aws_elb.go b/aws/resource_aws_elb.go
@@ -37,6 +37,16 @@ func resourceAwsElb() *schema.Resource {
 				ForceNew:      true,
 				ConflictsWith: []string{"name_prefix"},
 				ValidateFunc:  validateElbName,
+				// This is to work around an unexpected schema behaviour returning diff
+				// for an empty field when it has a pre-computed value from previous run
+				// (e.g. from name_prefix)
+				// TODO: Revisit after we find the real root cause
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if new == "" {
+						return true
+					}
+					return false
+				},
 			},
 			"name_prefix": &schema.Schema{
 				Type:         schema.TypeString,

diff --git a/aws/resource_aws_lb.go b/aws/resource_aws_lb.go
@@ -54,6 +54,16 @@ func resourceAwsLb() *schema.Resource {
 				ForceNew:      true,
 				ConflictsWith: []string{"name_prefix"},
 				ValidateFunc:  validateElbName,
+				// This is to work around an unexpected schema behaviour returning diff
+				// for an empty field when it has a pre-computed value from previous run
+				// (e.g. from name_prefix)
+				// TODO: Revisit after we find the real root cause
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if new == "" {
+						return true
+					}
+					return false
+				},
 			},
 
 			"name_prefix": {