Skip to content

Commit 3219037

Browse files
grubernautstack72
grubernaut
authored and
stack72
committed
provider/aws: Fix sg data source acctests (hashicorp#11994)
Fixes the `data_source_aws_security_group` acceptance tests ``` $ make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccDataSourceAwsSecurityGroup' ==> Checking that code complies with gofmt requirements... go generate $(go list ./... | grep -v /terraform/vendor/) 2017/02/15 22:19:51 Generated command/internal_plugin_list.go TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccDataSourceAwsSecurityGroup -timeout 120m === RUN TestAccDataSourceAwsSecurityGroup --- PASS: TestAccDataSourceAwsSecurityGroup (45.67s) PASS ok github.com/hashicorp/terraform/builtin/providers/aws 45.676s ```
1 parent ad69c54 commit 3219037

1 file changed

Lines changed: 45 additions & 41 deletions

File tree

‎builtin/providers/aws/data_source_aws_security_group_test.go‎

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ import (
44
"fmt"
55
"testing"
66

7+
"github.com/hashicorp/terraform/helper/acctest"
78
"github.com/hashicorp/terraform/helper/resource"
89
"github.com/hashicorp/terraform/terraform"
910
)
1011

1112
func TestAccDataSourceAwsSecurityGroup(t *testing.T) {
13+
rInt := acctest.RandInt()
1214
resource.Test(t, resource.TestCase{
1315
PreCheck: func() { testAccPreCheck(t) },
1416
Providers: testAccProviders,
1517
Steps: []resource.TestStep{
16-
resource.TestStep{
17-
Config: testAccDataSourceAwsSecurityGroupConfig,
18+
{
19+
Config: testAccDataSourceAwsSecurityGroupConfig(rInt),
1820
Check: resource.ComposeTestCheckFunc(
1921
testAccDataSourceAwsSecurityGroupCheck("data.aws_security_group.by_id"),
2022
testAccDataSourceAwsSecurityGroupCheck("data.aws_security_group.by_tag"),
@@ -60,7 +62,7 @@ func testAccDataSourceAwsSecurityGroupCheck(name string) resource.TestCheckFunc
6062
)
6163
}
6264

63-
if attr["tags.Name"] != "terraform-testacc-security-group-data-source" {
65+
if attr["tags.Name"] != "tf-acctest" {
6466
return fmt.Errorf("bad Name tag %s", attr["tags.Name"])
6567
}
6668

@@ -93,49 +95,51 @@ func testAccDataSourceAwsSecurityGroupCheckDefault(name string) resource.TestChe
9395
}
9496
}
9597

96-
const testAccDataSourceAwsSecurityGroupConfig = `
97-
provider "aws" {
98-
region = "eu-west-1"
99-
}
100-
resource "aws_vpc" "test" {
101-
cidr_block = "172.16.0.0/16"
98+
func testAccDataSourceAwsSecurityGroupConfig(rInt int) string {
99+
return fmt.Sprintf(`
100+
provider "aws" {
101+
region = "eu-west-1"
102+
}
103+
resource "aws_vpc" "test" {
104+
cidr_block = "172.16.0.0/16"
102105
103-
tags {
104-
Name = "terraform-testacc-subnet-data-source"
105-
}
106-
}
106+
tags {
107+
Name = "terraform-testacc-subnet-data-source"
108+
}
109+
}
107110
108-
resource "aws_security_group" "test" {
109-
vpc_id = "${aws_vpc.test.id}"
110-
name = "security-groupe-name-test"
111-
tags {
112-
Name = "terraform-testacc-security-group-data-source"
113-
}
114-
}
111+
resource "aws_security_group" "test" {
112+
vpc_id = "${aws_vpc.test.id}"
113+
name = "test-%d"
114+
tags {
115+
Name = "tf-acctest"
116+
Seed = "%d"
117+
}
118+
}
115119
116-
data "aws_security_group" "by_id" {
117-
id = "${aws_security_group.test.id}"
118-
}
120+
data "aws_security_group" "by_id" {
121+
id = "${aws_security_group.test.id}"
122+
}
119123
120-
data "aws_security_group" "by_name" {
121-
name = "${aws_security_group.test.name}"
122-
}
124+
data "aws_security_group" "by_name" {
125+
name = "${aws_security_group.test.name}"
126+
}
123127
124-
data "aws_security_group" "default_by_name" {
125-
vpc_id = "${aws_vpc.test.id}"
126-
name = "default"
127-
}
128+
data "aws_security_group" "default_by_name" {
129+
vpc_id = "${aws_vpc.test.id}"
130+
name = "default"
131+
}
128132
129-
data "aws_security_group" "by_tag" {
130-
tags {
131-
Name = "${aws_security_group.test.tags["Name"]}"
132-
}
133-
}
133+
data "aws_security_group" "by_tag" {
134+
tags {
135+
Seed = "${aws_security_group.test.tags["Seed"]}"
136+
}
137+
}
134138
135-
data "aws_security_group" "by_filter" {
136-
filter {
137-
name = "group-name"
138-
values = ["${aws_security_group.test.name}"]
139-
}
139+
data "aws_security_group" "by_filter" {
140+
filter {
141+
name = "group-name"
142+
values = ["${aws_security_group.test.name}"]
143+
}
144+
}`, rInt, rInt)
140145
}
141-
`

0 commit comments

Comments
 (0)