resource/aws_route53_zone_association: Fix tests, update docs/test co…

…nfig to Terraform 0.12 format
hashicorp · Aug 1, 2020 · 65c823f · 65c823f
1 parent e360dfc
commit 65c823f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/aws/resource_aws_route53_vpc_association_authorization_test.go b/aws/resource_aws_route53_vpc_association_authorization_test.go
@@ -14,19 +14,24 @@ import (
 
 func TestAccAWSRoute53VpcAssociationAuthorization_basic(t *testing.T) {
 	var providers []*schema.Provider
+	resourceName := "aws_route53_vpc_association_authorization.test"
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testAccAlternateAccountPreCheck(t)
+		},
 		ProviderFactories: testAccProviderFactories(&providers),
 		CheckDestroy:      testAccCheckRoute53VPCAssociationAuthorizationDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccRoute53VPCAssociationAuthorizationConfig(),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckRoute53VPCAssociationAuthorizationExists("aws_route53_vpc_association_authorization.test"),
+					testAccCheckRoute53VPCAssociationAuthorizationExists(resourceName),
 				),
 			},
 			{
+				Config:            testAccRoute53VPCAssociationAuthorizationConfig(),
 				ResourceName:      resourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
@@ -117,7 +122,7 @@ resource "aws_vpc" "test" {
 resource "aws_route53_zone" "test" {
   name = "example.com"
   vpc {
-    vpc_id = "${aws_vpc.test.id}"
+    vpc_id = aws_vpc.test.id
   }
 }
 
@@ -129,8 +134,8 @@ resource "aws_vpc" "alternate" {
 }
 
 resource "aws_route53_vpc_association_authorization" "test" {
-  zone_id = "${aws_route53_zone.test.id}"
-  vpc_id  = "${aws_vpc.alternate.id}"
+  zone_id = aws_route53_zone.test.id
+  vpc_id  = aws_vpc.alternate.id
 }
 `
 }
diff --git a/website/docs/r/route53_vpc_association_authorization.html.markdown b/website/docs/r/route53_vpc_association_authorization.html.markdown
@@ -29,7 +29,7 @@ resource "aws_vpc" "example" {
 resource "aws_route53_zone" "example" {
   name = "example.com"
   vpc {
-    vpc_id = "${aws_vpc.example.id}"
+    vpc_id = aws_vpc.example.id
   }
 }
 
@@ -41,14 +41,14 @@ resource "aws_vpc" "alternate" {
 }
 
 resource "aws_route53_vpc_association_authorization" "example" {
-  zone_id = "${aws_route53_zone.example.id}"
-  vpc_id  = "${aws_vpc.alternate.id}"
+  zone_id = aws_route53_zone.example.id
+  vpc_id  = aws_vpc.alternate.id
 }
 
 resource "aws_route53_zone_association" "alternate" {
   provider = "aws.alternate"
-  zone_id  = "${aws_route53_zone.example.zone_id}"
-  vpc_id   = "${aws_vpc.alternate.id}"
+  zone_id  = aws_route53_zone.example.zone_id
+  vpc_id   = aws_vpc.alternate.id
 }
 ```