diff --git a/aws/resource_aws_redshift_parameter_group_test.go b/aws/resource_aws_redshift_parameter_group_test.go index 8b32f7f5a9be..4feb46884aff 100644 --- a/aws/resource_aws_redshift_parameter_group_test.go +++ b/aws/resource_aws_redshift_parameter_group_test.go @@ -12,8 +12,9 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSRedshiftParameterGroup_importBasic(t *testing.T) { - resourceName := "aws_redshift_parameter_group.bar" +func TestAccAWSRedshiftParameterGroup_basic(t *testing.T) { + var v redshift.ClusterParameterGroup + resourceName := "aws_redshift_parameter_group.test" rInt := acctest.RandInt() resource.ParallelTest(t, resource.TestCase{ @@ -23,8 +24,10 @@ func TestAccAWSRedshiftParameterGroup_importBasic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSRedshiftParameterGroupConfig(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSRedshiftParameterGroupExists(resourceName, &v), + ), }, - { ResourceName: resourceName, ImportState: true, @@ -37,6 +40,7 @@ func TestAccAWSRedshiftParameterGroup_importBasic(t *testing.T) { func TestAccAWSRedshiftParameterGroup_withParameters(t *testing.T) { var v redshift.ClusterParameterGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_parameter_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -46,27 +50,32 @@ func TestAccAWSRedshiftParameterGroup_withParameters(t *testing.T) { { Config: testAccAWSRedshiftParameterGroupConfig(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftParameterGroupExists("aws_redshift_parameter_group.bar", &v), + testAccCheckAWSRedshiftParameterGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "name", fmt.Sprintf("test-terraform-%d", rInt)), + resourceName, "name", fmt.Sprintf("test-terraform-%d", rInt)), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "family", "redshift-1.0"), + resourceName, "family", "redshift-1.0"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "description", "Managed by Terraform"), + resourceName, "description", "Managed by Terraform"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "parameter.490804664.name", "require_ssl"), + resourceName, "parameter.490804664.name", "require_ssl"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "parameter.490804664.value", "true"), + resourceName, "parameter.490804664.value", "true"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "parameter.2036118857.name", "query_group"), + resourceName, "parameter.2036118857.name", "query_group"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "parameter.2036118857.value", "example"), + resourceName, "parameter.2036118857.value", "example"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "parameter.484080973.name", "enable_user_activity_logging"), + resourceName, "parameter.484080973.name", "enable_user_activity_logging"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "parameter.484080973.value", "true"), + resourceName, "parameter.484080973.value", "true"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } @@ -74,6 +83,7 @@ func TestAccAWSRedshiftParameterGroup_withParameters(t *testing.T) { func TestAccAWSRedshiftParameterGroup_withoutParameters(t *testing.T) { var v redshift.ClusterParameterGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_parameter_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -83,24 +93,28 @@ func TestAccAWSRedshiftParameterGroup_withoutParameters(t *testing.T) { { Config: testAccAWSRedshiftParameterGroupOnlyConfig(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftParameterGroupExists("aws_redshift_parameter_group.bar", &v), + testAccCheckAWSRedshiftParameterGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "name", fmt.Sprintf("test-terraform-%d", rInt)), + resourceName, "name", fmt.Sprintf("test-terraform-%d", rInt)), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "family", "redshift-1.0"), + resourceName, "family", "redshift-1.0"), resource.TestCheckResourceAttr( - "aws_redshift_parameter_group.bar", "description", "Test parameter group for terraform"), + resourceName, "description", "Test parameter group for terraform"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSRedshiftParameterGroup_withTags(t *testing.T) { var v redshift.ClusterParameterGroup - rInt := acctest.RandInt() - resourceName := "aws_redshift_parameter_group.default" + resourceName := "aws_redshift_parameter_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -118,6 +132,11 @@ func TestAccAWSRedshiftParameterGroup_withTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.description", fmt.Sprintf("Test parameter group for terraform %s", "aaa")), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccAWSRedshiftParameterGroupConfigWithTags(rInt, "bbb"), Check: resource.ComposeTestCheckFunc( @@ -250,7 +269,7 @@ func testAccCheckAWSRedshiftParameterGroupExists(n string, v *redshift.ClusterPa func testAccAWSRedshiftParameterGroupOnlyConfig(rInt int) string { return fmt.Sprintf(` -resource "aws_redshift_parameter_group" "bar" { +resource "aws_redshift_parameter_group" "test" { name = "test-terraform-%d" family = "redshift-1.0" description = "Test parameter group for terraform" @@ -260,7 +279,7 @@ resource "aws_redshift_parameter_group" "bar" { func testAccAWSRedshiftParameterGroupConfig(rInt int) string { return fmt.Sprintf(` -resource "aws_redshift_parameter_group" "bar" { +resource "aws_redshift_parameter_group" "test" { name = "test-terraform-%d" family = "redshift-1.0" @@ -284,7 +303,7 @@ resource "aws_redshift_parameter_group" "bar" { func testAccAWSRedshiftParameterGroupConfigWithTags(rInt int, rString string) string { return fmt.Sprintf(` -resource "aws_redshift_parameter_group" "default" { +resource "aws_redshift_parameter_group" "test" { name = "test-terraform-%[1]d" family = "redshift-1.0" description = "Test parameter group for terraform" @@ -300,7 +319,7 @@ resource "aws_redshift_parameter_group" "default" { func testAccAWSRedshiftParameterGroupConfigWithTagsUpdate(rInt int) string { return fmt.Sprintf(` -resource "aws_redshift_parameter_group" "default" { +resource "aws_redshift_parameter_group" "test" { name = "test-terraform-%[1]d" family = "redshift-1.0" description = "Test parameter group for terraform" diff --git a/aws/resource_aws_redshift_security_group_test.go b/aws/resource_aws_redshift_security_group_test.go index c185bc571234..a03d0d3c0ff9 100644 --- a/aws/resource_aws_redshift_security_group_test.go +++ b/aws/resource_aws_redshift_security_group_test.go @@ -13,13 +13,15 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSRedshiftSecurityGroup_importBasic(t *testing.T) { +func TestAccAWSRedshiftSecurityGroup_basic(t *testing.T) { + // This is necessary to prevent "VPC-by-Default customers cannot use cluster security groups" errors oldvar := os.Getenv("AWS_DEFAULT_REGION") os.Setenv("AWS_DEFAULT_REGION", "us-east-1") defer os.Setenv("AWS_DEFAULT_REGION", oldvar) - rInt := acctest.RandInt() - resourceName := "aws_redshift_security_group.bar" + var v redshift.ClusterSecurityGroup + rInt := acctest.RandInt() + resourceName := "aws_redshift_security_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -28,8 +30,10 @@ func TestAccAWSRedshiftSecurityGroup_importBasic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccAWSRedshiftSecurityGroupConfig_ingressCidr(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), + ), }, - { ResourceName: resourceName, ImportState: true, @@ -40,8 +44,13 @@ func TestAccAWSRedshiftSecurityGroup_importBasic(t *testing.T) { } func TestAccAWSRedshiftSecurityGroup_ingressCidr(t *testing.T) { + oldvar := os.Getenv("AWS_DEFAULT_REGION") + os.Setenv("AWS_DEFAULT_REGION", "us-east-1") + defer os.Setenv("AWS_DEFAULT_REGION", oldvar) + var v redshift.ClusterSecurityGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_security_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -51,24 +60,34 @@ func TestAccAWSRedshiftSecurityGroup_ingressCidr(t *testing.T) { { Config: testAccAWSRedshiftSecurityGroupConfig_ingressCidr(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "name", fmt.Sprintf("redshift-sg-terraform-%d", rInt)), + resourceName, "name", fmt.Sprintf("redshift-sg-terraform-%d", rInt)), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "description", "Managed by Terraform"), + resourceName, "description", "Managed by Terraform"), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.2735652665.cidr", "10.0.0.1/24"), + resourceName, "ingress.2735652665.cidr", "10.0.0.1/24"), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "1"), + resourceName, "ingress.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSRedshiftSecurityGroup_updateIngressCidr(t *testing.T) { + oldvar := os.Getenv("AWS_DEFAULT_REGION") + os.Setenv("AWS_DEFAULT_REGION", "us-east-1") + defer os.Setenv("AWS_DEFAULT_REGION", oldvar) + var v redshift.ClusterSecurityGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_security_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -78,27 +97,30 @@ func TestAccAWSRedshiftSecurityGroup_updateIngressCidr(t *testing.T) { { Config: testAccAWSRedshiftSecurityGroupConfig_ingressCidr(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "1"), + resourceName, "ingress.#", "1"), ), }, - + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccAWSRedshiftSecurityGroupConfig_ingressCidrAdd(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "3"), + resourceName, "ingress.#", "3"), ), }, - { Config: testAccAWSRedshiftSecurityGroupConfig_ingressCidrReduce(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "2"), + resourceName, "ingress.#", "2"), ), }, }, @@ -106,8 +128,13 @@ func TestAccAWSRedshiftSecurityGroup_updateIngressCidr(t *testing.T) { } func TestAccAWSRedshiftSecurityGroup_ingressSecurityGroup(t *testing.T) { + oldvar := os.Getenv("AWS_DEFAULT_REGION") + os.Setenv("AWS_DEFAULT_REGION", "us-east-1") + defer os.Setenv("AWS_DEFAULT_REGION", oldvar) + var v redshift.ClusterSecurityGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_security_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -117,22 +144,32 @@ func TestAccAWSRedshiftSecurityGroup_ingressSecurityGroup(t *testing.T) { { Config: testAccAWSRedshiftSecurityGroupConfig_ingressSgId(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "name", fmt.Sprintf("redshift-sg-terraform-%d", rInt)), + resourceName, "name", fmt.Sprintf("redshift-sg-terraform-%d", rInt)), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "description", "this is a description"), + resourceName, "description", "this is a description"), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "1"), + resourceName, "ingress.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, }, }) } func TestAccAWSRedshiftSecurityGroup_updateIngressSecurityGroup(t *testing.T) { + oldvar := os.Getenv("AWS_DEFAULT_REGION") + os.Setenv("AWS_DEFAULT_REGION", "us-east-1") + defer os.Setenv("AWS_DEFAULT_REGION", oldvar) + var v redshift.ClusterSecurityGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_security_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -142,27 +179,30 @@ func TestAccAWSRedshiftSecurityGroup_updateIngressSecurityGroup(t *testing.T) { { Config: testAccAWSRedshiftSecurityGroupConfig_ingressSgId(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "1"), + resourceName, "ingress.#", "1"), ), }, - + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccAWSRedshiftSecurityGroupConfig_ingressSgIdAdd(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "3"), + resourceName, "ingress.#", "3"), ), }, - { Config: testAccAWSRedshiftSecurityGroupConfig_ingressSgIdReduce(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSRedshiftSecurityGroupExists("aws_redshift_security_group.bar", &v), + testAccCheckAWSRedshiftSecurityGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_security_group.bar", "ingress.#", "2"), + resourceName, "ingress.#", "2"), ), }, }, @@ -271,11 +311,7 @@ func TestResourceAWSRedshiftSecurityGroupNameValidation(t *testing.T) { func testAccAWSRedshiftSecurityGroupConfig_ingressCidr(rInt int) string { return fmt.Sprintf(` -provider "aws" { - region = "us-east-1" -} - -resource "aws_redshift_security_group" "bar" { +resource "aws_redshift_security_group" "test" { name = "redshift-sg-terraform-%d" ingress { @@ -287,11 +323,7 @@ resource "aws_redshift_security_group" "bar" { func testAccAWSRedshiftSecurityGroupConfig_ingressCidrAdd(rInt int) string { return fmt.Sprintf(` -provider "aws" { - region = "us-east-1" -} - -resource "aws_redshift_security_group" "bar" { +resource "aws_redshift_security_group" "test" { name = "redshift-sg-terraform-%d" description = "this is a description" @@ -312,11 +344,7 @@ resource "aws_redshift_security_group" "bar" { func testAccAWSRedshiftSecurityGroupConfig_ingressCidrReduce(rInt int) string { return fmt.Sprintf(` -provider "aws" { - region = "us-east-1" -} - -resource "aws_redshift_security_group" "bar" { +resource "aws_redshift_security_group" "test" { name = "redshift-sg-terraform-%d" description = "this is a description" @@ -333,10 +361,6 @@ resource "aws_redshift_security_group" "bar" { func testAccAWSRedshiftSecurityGroupConfig_ingressSgId(rInt int) string { return fmt.Sprintf(` -provider "aws" { - region = "us-east-1" -} - resource "aws_security_group" "redshift" { name = "terraform_redshift_test_%d" description = "Used in the redshift acceptance tests" @@ -349,7 +373,7 @@ resource "aws_security_group" "redshift" { } } -resource "aws_redshift_security_group" "bar" { +resource "aws_redshift_security_group" "test" { name = "redshift-sg-terraform-%d" description = "this is a description" @@ -363,10 +387,6 @@ resource "aws_redshift_security_group" "bar" { func testAccAWSRedshiftSecurityGroupConfig_ingressSgIdAdd(rInt int) string { return fmt.Sprintf(` -provider "aws" { - region = "us-east-1" -} - resource "aws_security_group" "redshift" { name = "terraform_redshift_test_%d" description = "Used in the redshift acceptance tests" @@ -403,7 +423,7 @@ resource "aws_security_group" "redshift3" { } } -resource "aws_redshift_security_group" "bar" { +resource "aws_redshift_security_group" "test" { name = "redshift-sg-terraform-%d" description = "this is a description" @@ -427,10 +447,6 @@ resource "aws_redshift_security_group" "bar" { func testAccAWSRedshiftSecurityGroupConfig_ingressSgIdReduce(rInt int) string { return fmt.Sprintf(` -provider "aws" { - region = "us-east-1" -} - resource "aws_security_group" "redshift" { name = "terraform_redshift_test_%d" description = "Used in the redshift acceptance tests" @@ -455,7 +471,7 @@ resource "aws_security_group" "redshift2" { } } -resource "aws_redshift_security_group" "bar" { +resource "aws_redshift_security_group" "test" { name = "redshift-sg-terraform-%d" description = "this is a description" diff --git a/aws/resource_aws_redshift_subnet_group_test.go b/aws/resource_aws_redshift_subnet_group_test.go index 2f43776c4210..f4833d97f991 100644 --- a/aws/resource_aws_redshift_subnet_group_test.go +++ b/aws/resource_aws_redshift_subnet_group_test.go @@ -12,9 +12,10 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSRedshiftSubnetGroup_importBasic(t *testing.T) { - resourceName := "aws_redshift_subnet_group.foo" +func TestAccAWSRedshiftSubnetGroup_basic(t *testing.T) { + var v redshift.ClusterSubnetGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_subnet_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -23,8 +24,14 @@ func TestAccAWSRedshiftSubnetGroup_importBasic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccRedshiftSubnetGroupConfig(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckRedshiftSubnetGroupExists(resourceName, &v), + resource.TestCheckResourceAttr( + resourceName, "subnet_ids.#", "2"), + resource.TestCheckResourceAttr( + resourceName, "description", "test description"), + ), }, - { ResourceName: resourceName, ImportState: true, @@ -36,9 +43,10 @@ func TestAccAWSRedshiftSubnetGroup_importBasic(t *testing.T) { }) } -func TestAccAWSRedshiftSubnetGroup_basic(t *testing.T) { +func TestAccAWSRedshiftSubnetGroup_updateDescription(t *testing.T) { var v redshift.ClusterSubnetGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_subnet_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -48,41 +56,24 @@ func TestAccAWSRedshiftSubnetGroup_basic(t *testing.T) { { Config: testAccRedshiftSubnetGroupConfig(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckRedshiftSubnetGroupExists("aws_redshift_subnet_group.foo", &v), + testAccCheckRedshiftSubnetGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "subnet_ids.#", "2"), - resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "description", "foo description"), + resourceName, "description", "test description"), ), }, - }, - }) -} - -func TestAccAWSRedshiftSubnetGroup_updateDescription(t *testing.T) { - var v redshift.ClusterSubnetGroup - rInt := acctest.RandInt() - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckRedshiftSubnetGroupDestroy, - Steps: []resource.TestStep{ { - Config: testAccRedshiftSubnetGroupConfig(rInt), - Check: resource.ComposeTestCheckFunc( - testAccCheckRedshiftSubnetGroupExists("aws_redshift_subnet_group.foo", &v), - resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "description", "foo description"), - ), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "description"}, }, - { Config: testAccRedshiftSubnetGroup_updateDescription(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckRedshiftSubnetGroupExists("aws_redshift_subnet_group.foo", &v), + testAccCheckRedshiftSubnetGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "description", "foo description updated"), + resourceName, "description", "test description updated"), ), }, }, @@ -92,6 +83,7 @@ func TestAccAWSRedshiftSubnetGroup_updateDescription(t *testing.T) { func TestAccAWSRedshiftSubnetGroup_updateSubnetIds(t *testing.T) { var v redshift.ClusterSubnetGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_subnet_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -101,18 +93,24 @@ func TestAccAWSRedshiftSubnetGroup_updateSubnetIds(t *testing.T) { { Config: testAccRedshiftSubnetGroupConfig(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckRedshiftSubnetGroupExists("aws_redshift_subnet_group.foo", &v), + testAccCheckRedshiftSubnetGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "subnet_ids.#", "2"), + resourceName, "subnet_ids.#", "2"), ), }, - + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "description"}, + }, { Config: testAccRedshiftSubnetGroupConfig_updateSubnetIds(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckRedshiftSubnetGroupExists("aws_redshift_subnet_group.foo", &v), + testAccCheckRedshiftSubnetGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "subnet_ids.#", "3"), + resourceName, "subnet_ids.#", "3"), ), }, }, @@ -122,6 +120,7 @@ func TestAccAWSRedshiftSubnetGroup_updateSubnetIds(t *testing.T) { func TestAccAWSRedshiftSubnetGroup_tags(t *testing.T) { var v redshift.ClusterSubnetGroup rInt := acctest.RandInt() + resourceName := "aws_redshift_subnet_group.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -131,21 +130,28 @@ func TestAccAWSRedshiftSubnetGroup_tags(t *testing.T) { { Config: testAccRedshiftSubnetGroupConfigWithTags(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckRedshiftSubnetGroupExists("aws_redshift_subnet_group.foo", &v), + testAccCheckRedshiftSubnetGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "tags.%", "1"), - resource.TestCheckResourceAttr("aws_redshift_subnet_group.foo", "tags.Name", "tf-redshift-subnetgroup"), + resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-subnetgroup"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "description"}, + }, { Config: testAccRedshiftSubnetGroupConfigWithTagsUpdated(rInt), Check: resource.ComposeTestCheckFunc( - testAccCheckRedshiftSubnetGroupExists("aws_redshift_subnet_group.foo", &v), + testAccCheckRedshiftSubnetGroupExists(resourceName, &v), resource.TestCheckResourceAttr( - "aws_redshift_subnet_group.foo", "tags.%", "3"), - resource.TestCheckResourceAttr("aws_redshift_subnet_group.foo", "tags.environment", "production"), - resource.TestCheckResourceAttr("aws_redshift_subnet_group.foo", "tags.Name", "tf-redshift-subnetgroup"), - resource.TestCheckResourceAttr("aws_redshift_subnet_group.foo", "tags.foo", "bar"), + resourceName, "tags.%", "3"), + resource.TestCheckResourceAttr(resourceName, "tags.environment", "production"), + resource.TestCheckResourceAttr(resourceName, "tags.Name", "tf-redshift-subnetgroup"), + resource.TestCheckResourceAttr(resourceName, "tags.test", "test2"), ), }, }, @@ -252,7 +258,7 @@ func testAccCheckRedshiftSubnetGroupExists(n string, v *redshift.ClusterSubnetGr func testAccRedshiftSubnetGroupConfig(rInt int) string { return fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" tags = { @@ -260,37 +266,37 @@ resource "aws_vpc" "foo" { } } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" availability_zone = "us-west-2a" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-foo" + Name = "tf-acc-redshift-subnet-group-test" } } -resource "aws_subnet" "bar" { +resource "aws_subnet" "test2" { cidr_block = "10.1.2.0/24" availability_zone = "us-west-2b" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-bar" + Name = "tf-acc-redshift-subnet-group-test2" } } -resource "aws_redshift_subnet_group" "foo" { - name = "foo-%d" - description = "foo description" - subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] +resource "aws_redshift_subnet_group" "test" { + name = "test-%d" + description = "test description" + subnet_ids = ["${aws_subnet.test.id}", "${aws_subnet.test2.id}"] } `, rInt) } func testAccRedshiftSubnetGroup_updateDescription(rInt int) string { return fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" tags = { @@ -298,37 +304,37 @@ resource "aws_vpc" "foo" { } } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" availability_zone = "us-west-2a" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-upd-description-foo" + Name = "tf-acc-redshift-subnet-group-upd-description-test" } } -resource "aws_subnet" "bar" { +resource "aws_subnet" "test2" { cidr_block = "10.1.2.0/24" availability_zone = "us-west-2b" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-upd-description-bar" + Name = "tf-acc-redshift-subnet-group-upd-description-test2" } } -resource "aws_redshift_subnet_group" "foo" { - name = "foo-%d" - description = "foo description updated" - subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] +resource "aws_redshift_subnet_group" "test" { + name = "test-%d" + description = "test description updated" + subnet_ids = ["${aws_subnet.test.id}", "${aws_subnet.test2.id}"] } `, rInt) } func testAccRedshiftSubnetGroupConfigWithTags(rInt int) string { return fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" tags = { @@ -336,29 +342,29 @@ resource "aws_vpc" "foo" { } } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" availability_zone = "us-west-2a" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-with-tags-foo" + Name = "tf-acc-redshift-subnet-group-with-tags-test" } } -resource "aws_subnet" "bar" { +resource "aws_subnet" "test2" { cidr_block = "10.1.2.0/24" availability_zone = "us-west-2b" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-with-tags-bar" + Name = "tf-acc-redshift-subnet-group-with-tags-test2" } } -resource "aws_redshift_subnet_group" "foo" { - name = "foo-%d" - subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] +resource "aws_redshift_subnet_group" "test" { + name = "test-%d" + subnet_ids = ["${aws_subnet.test.id}", "${aws_subnet.test2.id}"] tags = { Name = "tf-redshift-subnetgroup" @@ -369,7 +375,7 @@ resource "aws_redshift_subnet_group" "foo" { func testAccRedshiftSubnetGroupConfigWithTagsUpdated(rInt int) string { return fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" tags = { @@ -377,34 +383,34 @@ resource "aws_vpc" "foo" { } } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" availability_zone = "us-west-2a" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-with-tags-foo" + Name = "tf-acc-redshift-subnet-group-with-tags-test" } } -resource "aws_subnet" "bar" { +resource "aws_subnet" "test2" { cidr_block = "10.1.2.0/24" availability_zone = "us-west-2b" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-with-tags-bar" + Name = "tf-acc-redshift-subnet-group-with-tags-test2" } } -resource "aws_redshift_subnet_group" "foo" { - name = "foo-%d" - subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] +resource "aws_redshift_subnet_group" "test" { + name = "test-%d" + subnet_ids = ["${aws_subnet.test.id}", "${aws_subnet.test2.id}"] tags = { Name = "tf-redshift-subnetgroup" environment = "production" - foo = "bar" + test = "test2" } } `, rInt) @@ -412,7 +418,7 @@ resource "aws_redshift_subnet_group" "foo" { func testAccRedshiftSubnetGroupConfig_updateSubnetIds(rInt int) string { return fmt.Sprintf(` -resource "aws_vpc" "foo" { +resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" tags = { @@ -420,39 +426,39 @@ resource "aws_vpc" "foo" { } } -resource "aws_subnet" "foo" { +resource "aws_subnet" "test" { cidr_block = "10.1.1.0/24" availability_zone = "us-west-2a" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-upd-subnet-ids-foo" + Name = "tf-acc-redshift-subnet-group-upd-subnet-ids-test" } } -resource "aws_subnet" "bar" { +resource "aws_subnet" "test2" { cidr_block = "10.1.2.0/24" availability_zone = "us-west-2b" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-upd-subnet-ids-bar" + Name = "tf-acc-redshift-subnet-group-upd-subnet-ids-test2" } } -resource "aws_subnet" "foobar" { +resource "aws_subnet" "testtest2" { cidr_block = "10.1.3.0/24" availability_zone = "us-west-2c" - vpc_id = "${aws_vpc.foo.id}" + vpc_id = "${aws_vpc.test.id}" tags = { - Name = "tf-acc-redshift-subnet-group-upd-subnet-ids-foobar" + Name = "tf-acc-redshift-subnet-group-upd-subnet-ids-testtest2" } } -resource "aws_redshift_subnet_group" "foo" { - name = "foo-%d" - subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}", "${aws_subnet.foobar.id}"] +resource "aws_redshift_subnet_group" "test" { + name = "test-%d" + subnet_ids = ["${aws_subnet.test.id}", "${aws_subnet.test2.id}", "${aws_subnet.testtest2.id}"] } `, rInt) }