Skip to content

Commit

Permalink
Merge pull request #14082 from YakDriver/seespot
Browse files Browse the repository at this point in the history 
Remove hardcoded AMIs in spot instance request tests
  • Loading branch information
@YakDriver
YakDriver authored Jul 27, 2020
2 parents e759116 + 908f246 commit 3fd275c
Showing 1 changed file with 33 additions and 17 deletions.
50 changes: 33 additions & 17 deletions aws/resource_aws_spot_instance_request_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,10 @@ func testAccAWSSpotInstanceRequestConfig(rInt int) string {
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 [email protected]"
}
%v
resource "aws_spot_instance_request" "foo" {
ami = "ami-4fccb37f"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m1.small"
key_name = "${aws_key_pair.debugging.key_name}"
Expand All @@ -533,7 +535,7 @@ func testAccAWSSpotInstanceRequestConfig(rInt int) string {
Name = "terraform-test"
}
}
`, rInt)
`, rInt, testAccLatestAmazonLinuxHvmEbsAmiConfig())
}

func testAccAWSSpotInstanceRequestConfigValidUntil(rInt int, validUntil string) string {
Expand All @@ -543,8 +545,10 @@ func testAccAWSSpotInstanceRequestConfigValidUntil(rInt int, validUntil string)
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 [email protected]"
}
%v
resource "aws_spot_instance_request" "foo" {
ami = "ami-4fccb37f"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m1.small"
key_name = "${aws_key_pair.debugging.key_name}"
Expand All @@ -564,7 +568,7 @@ func testAccAWSSpotInstanceRequestConfigValidUntil(rInt int, validUntil string)
Name = "terraform-test"
}
}
`, rInt, validUntil)
`, rInt, testAccLatestAmazonLinuxHvmEbsAmiConfig(), validUntil)
}

func testAccAWSSpotInstanceRequestConfig_withoutSpotPrice(rInt int) string {
Expand All @@ -574,8 +578,10 @@ func testAccAWSSpotInstanceRequestConfig_withoutSpotPrice(rInt int) string {
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 [email protected]"
}
%v
resource "aws_spot_instance_request" "foo" {
ami = "ami-4fccb37f"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m1.small"
key_name = "${aws_key_pair.debugging.key_name}"
Expand All @@ -589,7 +595,7 @@ func testAccAWSSpotInstanceRequestConfig_withoutSpotPrice(rInt int) string {
Name = "terraform-test"
}
}
`, rInt)
`, rInt, testAccLatestAmazonLinuxHvmEbsAmiConfig())
}

func testAccAWSSpotInstanceRequestConfig_withLaunchGroup(rInt int) string {
Expand All @@ -599,8 +605,10 @@ func testAccAWSSpotInstanceRequestConfig_withLaunchGroup(rInt int) string {
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 [email protected]"
}
%v
resource "aws_spot_instance_request" "foo" {
ami = "ami-4fccb37f"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m1.small"
key_name = "${aws_key_pair.debugging.key_name}"
Expand All @@ -618,7 +626,7 @@ func testAccAWSSpotInstanceRequestConfig_withLaunchGroup(rInt int) string {
Name = "terraform-test"
}
}
`, rInt)
`, rInt, testAccLatestAmazonLinuxHvmEbsAmiConfig())
}

func testAccAWSSpotInstanceRequestConfig_withBlockDuration(rInt int) string {
Expand All @@ -628,8 +636,10 @@ func testAccAWSSpotInstanceRequestConfig_withBlockDuration(rInt int) string {
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 [email protected]"
}
%v
resource "aws_spot_instance_request" "foo" {
ami = "ami-4fccb37f"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m1.small"
key_name = "${aws_key_pair.debugging.key_name}"
Expand All @@ -647,7 +657,7 @@ func testAccAWSSpotInstanceRequestConfig_withBlockDuration(rInt int) string {
Name = "terraform-test"
}
}
`, rInt)
`, rInt, testAccLatestAmazonLinuxHvmEbsAmiConfig())
}

func testAccAWSSpotInstanceRequestConfigVPC(rInt int) string {
Expand Down Expand Up @@ -683,8 +693,10 @@ resource "aws_key_pair" "debugging" {
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 [email protected]"
}
%v
resource "aws_spot_instance_request" "foo_VPC" {
ami = "ami-4fccb37f"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m1.small"
key_name = "${aws_key_pair.debugging.key_name}"
Expand All @@ -703,7 +715,7 @@ tags = {
Name = "terraform-test-VPC"
}
}
`, rInt)
`, rInt, testAccLatestAmazonLinuxHvmEbsAmiConfig())
}

func testAccAWSSpotInstanceRequestConfig_SubnetAndSGAndPublicIpAddress(rInt int) string {
Expand All @@ -718,14 +730,16 @@ data "aws_availability_zones" "available" {
}
}
%v
resource "aws_spot_instance_request" "foo" {
ami = "ami-4fccb37f"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "m1.small"
spot_price = "0.05"
wait_for_fulfillment = true
subnet_id = "${aws_subnet.tf_test_subnet.id}"
vpc_security_group_ids = ["${aws_security_group.tf_test_sg_ssh.id}"]
associate_public_ip_address = true
associate_public_ip_address = true
}
resource "aws_vpc" "default" {
Expand Down Expand Up @@ -757,7 +771,7 @@ tags = {
Name = "tf_test_sg_ssh-%d"
}
}
`, rInt, rInt)
`, testAccLatestAmazonLinuxHvmEbsAmiConfig(), rInt, rInt)
}

func testAccAWSSpotInstanceRequestConfig_getPasswordData(rInt int) string {
Expand Down Expand Up @@ -791,8 +805,10 @@ func testAccAWSSpotInstanceRequestConfig_getPasswordData(rInt int) string {

func testAccAWSSpotInstanceRequestInterruptConfig(interruption_behavior string) string {
return fmt.Sprintf(`
%v
resource "aws_spot_instance_request" "foo" {
ami = "ami-19e92861"
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "c5.large"
// base price is $0.067 hourly, so bidding above that should theoretically
Expand All @@ -804,5 +820,5 @@ func testAccAWSSpotInstanceRequestInterruptConfig(interruption_behavior string)
wait_for_fulfillment = true
instance_interruption_behaviour = "%s"
}`, interruption_behavior)
}`, testAccLatestAmazonLinuxHvmEbsAmiConfig(), interruption_behavior)
}

0 comments on commit 3fd275c

Please sign in to comment.