Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates Terraform syntax for data source acceptance tests #14837

Merged
merged 2 commits into from
Aug 28, 2020
Merged

Updates Terraform syntax for data source acceptance tests #14837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbb5982
Updates Terraform syntax for data source acceptance tests
gdavison Aug 25, 2020
9cf29dc
Small syntax fixes
gdavison Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions aws/data_source_aws_acm_certificate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecent(domain string,
return fmt.Sprintf(`
data "aws_acm_certificate" "test" {
domain = "%s"
most_recent = %v
most_recent = %t
}
`, domain, mostRecent)
}
Expand All @@ -249,7 +249,7 @@ func testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecentAndStatus(domain
data "aws_acm_certificate" "test" {
domain = "%s"
statuses = ["%s"]
most_recent = %v
most_recent = %t
}
`, domain, status, mostRecent)
}
Expand All @@ -259,7 +259,7 @@ func testAccCheckAwsAcmCertificateDataSourceConfigWithMostRecentAndTypes(domain,
data "aws_acm_certificate" "test" {
domain = "%s"
types = ["%s"]
most_recent = %v
most_recent = %t
}
`, domain, certType, mostRecent)
}
Expand Down
2 changes: 1 addition & 1 deletion aws/data_source_aws_cloudhsm2_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ resource "aws_subnet" "cloudhsm_v2_test_subnets" {

resource "aws_cloudhsm_v2_cluster" "cluster" {
hsm_type = "hsm1.medium"
subnet_ids = [aws_subnet.cloudhsm_v2_test_subnets.0.id, aws_subnet.cloudhsm_v2_test_subnets.1.id]
subnet_ids = aws_subnet.cloudhsm_v2_test_subnets[*].id
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😍


tags = {
Name = "tf-acc-aws_cloudhsm_v2_cluster-data-source-basic-%d"
Expand Down
2 changes: 1 addition & 1 deletion aws/data_source_aws_elb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ resource "aws_elb" "elb_test" {
name = "%[1]s"
internal = true
security_groups = [aws_security_group.elb_test.id]
subnets = [aws_subnet.elb_test.0.id, aws_subnet.elb_test.1.id]
subnets = aws_subnet.elb_test[*].id

idle_timeout = 30

Expand Down
14 changes: 7 additions & 7 deletions aws/data_source_aws_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ data "aws_instance" "test" {
var testAccInstanceDataSourceConfig_gp2IopsDevice = testAccLatestAmazonLinuxHvmEbsAmiConfig() + `
resource "aws_instance" "test" {
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m3.medium"
instance_type = "t3.medium"

root_block_device {
volume_type = "gp2"
Expand All @@ -571,7 +571,7 @@ data "aws_instance" "test" {
var testAccInstanceDataSourceConfig_blockDevices = testAccLatestAmazonLinuxHvmEbsAmiConfig() + `
resource "aws_instance" "test" {
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m3.medium"
instance_type = "t3.medium"

root_block_device {
volume_type = "gp2"
Expand Down Expand Up @@ -615,7 +615,7 @@ resource "aws_kms_key" "test" {

resource "aws_instance" "test" {
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m3.medium"
instance_type = "t3.medium"

root_block_device {
volume_type = "gp2"
Expand All @@ -642,7 +642,7 @@ resource "aws_kms_key" "test" {

resource "aws_instance" "test" {
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m3.medium"
instance_type = "t3.medium"

root_block_device {
encrypted = true
Expand All @@ -660,7 +660,7 @@ data "aws_instance" "test" {
var testAccInstanceDataSourceConfig_rootInstanceStore = testAccLatestAmazonLinuxHvmEbsAmiConfig() + `
resource "aws_instance" "test" {
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m3.medium"
instance_type = "t3.medium"
}

data "aws_instance" "test" {
Expand Down Expand Up @@ -707,7 +707,7 @@ resource "aws_key_pair" "test" {

resource "aws_instance" "test" {
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t1.micro"
instance_type = "t2.micro"
key_name = aws_key_pair.test.key_name

tags = {
Expand Down Expand Up @@ -757,7 +757,7 @@ resource "aws_placement_group" "test" {
# Limitations: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html#concepts-placement-groups
resource "aws_instance" "test" {
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "c3.large"
instance_type = "c5.large"
subnet_id = aws_subnet.test.id
associate_public_ip_address = true
placement_group = aws_placement_group.test.name
Expand Down
6 changes: 3 additions & 3 deletions aws/data_source_aws_instances_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ resource "aws_instance" "test" {

data "aws_instances" "test" {
instance_tags = {
Name = aws_instance.test.0.tags["Name"]
SecondTag = aws_instance.test.1.tags["Name"]
Name = aws_instance.test[0].tags["Name"]
SecondTag = aws_instance.test[1].tags["Name"]
}
}
`, rInt, rInt)
Expand Down Expand Up @@ -165,7 +165,7 @@ resource "aws_instance" "test" {

data "aws_instances" "test" {
instance_tags = {
Name = aws_instance.test.0.tags["Name"]
Name = aws_instance.test[0].tags["Name"]
}

instance_state_names = ["pending", "running"]
Expand Down
6 changes: 3 additions & 3 deletions aws/data_source_aws_lb_listener_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ resource "aws_lb" "alb_test" {
name = "%s"
internal = true
security_groups = [aws_security_group.alb_test.id]
subnets = [aws_subnet.alb_test.0.id, aws_subnet.alb_test.1.id]
subnets = aws_subnet.alb_test[*].id

idle_timeout = 30
enable_deletion_protection = false
Expand Down Expand Up @@ -250,7 +250,7 @@ resource "aws_alb" "alb_test" {
name = "%s"
internal = true
security_groups = [aws_security_group.alb_test.id]
subnets = [aws_subnet.alb_test.0.id, aws_subnet.alb_test.1.id]
subnets = aws_subnet.alb_test[*].id

idle_timeout = 30
enable_deletion_protection = false
Expand Down Expand Up @@ -366,7 +366,7 @@ resource "aws_lb" "alb_test" {
name = "%[1]s"
internal = false
security_groups = [aws_security_group.alb_test.id]
subnets = [aws_subnet.alb_test.0.id, aws_subnet.alb_test.1.id]
subnets = aws_subnet.alb_test[*].id

idle_timeout = 30
enable_deletion_protection = false
Expand Down
4 changes: 2 additions & 2 deletions aws/data_source_aws_lb_target_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ resource "aws_lb" "alb_test" {
name = "%s"
internal = true
security_groups = [aws_security_group.alb_test.id]
subnets = [aws_subnet.alb_test.0.id, aws_subnet.alb_test.1.id]
subnets = aws_subnet.alb_test[*].id

idle_timeout = 30
enable_deletion_protection = false
Expand Down Expand Up @@ -261,7 +261,7 @@ resource "aws_alb" "alb_test" {
name = "%s"
internal = true
security_groups = [aws_security_group.alb_test.id]
subnets = [aws_subnet.alb_test.0.id, aws_subnet.alb_test.1.id]
subnets = aws_subnet.alb_test[*].id

idle_timeout = 30
enable_deletion_protection = false
Expand Down
4 changes: 2 additions & 2 deletions aws/data_source_aws_lb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ resource "aws_lb" "alb_test" {
name = "%s"
internal = true
security_groups = [aws_security_group.alb_test.id]
subnets = [aws_subnet.alb_test.0.id, aws_subnet.alb_test.1.id]
subnets = aws_subnet.alb_test[*].id

idle_timeout = 30
enable_deletion_protection = false
Expand Down Expand Up @@ -198,7 +198,7 @@ resource "aws_alb" "alb_test" {
name = "%s"
internal = true
security_groups = [aws_security_group.alb_test.id]
subnets = [aws_subnet.alb_test.0.id, aws_subnet.alb_test.1.id]
subnets = aws_subnet.alb_test[*].id

idle_timeout = 30
enable_deletion_protection = false
Expand Down
88 changes: 26 additions & 62 deletions aws/data_source_aws_mq_broker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,78 +13,42 @@ func TestAccDataSourceAWSMqBroker_basic(t *testing.T) {
prefix := "tf-acc-test-d-mq-broker"
brokerName := fmt.Sprintf("%s-%s", prefix, rString)

dataSourceByIdName := "data.aws_mq_broker.by_id"
dataSourceByNameName := "data.aws_mq_broker.by_name"
resourceName := "aws_mq_broker.acctest"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccDataSourceAWSMqBrokerConfig_byId(brokerName, prefix),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "arn",
"aws_mq_broker.acctest", "arn"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "broker_name",
"aws_mq_broker.acctest", "broker_name"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "auto_minor_version_upgrade",
"aws_mq_broker.acctest", "auto_minor_version_upgrade"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "deployment_mode",
"aws_mq_broker.acctest", "deployment_mode"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "configuration.#",
"aws_mq_broker.acctest", "configuration.#"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "encryption_options.#",
"aws_mq_broker.acctest", "encryption_options.#"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "encryption_options.0.use_aws_owned_key",
"aws_mq_broker.acctest", "encryption_options.0.use_aws_owned_key"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "engine_type",
"aws_mq_broker.acctest", "engine_type"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "engine_version",
"aws_mq_broker.acctest", "engine_version"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "host_instance_type",
"aws_mq_broker.acctest", "host_instance_type"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "instances.#",
"aws_mq_broker.acctest", "instances.#"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "logs.#",
"aws_mq_broker.acctest", "logs.#"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "maintenance_window_start_time.#",
"aws_mq_broker.acctest", "maintenance_window_start_time.#"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "publicly_accessible",
"aws_mq_broker.acctest", "publicly_accessible"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "security_groups.#",
"aws_mq_broker.acctest", "security_groups.#"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "subnet_ids.#",
"aws_mq_broker.acctest", "subnet_ids.#"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "tags.%",
"aws_mq_broker.acctest", "tags.%"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_id", "user.#",
"aws_mq_broker.acctest", "user.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "arn", resourceName, "arn"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "broker_name", resourceName, "broker_name"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "auto_minor_version_upgrade", resourceName, "auto_minor_version_upgrade"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "deployment_mode", resourceName, "deployment_mode"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "configuration.#", resourceName, "configuration.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "encryption_options.#", resourceName, "encryption_options.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "encryption_options.0.use_aws_owned_key", resourceName, "encryption_options.0.use_aws_owned_key"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "engine_type", resourceName, "engine_type"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "engine_version", resourceName, "engine_version"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "host_instance_type", resourceName, "host_instance_type"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "instances.#", resourceName, "instances.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "logs.#", resourceName, "logs.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "maintenance_window_start_time.#", resourceName, "maintenance_window_start_time.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "publicly_accessible", resourceName, "publicly_accessible"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "security_groups.#", resourceName, "security_groups.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "subnet_ids.#", resourceName, "subnet_ids.#"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "tags.%", resourceName, "tags.%"),
resource.TestCheckResourceAttrPair(dataSourceByIdName, "user.#", resourceName, "user.#"),
),
},
{
Config: testAccDataSourceAWSMqBrokerConfig_byName(brokerName, prefix),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_name", "broker_id",
"aws_mq_broker.acctest", "id"),
resource.TestCheckResourceAttrPair(
"data.aws_mq_broker.by_name", "broker_name",
"aws_mq_broker.acctest", "broker_name"),
resource.TestCheckResourceAttrPair(dataSourceByNameName, "broker_id", resourceName, "id"),
resource.TestCheckResourceAttrPair(dataSourceByNameName, "broker_name", resourceName, "broker_name"),
),
},
},
Expand Down Expand Up @@ -184,8 +148,8 @@ resource "aws_mq_broker" "acctest" {
}

publicly_accessible = true
security_groups = [aws_security_group.acctest.0.id, aws_security_group.acctest.1.id]
subnet_ids = [aws_subnet.acctest.0.id, aws_subnet.acctest.1.id]
security_groups = aws_security_group.acctest[*].id
subnet_ids = aws_subnet.acctest[*].id

user {
username = "Ender"
Expand Down
Loading