Skip to content

Commit

Permalink
Merge pull request #14321 from terraform-providers/td-hardami-lifecycle
Browse files Browse the repository at this point in the history
Remove hardcoded AMI and AZ from autoscaling lifecycle hook tests
  • Loading branch information
YakDriver committed Jul 23, 2020
2 parents 05c6089 + f9d6f73 commit 034f335
Showing 1 changed file with 24 additions and 6 deletions.
30 changes: 24 additions & 6 deletions aws/resource_aws_autoscaling_lifecycle_hook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ func testAccAWSAutoscalingLifecycleHookImportStateIdFunc(resourceName string) re
}

func testAccAWSAutoscalingLifecycleHookConfig(name string) string {
return fmt.Sprintf(`
return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = "ami-21f78e11"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t1.micro"
}
Expand Down Expand Up @@ -177,8 +177,17 @@ resource "aws_iam_role_policy" "foobar" {
EOF
}
data "aws_availability_zones" "available" {
state = "available"
filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}
resource "aws_autoscaling_group" "foobar" {
availability_zones = ["us-west-2a"]
availability_zones = [data.aws_availability_zones.available.names[1]]
name = "%s"
max_size = 5
min_size = 2
Expand Down Expand Up @@ -215,10 +224,10 @@ EOF
}

func testAccAWSAutoscalingLifecycleHookConfig_omitDefaultResult(name string, rInt int) string {
return fmt.Sprintf(`
return testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = "ami-21f78e11"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t1.micro"
}
Expand Down Expand Up @@ -267,8 +276,17 @@ resource "aws_iam_role_policy" "foobar" {
EOF
}
data "aws_availability_zones" "available" {
state = "available"
filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}
resource "aws_autoscaling_group" "foobar" {
availability_zones = ["us-west-2a"]
availability_zones = [data.aws_availability_zones.available.names[1]]
name = "%s"
max_size = 5
min_size = 2
Expand Down

0 comments on commit 034f335

Please sign in to comment.