Skip to content

Commit

Permalink
Renames ConfigLatestAmazonLinuxHVMEBSAMI() to `ConfigLatestAmazonLi…
Browse files Browse the repository at this point in the history
…nuxHvmEbsAmi()` for legibility
  • Loading branch information
gdavison committed Oct 13, 2021
1 parent 76a93c1 commit 961a27f
Show file tree
Hide file tree
Showing 38 changed files with 205 additions and 205 deletions.
8 changes: 4 additions & 4 deletions docs/contributing/running-and-writing-acceptance-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ resource "aws_example_thing" "test" {
These test configurations are typical implementations we have found or allow testing to implement best practices easier, since the Terraform AWS Provider testing is expected to run against various AWS Regions and Partitions.

- `acctest.AvailableEC2InstanceTypeForRegion("type1", "type2", ...)`: Typically used to replace hardcoded EC2 Instance Types. Uses `aws_ec2_instance_type_offering` data source to return an available EC2 Instance Type in preferred ordering. Reference the instance type via: `data.aws_ec2_instance_type_offering.available.instance_type`. Use `acctest.AvailableEC2InstanceTypeForRegionNamed("name", "type1", "type2", ...)` to specify a name for the data source
- `acctest.ConfigLatestAmazonLinuxHVMEBSAMI()`: Typically used to replace hardcoded EC2 Image IDs (`ami-12345678`). Uses `aws_ami` data source to find the latest Amazon Linux image. Reference the AMI ID via: `data.aws_ami.amzn-ami-minimal-hvm-ebs.id`
- `acctest.ConfigLatestAmazonLinuxHvmEbsAmi()`: Typically used to replace hardcoded EC2 Image IDs (`ami-12345678`). Uses `aws_ami` data source to find the latest Amazon Linux image. Reference the AMI ID via: `data.aws_ami.amzn-ami-minimal-hvm-ebs.id`

#### Randomized Naming

Expand Down Expand Up @@ -1358,18 +1358,18 @@ resource "aws_backup_selection" "test" {
#### Hardcoded AMI IDs

- [ ] __Uses aws_ami Data Source__: Any hardcoded AMI ID configuration, e.g. `ami-12345678`, should be replaced with the [`aws_ami` data source](https://www.terraform.io/docs/providers/aws/d/ami.html) pointing to an Amazon Linux image. The package `internal/acctest` includes test configuration helper functions to simplify these lookups:
- `acctest.ConfigLatestAmazonLinuxHVMEBSAMI()`: The recommended AMI for most situations, using Amazon Linux, HVM virtualization, and EBS storage. To reference the AMI ID in the test configuration: `data.aws_ami.amzn-ami-minimal-hvm-ebs.id`.
- `acctest.ConfigLatestAmazonLinuxHvmEbsAmi()`: The recommended AMI for most situations, using Amazon Linux, HVM virtualization, and EBS storage. To reference the AMI ID in the test configuration: `data.aws_ami.amzn-ami-minimal-hvm-ebs.id`.
- `acctest.ConfigLatestAmazonLinuxHvmInstanceStoreAmi()`: AMI lookup using Amazon Linux, HVM virtualization, and Instance Store storage. Should only be used in testing that requires Instance Store storage rather than EBS. To reference the AMI ID in the test configuration: `data.aws_ami.amzn-ami-minimal-hvm-instance-store.id`.
- `acctest.ConfigLatestAmazonLinuxPvEbsAmi()`: AMI lookup using Amazon Linux, Paravirtual virtualization, and EBS storage. Should only be used in testing that requires Paravirtual over Hardware Virtual Machine (HVM) virtualization. To reference the AMI ID in the test configuration: `data.aws_ami.amzn-ami-minimal-pv-ebs.id`.
- `acctest.ConfigLatestAmazonLinuxPvInstanceStoreAmi`: AMI lookup using Amazon Linux, Paravirtual virtualization, and Instance Store storage. Should only be used in testing that requires Paravirtual virtualization over HVM and Instance Store storage over EBS. To reference the AMI ID in the test configuration: `data.aws_ami.amzn-ami-minimal-pv-instance-store.id`.
- `acctest.ConfigLatestWindowsServer2016CoreAmi()`: AMI lookup using Windows Server 2016 Core, HVM virtualization, and EBS storage. Should only be used in testing that requires Windows. To reference the AMI ID in the test configuration: `data.aws_ami.win2016core-ami.id`.

Here's an example of using `acctest.ConfigLatestAmazonLinuxHVMEBSAMI()` and `data.aws_ami.amzn-ami-minimal-hvm-ebs.id`:
Here's an example of using `acctest.ConfigLatestAmazonLinuxHvmEbsAmi()` and `data.aws_ami.amzn-ami-minimal-hvm-ebs.id`:

```go
func testAccLaunchConfigurationDataSourceConfig_basic(rName string) string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name = %[1]q
Expand Down
4 changes: 2 additions & 2 deletions internal/acctest/acctest.go
Original file line number Diff line number Diff line change
Expand Up @@ -2219,10 +2219,10 @@ data "aws_ec2_instance_type_offering" "%[1]s" {
`, name, strings.Join(preferredInstanceTypes, "\", \""))
}

// ConfigLatestAmazonLinuxHVMEBSAMI returns the configuration for a data source that
// ConfigLatestAmazonLinuxHvmEbsAmi returns the configuration for a data source that
// describes the latest Amazon Linux AMI using HVM virtualization and an EBS root device.
// The data source is named 'amzn-ami-minimal-hvm-ebs'.
func ConfigLatestAmazonLinuxHVMEBSAMI() string {
func ConfigLatestAmazonLinuxHvmEbsAmi() string {
return `
data "aws_ami" "amzn-ami-minimal-hvm-ebs" {
most_recent = true
Expand Down
4 changes: 2 additions & 2 deletions internal/service/autoscaling/attachment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func testAccCheckAutocalingAlbAttachmentExists(asgname string, targetGroupCount
}

func testAccAttachment_alb(rInt int) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
data "aws_availability_zones" "available" {
state = "available"
Expand Down Expand Up @@ -286,7 +286,7 @@ resource "aws_vpc" "test" {
}

func testAccAttachment_elb(rInt int) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
data "aws_availability_zones" "available" {
state = "available"
Expand Down
4 changes: 2 additions & 2 deletions internal/service/autoscaling/group_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestAccAutoScalingGroupDataSource_launchTemplate(t *testing.T) {
// Lookup based on AutoScalingGroupName
func testAccAutoScalingGroupDataResourceConfig(rName string) string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
acctest.ConfigAvailableAZsNoOptIn(),
acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"),
fmt.Sprintf(`
Expand Down Expand Up @@ -125,7 +125,7 @@ resource "aws_launch_configuration" "data_source_aws_autoscaling_group_test" {

func testAccAutoScalingGroupDataResourceConfig_launchTemplate() string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
acctest.ConfigAvailableAZsNoOptIn(),
acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"),
`
Expand Down
2 changes: 1 addition & 1 deletion internal/service/autoscaling/group_tag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func testAccCheckAutoscalingGroupTagExists(n string) resource.TestCheckFunc {
func testAccAutoscalingGroupTagConfig(key string, value string) string {
return acctest.ConfigCompose(
acctest.ConfigAvailableAZsNoOptInDefaultExclude(),
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
fmt.Sprintf(`
resource "aws_launch_template" "test" {
name_prefix = "terraform-test-"
Expand Down
8 changes: 4 additions & 4 deletions internal/service/autoscaling/group_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2289,7 +2289,7 @@ func TestAccAutoScalingGroup_launchTempPartitionNum(t *testing.T) {
func testAccGroupNameGeneratedConfig() string {
return acctest.ConfigCompose(
acctest.ConfigAvailableAZsNoOptInDefaultExclude(),
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
`
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand All @@ -2308,7 +2308,7 @@ resource "aws_autoscaling_group" "test" {
func testAccGroupNamePrefixConfig(namePrefix string) string {
return acctest.ConfigCompose(
acctest.ConfigAvailableAZsNoOptInDefaultExclude(),
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down Expand Up @@ -2531,7 +2531,7 @@ resource "aws_autoscaling_group" "bar" {

func testAccGroupWithLoadBalancerConfig() string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
acctest.ConfigAvailableAZsNoOptInDefaultExclude(),
`
resource "aws_vpc" "foo" {
Expand Down Expand Up @@ -2624,7 +2624,7 @@ resource "aws_autoscaling_group" "bar" {

func testAccGroupWithTargetGroupConfig() string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
acctest.ConfigAvailableAZsNoOptInDefaultExclude(),
`
resource "aws_vpc" "foo" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func TestAccAutoScalingLaunchConfigurationDataSource_metadataOptions(t *testing.
}

func testAccLaunchConfigurationDataSourceConfig_basic(rName string) string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name = %[1]q
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down Expand Up @@ -145,7 +145,7 @@ data "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationDataSourceConfig_securityGroups(rInt int) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_vpc" "test" {
cidr_block = "10.1.0.0/16"
}
Expand All @@ -170,7 +170,7 @@ data "aws_launch_configuration" "foo" {

func testAccLaunchConfigurationDataSourceConfig_metadataOptions(rName string) string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand All @@ -191,7 +191,7 @@ data "aws_launch_configuration" "test" {

func testAccLaunchConfigurationDataSourceConfigEbsNoDevice(rName string) string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name = %[1]q
Expand Down
32 changes: 16 additions & 16 deletions internal/service/autoscaling/launch_configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationWithRootBlockDeviceCopiedAMIConfig(rName string) string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
data "aws_region" "current" {}
resource "aws_ami_copy" "test" {
Expand All @@ -697,7 +697,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationWithRootBlockDeviceVolumeSizeConfig(rName string, volumeSize int) string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name = %[1]q
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand All @@ -713,7 +713,7 @@ resource "aws_launch_configuration" "test" {
func testAccLaunchConfigurationWithEncryptedRootBlockDeviceConfig(rInt int) string {
return acctest.ConfigCompose(
acctest.ConfigAvailableAZsNoOptIn(),
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
fmt.Sprintf(`
resource "aws_vpc" "test" {
cidr_block = "10.1.0.0/16"
Expand Down Expand Up @@ -751,7 +751,7 @@ resource "aws_launch_configuration" "test" {

func testAccLaunchConfigurationMetadataOptionsConfig(rName string) string {
return acctest.ConfigCompose(
acctest.ConfigLatestAmazonLinuxHVMEBSAMI(),
acctest.ConfigLatestAmazonLinuxHvmEbsAmi(),
fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand All @@ -767,7 +767,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationConfig() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name = "tf-acc-test-%d"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down Expand Up @@ -801,7 +801,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationWithSpotPriceConfig() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name = "tf-acc-test-%d"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand All @@ -812,7 +812,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationNameGeneratedConfig() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), `
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), `
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t2.micro"
Expand All @@ -821,7 +821,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationNamePrefixConfig(namePrefix string) string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name_prefix = %[1]q
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand All @@ -831,7 +831,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationWithEncryption() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), `
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), `
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t2.micro"
Expand All @@ -852,7 +852,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationWithGP3() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), `
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), `
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t2.micro"
Expand All @@ -875,7 +875,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationWithEncryptionUpdated() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), `
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), `
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t2.micro"
Expand All @@ -896,7 +896,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationConfig_withVPCClassicLink(rInt int) string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
enable_classiclink = true
Expand All @@ -923,7 +923,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationConfig_withIAMProfile(rInt int) string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_iam_role" "role" {
name = "tf-acc-test-%[1]d"
Expand Down Expand Up @@ -958,7 +958,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationEBSNoDeviceConfig(rInt int) string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(`
resource "aws_launch_configuration" "test" {
name_prefix = "tf-acc-test-%d"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand All @@ -973,7 +973,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationConfig_userData() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), `
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), `
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t2.micro"
Expand All @@ -984,7 +984,7 @@ resource "aws_launch_configuration" "test" {
}

func testAccLaunchConfigurationConfig_userDataBase64() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), `
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), `
resource "aws_launch_configuration" "test" {
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
instance_type = "t2.micro"
Expand Down
4 changes: 2 additions & 2 deletions internal/service/autoscaling/lifecycle_hook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func testAccLifecycleHookImportStateIdFunc(resourceName string) resource.ImportS
}

func testAccLifecycleHookConfig(name string) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down Expand Up @@ -228,7 +228,7 @@ EOF
}

func testAccLifecycleHookConfig_omitDefaultResult(name string, rInt int) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down
6 changes: 3 additions & 3 deletions internal/service/autoscaling/notification_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func testAccCheckASGNotificationAttributes(n string, asgn *autoscaling.DescribeN
}

func testAccASGNotificationConfig_basic(rName string) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_sns_topic" "topic_example" {
name = "user-updates-topic-%s"
}
Expand Down Expand Up @@ -265,7 +265,7 @@ resource "aws_autoscaling_notification" "example" {
}

func testAccASGNotificationConfig_update(rName string) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_sns_topic" "topic_example" {
name = "user-updates-topic-%s"
}
Expand Down Expand Up @@ -329,7 +329,7 @@ resource "aws_autoscaling_notification" "example" {
}

func testAccASGNotificationConfig_pagination() string {
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), `
return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), `
resource "aws_sns_topic" "user_updates" {
name = "user-updates-topic"
}
Expand Down
8 changes: 4 additions & 4 deletions internal/service/autoscaling/schedule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ func testAccCheckScalingScheduleHasNoDesiredCapacity(
}

func testAccScheduleConfig(r, start, end string) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down Expand Up @@ -322,7 +322,7 @@ resource "aws_autoscaling_schedule" "foobar" {
}

func testAccScheduleConfig_recurrence(r string) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down Expand Up @@ -369,7 +369,7 @@ resource "aws_autoscaling_schedule" "foobar" {
}

func testAccScheduleConfig_zeroValues(r, start, end string) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down Expand Up @@ -416,7 +416,7 @@ resource "aws_autoscaling_schedule" "foobar" {
}

func testAccScheduleConfig_negativeOne(r, start, end string) string {
return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(`
return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(`
resource "aws_launch_configuration" "foobar" {
name = "%s"
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
Expand Down
Loading

0 comments on commit 961a27f

Please sign in to comment.