Merge pull request #5312 from terraform-providers/b-aws_route53_recor…

…d-expand-double-period resource/aws_route53_record: Prevent DomainLabelEmpty errors when expanding record names with trailing period
hashicorp · Jul 24, 2018 · 4e84c6d · 4e84c6d
2 parents bfd9961 + e800496
commit 4e84c6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/aws/resource_aws_route53_record.go b/aws/resource_aws_route53_record.go
@@ -929,7 +929,7 @@ func expandRecordName(name, zone string) string {
 		if len(name) == 0 {
 			rn = zone
 		} else {
-			rn = strings.Join([]string{name, zone}, ".")
+			rn = strings.Join([]string{rn, zone}, ".")
 		}
 	}
 	return rn

diff --git a/aws/resource_aws_route53_record_test.go b/aws/resource_aws_route53_record_test.go
@@ -40,6 +40,7 @@ func TestExpandRecordName(t *testing.T) {
 		Input, Output string
 	}{
 		{"www", "www.nonexample.com"},
+		{"www.", "www.nonexample.com"},
 		{"dev.www", "dev.www.nonexample.com"},
 		{"*", "*.nonexample.com"},
 		{"nonexample.com", "nonexample.com"},