Skip to content

Commit

Permalink
Merge pull request #3517 from moofish32/update_codebuild_test_method
Browse files Browse the repository at this point in the history
Fix Naming on Test Methods in Codebuild VPC
  • Loading branch information
bflad authored Feb 25, 2018
2 parents 87aeee6 + cf651fb commit cc1b1d9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions aws/resource_aws_codebuild_project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestAccAWSCodeBuildProject_vpc(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccAWSCodeBuildProjectConfig_basic(name,
hclVpcConfig("\"${aws_subnet.codebuild_subnet.id}\",\"${aws_subnet.codebuild_subnet_2.id}\""), hclVpcResources()),
testAccAWSCodeBuildProjectConfig_vpcConfig("\"${aws_subnet.codebuild_subnet.id}\",\"${aws_subnet.codebuild_subnet_2.id}\""), testAccAWSCodeBuildProjectConfig_vpcResources()),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSCodeBuildProjectExists("aws_codebuild_project.foo"),
resource.TestCheckResourceAttr(
Expand All @@ -55,7 +55,7 @@ func TestAccAWSCodeBuildProject_vpc(t *testing.T) {
),
},
{
Config: testAccAWSCodeBuildProjectConfig_basic(name, hclVpcConfig("\"${aws_subnet.codebuild_subnet.id}\""), hclVpcResources()),
Config: testAccAWSCodeBuildProjectConfig_basic(name, testAccAWSCodeBuildProjectConfig_vpcConfig("\"${aws_subnet.codebuild_subnet.id}\""), testAccAWSCodeBuildProjectConfig_vpcResources()),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSCodeBuildProjectExists("aws_codebuild_project.foo"),
resource.TestCheckResourceAttr(
Expand Down Expand Up @@ -738,7 +738,7 @@ resource "aws_codebuild_project" "foo" {
`, rName, authResource, authType)
}

func hclVpcResources() string {
func testAccAWSCodeBuildProjectConfig_vpcResources() string {
return fmt.Sprintf(`
resource "aws_vpc" "codebuild_vpc" {
cidr_block = "10.0.0.0/16"
Expand All @@ -761,7 +761,7 @@ func hclVpcResources() string {
`)
}

func hclVpcConfig(subnets string) string {
func testAccAWSCodeBuildProjectConfig_vpcConfig(subnets string) string {
return fmt.Sprintf(`
vpc_config {
vpc_id = "${aws_vpc.codebuild_vpc.id}"
Expand Down

0 comments on commit cc1b1d9

Please sign in to comment.