From 961a27fed0b0d0b03e24c623de522777a0fe68af Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 13 Oct 2021 11:15:06 -0700 Subject: [PATCH] Renames `ConfigLatestAmazonLinuxHVMEBSAMI()` to `ConfigLatestAmazonLinuxHvmEbsAmi()` for legibility --- .../running-and-writing-acceptance-tests.md | 8 +- internal/acctest/acctest.go | 4 +- .../service/autoscaling/attachment_test.go | 4 +- .../autoscaling/group_data_source_test.go | 4 +- .../service/autoscaling/group_tag_test.go | 2 +- internal/service/autoscaling/group_test.go | 8 +- .../launch_configuration_data_source_test.go | 8 +- .../autoscaling/launch_configuration_test.go | 32 ++-- .../autoscaling/lifecycle_hook_test.go | 4 +- .../service/autoscaling/notification_test.go | 6 +- internal/service/autoscaling/schedule_test.go | 8 +- .../autoscalingplans/scaling_plan_test.go | 2 +- .../service/batch/compute_environment_test.go | 2 +- .../service/cloudwatch/metric_alarm_test.go | 2 +- .../service/ec2/ami_from_instance_test.go | 2 +- internal/service/ec2/eip_association_test.go | 8 +- internal/service/ec2/eip_test.go | 12 +- internal/service/ec2/fleet_test.go | 2 +- .../service/ec2/instance_data_source_test.go | 46 ++--- internal/service/ec2/instance_test.go | 172 +++++++++--------- .../service/ec2/instances_data_source_test.go | 6 +- internal/service/ec2/launch_template_test.go | 6 +- .../ec2/network_interface_attachment_test.go | 2 +- .../service/ec2/network_interface_test.go | 4 +- .../service/ec2/route_data_source_test.go | 2 +- internal/service/ec2/route_table_test.go | 2 +- internal/service/ec2/route_test.go | 4 +- .../service/ec2/spot_fleet_request_test.go | 2 +- .../service/ec2/spot_instance_request_test.go | 24 +-- .../ec2/traffic_mirror_session_test.go | 2 +- .../service/ec2/traffic_mirror_target_test.go | 2 +- .../service/ec2/volume_attachment_test.go | 2 +- internal/service/elb/attachment_test.go | 6 +- .../globalaccelerator/endpoint_group_test.go | 2 +- .../service/servicediscovery/instance_test.go | 2 +- internal/service/ssm/association_test.go | 2 +- internal/service/ssm/document_test.go | 2 +- internal/service/ssm/parameter_test.go | 2 +- 38 files changed, 205 insertions(+), 205 deletions(-) diff --git a/docs/contributing/running-and-writing-acceptance-tests.md b/docs/contributing/running-and-writing-acceptance-tests.md index 18a05a9e3ae9..3c4a602f521f 100644 --- a/docs/contributing/running-and-writing-acceptance-tests.md +++ b/docs/contributing/running-and-writing-acceptance-tests.md @@ -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 @@ -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 diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index bf0f96543d8a..0cdbdf89f4af 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -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 diff --git a/internal/service/autoscaling/attachment_test.go b/internal/service/autoscaling/attachment_test.go index 34ec382e2fb8..851223a1e443 100644 --- a/internal/service/autoscaling/attachment_test.go +++ b/internal/service/autoscaling/attachment_test.go @@ -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" @@ -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" diff --git a/internal/service/autoscaling/group_data_source_test.go b/internal/service/autoscaling/group_data_source_test.go index f9e8d1dc284d..b4527ca5b34f 100644 --- a/internal/service/autoscaling/group_data_source_test.go +++ b/internal/service/autoscaling/group_data_source_test.go @@ -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(` @@ -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"), ` diff --git a/internal/service/autoscaling/group_tag_test.go b/internal/service/autoscaling/group_tag_test.go index 3f03146fa280..7ed302d6958a 100644 --- a/internal/service/autoscaling/group_tag_test.go +++ b/internal/service/autoscaling/group_tag_test.go @@ -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-" diff --git a/internal/service/autoscaling/group_test.go b/internal/service/autoscaling/group_test.go index a5dbf3943eaf..85a5a708d427 100644 --- a/internal/service/autoscaling/group_test.go +++ b/internal/service/autoscaling/group_test.go @@ -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 @@ -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 @@ -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" { @@ -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" { diff --git a/internal/service/autoscaling/launch_configuration_data_source_test.go b/internal/service/autoscaling/launch_configuration_data_source_test.go index 3ff1736da1c8..9ceb9ed5e596 100644 --- a/internal/service/autoscaling/launch_configuration_data_source_test.go +++ b/internal/service/autoscaling/launch_configuration_data_source_test.go @@ -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 @@ -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" } @@ -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 @@ -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 diff --git a/internal/service/autoscaling/launch_configuration_test.go b/internal/service/autoscaling/launch_configuration_test.go index e1553de43cc3..f291e6f81ab7 100644 --- a/internal/service/autoscaling/launch_configuration_test.go +++ b/internal/service/autoscaling/launch_configuration_test.go @@ -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" { @@ -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 @@ -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" @@ -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 @@ -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 @@ -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 @@ -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" @@ -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 @@ -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" @@ -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" @@ -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" @@ -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 @@ -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" @@ -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 @@ -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" @@ -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" diff --git a/internal/service/autoscaling/lifecycle_hook_test.go b/internal/service/autoscaling/lifecycle_hook_test.go index cf2c90cfd1d9..a85d18fa88cb 100644 --- a/internal/service/autoscaling/lifecycle_hook_test.go +++ b/internal/service/autoscaling/lifecycle_hook_test.go @@ -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 @@ -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 diff --git a/internal/service/autoscaling/notification_test.go b/internal/service/autoscaling/notification_test.go index 7e3cf1b3b26d..7545561bb1ad 100644 --- a/internal/service/autoscaling/notification_test.go +++ b/internal/service/autoscaling/notification_test.go @@ -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" } @@ -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" } @@ -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" } diff --git a/internal/service/autoscaling/schedule_test.go b/internal/service/autoscaling/schedule_test.go index c5b87fc7eb46..0b71f0c1f645 100644 --- a/internal/service/autoscaling/schedule_test.go +++ b/internal/service/autoscaling/schedule_test.go @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/internal/service/autoscalingplans/scaling_plan_test.go b/internal/service/autoscalingplans/scaling_plan_test.go index 5a9acdfd457c..791497ffe337 100644 --- a/internal/service/autoscalingplans/scaling_plan_test.go +++ b/internal/service/autoscalingplans/scaling_plan_test.go @@ -437,7 +437,7 @@ func testAccCheckAutoScalingPlansApplicationSourceTags(scalingPlan *autoscalingp func testAccAutoScalingPlansScalingPlanConfigBase(rName, tagName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptInDefaultExclude(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` diff --git a/internal/service/batch/compute_environment_test.go b/internal/service/batch/compute_environment_test.go index 59c889e89bd0..60a26802ead3 100644 --- a/internal/service/batch/compute_environment_test.go +++ b/internal/service/batch/compute_environment_test.go @@ -1568,7 +1568,7 @@ resource "aws_batch_compute_environment" "test" { func testAccComputeEnvironmentEC2WithDesiredVcpusEC2KeyPairImageIdAndComputeResourcesTagsConfig(rName, publicKey string) string { return acctest.ConfigCompose( testAccComputeEnvironmentBaseConfig(rName), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_batch_compute_environment" "test" { compute_environment_name = %[1]q diff --git a/internal/service/cloudwatch/metric_alarm_test.go b/internal/service/cloudwatch/metric_alarm_test.go index 2031aee6eef9..acbdf1afa2e1 100644 --- a/internal/service/cloudwatch/metric_alarm_test.go +++ b/internal/service/cloudwatch/metric_alarm_test.go @@ -841,7 +841,7 @@ resource "aws_cloudwatch_metric_alarm" "test" { // ValidationError: Invalid use of EC2 'Recover' action. i-abc123 is not a valid EC2 instance. func testAccMetricAlarmAlarmActionsEC2AutomateConfig(rName, action string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), fmt.Sprintf(` data "aws_partition" "current" {} diff --git a/internal/service/ec2/ami_from_instance_test.go b/internal/service/ec2/ami_from_instance_test.go index 05532f8c10c7..848235358ae6 100644 --- a/internal/service/ec2/ami_from_instance_test.go +++ b/internal/service/ec2/ami_from_instance_test.go @@ -165,7 +165,7 @@ func testAccCheckAMIFromInstanceDestroy(s *terraform.State) error { func testAccAMIFromInstanceBaseConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { diff --git a/internal/service/ec2/eip_association_test.go b/internal/service/ec2/eip_association_test.go index 2001a4fac982..e935c1d06340 100644 --- a/internal/service/ec2/eip_association_test.go +++ b/internal/service/ec2/eip_association_test.go @@ -307,7 +307,7 @@ func testAccCheckEIPAssociationDestroy(s *terraform.State) error { func testAccEIPAssociationConfig(rName string) string { return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptIn(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_vpc" "test" { cidr_block = "192.168.0.0/24" @@ -376,7 +376,7 @@ resource "aws_network_interface" "test" { func testAccEIPAssociationDisappearsConfig(rName string) string { return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptIn(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_vpc" "main" { cidr_block = "192.168.0.0/24" @@ -438,7 +438,7 @@ resource "aws_eip_association" "test" { func testAccEIPAssociationConfig_spotInstance(rName, publicKey string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` @@ -485,7 +485,7 @@ func testAccEIPAssociationConfig_instance() string { return acctest.ConfigCompose( acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), acctest.ConfigAvailableAZsNoOptIn(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" diff --git a/internal/service/ec2/eip_test.go b/internal/service/ec2/eip_test.go index ba2877b0db33..7234d07ef9f0 100644 --- a/internal/service/ec2/eip_test.go +++ b/internal/service/ec2/eip_test.go @@ -973,7 +973,7 @@ resource "aws_eip" "test" { func testAccEIPInstanceConfig() string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), acctest.ConfigAvailableAZsNoOptIn(), ` @@ -1006,7 +1006,7 @@ resource "aws_eip" "test" { func testAccEIPInstanceAssociatedConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), fmt.Sprintf(` @@ -1075,7 +1075,7 @@ resource "aws_eip" "test" { func testAccEIPInstanceAssociatedSwitchConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_vpc" "default" { cidr_block = "10.0.0.0/16" @@ -1226,7 +1226,7 @@ resource "aws_eip" "test2" { func testAccEIPInstanceReassociateConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_eip" "test" { @@ -1302,7 +1302,7 @@ func testAccEIPInstanceAssociateNotAssociatedConfig() string { return acctest.ConfigCompose( acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), acctest.ConfigAvailableAZsNoOptIn(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } @@ -1332,7 +1332,7 @@ func testAccEIPInstanceAssociateAssociatedConfig() string { return acctest.ConfigCompose( acctest.AvailableEC2InstanceTypeForAvailabilityZone("aws_subnet.test.availability_zone", "t3.micro", "t2.micro"), acctest.ConfigAvailableAZsNoOptIn(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } diff --git a/internal/service/ec2/fleet_test.go b/internal/service/ec2/fleet_test.go index 7a1331c47748..a96f20f24e4d 100644 --- a/internal/service/ec2/fleet_test.go +++ b/internal/service/ec2/fleet_test.go @@ -1273,7 +1273,7 @@ func testAccPreCheckFleet(t *testing.T) { func testAccFleetConfig_multipleNetworkInterfaces(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" diff --git a/internal/service/ec2/instance_data_source_test.go b/internal/service/ec2/instance_data_source_test.go index 1fe1712faf39..2ec576770e58 100644 --- a/internal/service/ec2/instance_data_source_test.go +++ b/internal/service/ec2/instance_data_source_test.go @@ -616,7 +616,7 @@ func TestAccEC2InstanceDataSource_blockDeviceTags(t *testing.T) { } // Lookup based on InstanceID -var testAccInstanceDataSourceConfig = acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + ` +var testAccInstanceDataSourceConfig = acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.small" @@ -636,7 +636,7 @@ data "aws_instance" "test" { // Use the tags attribute to filter func testAccInstanceDataSourceConfig_Tags(rInt int) string { - return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(` + return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.small" @@ -658,7 +658,7 @@ data "aws_instance" "test" { // filter on tag, populate more attributes var testAccInstanceDataSourceConfig_AzUserData = acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptInDefaultExclude(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id availability_zone = data.aws_availability_zones.available.names[0] @@ -677,7 +677,7 @@ data "aws_instance" "test" { `) // GP2IopsDevice -var testAccInstanceDataSourceConfig_gp2IopsDevice = acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + ` +var testAccInstanceDataSourceConfig_gp2IopsDevice = acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.medium" @@ -694,7 +694,7 @@ data "aws_instance" "test" { ` // GP3ThroughputDevice -var testAccInstanceDataSourceConfig_gp3ThroughputDevice = acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + ` +var testAccInstanceDataSourceConfig_gp3ThroughputDevice = acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.medium" @@ -712,7 +712,7 @@ data "aws_instance" "test" { ` // Block Device -var testAccInstanceDataSourceConfig_blockDevices = acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + ` +var testAccInstanceDataSourceConfig_blockDevices = acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.medium" @@ -759,7 +759,7 @@ data "aws_instance" "test" { } ` -var testAccInstanceDataSourceConfig_EbsBlockDevice_KmsKeyId = acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + ` +var testAccInstanceDataSourceConfig_EbsBlockDevice_KmsKeyId = acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + ` resource "aws_kms_key" "test" { deletion_window_in_days = 7 } @@ -786,7 +786,7 @@ data "aws_instance" "test" { } ` -var testAccInstanceDataSourceConfig_RootBlockDevice_KmsKeyId = acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + ` +var testAccInstanceDataSourceConfig_RootBlockDevice_KmsKeyId = acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + ` resource "aws_kms_key" "test" { deletion_window_in_days = 7 } @@ -808,7 +808,7 @@ data "aws_instance" "test" { } ` -var testAccInstanceDataSourceConfig_rootInstanceStore = acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + ` +var testAccInstanceDataSourceConfig_rootInstanceStore = acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.medium" @@ -820,7 +820,7 @@ data "aws_instance" "test" { ` func testAccInstanceDataSourceConfig_privateIP(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), testAccInstanceVPCBasicConfig(rName), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCBasicConfig(rName), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -835,7 +835,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_secondaryPrivateIPs(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), testAccInstanceVPCBasicConfig(rName), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCBasicConfig(rName), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -850,7 +850,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_ipv6Addresses(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), testAccInstanceVPCIPv6Config(rName), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCIPv6Config(rName), fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -869,7 +869,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_keyPair(rName, publicKey string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_key_pair" "test" { key_name = %[1]q public_key = %[2]q @@ -900,7 +900,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_VPC(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), testAccInstanceVPCBasicConfig(rName), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCBasicConfig(rName), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.small" @@ -918,7 +918,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_PlacementGroup(rName string) string { - return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + testAccInstanceVPCBasicConfig(rName) + fmt.Sprintf(` + return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + testAccInstanceVPCBasicConfig(rName) + fmt.Sprintf(` resource "aws_placement_group" "test" { name = %[1]q strategy = "cluster" @@ -943,7 +943,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_SecurityGroups(rInt int) string { - return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(` + return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` resource "aws_security_group" "tf_test_foo" { name = "tf_test_foo-%d" description = "foo" @@ -970,7 +970,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_VPCSecurityGroups(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCBasicConfig(rName), testAccInstanceVPCSecurityGroupConfig(rName), ` @@ -1012,7 +1012,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfigGetUserData(rName string, getUserData bool) string { - return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + testAccInstanceVPCBasicConfig(rName) + fmt.Sprintf(` + return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + testAccInstanceVPCBasicConfig(rName) + fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -1033,7 +1033,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfigGetUserDataNoUserData(rName string, getUserData bool) string { - return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + testAccInstanceVPCBasicConfig(rName) + fmt.Sprintf(` + return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + testAccInstanceVPCBasicConfig(rName) + fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -1048,7 +1048,7 @@ data "aws_instance" "test" { } func testAccInstanceDataSourceConfig_creditSpecification(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCBasicConfig(rName), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -1068,7 +1068,7 @@ data "aws_instance" "test" { func testAccInstanceDataSourceConfig_metadataOptions(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` @@ -1096,7 +1096,7 @@ data "aws_instance" "test" { func testAccInstanceDataSourceConfig_enclaveOptions(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), acctest.AvailableEC2InstanceTypeForRegion("c5a.xlarge", "c5.xlarge"), fmt.Sprintf(` @@ -1122,7 +1122,7 @@ data "aws_instance" "test" { func testAccInstanceDataSourceConfig_blockDeviceTags(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { diff --git a/internal/service/ec2/instance_test.go b/internal/service/ec2/instance_test.go index 6d51f390371a..d3e76132e24e 100644 --- a/internal/service/ec2/instance_test.go +++ b/internal/service/ec2/instance_test.go @@ -3914,7 +3914,7 @@ func testAccAvailableAZsWavelengthZonesDefaultExcludeConfig() string { func testAccInstanceConfigInDefaultVpcBySgName(rName string) string { return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptInDefaultExclude(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` data "aws_vpc" "default" { default = true @@ -3938,7 +3938,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigInDefaultVpcBySgId(rName string) string { return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptInDefaultExclude(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` data "aws_vpc" "default" { default = true @@ -3962,7 +3962,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigInEc2Classic() string { return acctest.ConfigCompose( acctest.ConfigEC2ClassicRegionProvider(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t1.micro", "m3.medium", "m3.large", "c3.large", "r3.large"), ` resource "aws_instance" "test" { @@ -3974,7 +3974,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigBasic() string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-classic-platform.html#ec2-classic-instance-types acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro", "t1.micro", "m1.small"), ` @@ -4021,7 +4021,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigWithUserDataBase64(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -4036,7 +4036,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigWithSmallInstanceType(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -4054,7 +4054,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigUpdateInstanceType(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -4071,7 +4071,7 @@ resource "aws_instance" "test" { } func testAccInstanceGP2IopsDevice() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.medium" @@ -4085,7 +4085,7 @@ resource "aws_instance" "test" { } func testAccInstanceGP2WithIopsValue() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.medium" @@ -4115,7 +4115,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigNoAMIEphemeralDevices() string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), ` resource "aws_instance" "test" { @@ -4243,7 +4243,7 @@ func TestAccEC2Instance_gp3RootBlockDevice(t *testing.T) { } func testAccInstanceConfigGP3RootBlockDevice() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.medium" @@ -4289,7 +4289,7 @@ func testAccInstanceBlockDevicesWithDeleteOnTerminateConfig(size, delete string) delete = "null" } - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4346,7 +4346,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigSourceDestEnable(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -4359,7 +4359,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigSourceDestDisable(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -4373,7 +4373,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigDisableAPITermination(rName string, val bool) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_instance" "test" { @@ -4387,7 +4387,7 @@ resource "aws_instance" "test" { func testAccEc2InstanceConfigDedicatedInstance(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -4405,7 +4405,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigOutpost() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` data "aws_outposts_outposts" "test" {} data "aws_outposts_outpost" "test" { @@ -4442,7 +4442,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigPlacementGroup(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_placement_group" "test" { @@ -4466,7 +4466,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigIpv6ErrorConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCIPv6Config(rName), fmt.Sprintf(` resource "aws_instance" "test" { @@ -4485,7 +4485,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigIpv6Support(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCIPv6Config(rName), fmt.Sprintf(` resource "aws_instance" "test" { @@ -4503,7 +4503,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigIpv6SupportWithIpv4(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCIPv6Config(rName), fmt.Sprintf(` resource "aws_instance" "test" { @@ -4521,7 +4521,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigTags() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.small" @@ -4534,7 +4534,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigEbsBlockDeviceKmsKeyArn() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_kms_key" "test" { deletion_window_in_days = 7 } @@ -4563,7 +4563,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigRootBlockDeviceKmsKeyArn(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_kms_key" "test" { @@ -4587,7 +4587,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigBlockDeviceTagsAttachedVolumeWithTags(rName string) string { // https://github.com/hashicorp/terraform-provider-aws/issues/17074 return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"), fmt.Sprintf(` @@ -4619,7 +4619,7 @@ resource "aws_volume_attachment" "test" { func testAccInstanceConfigBlockDeviceTagsAttachedVolumeWithTagsUpdate(rName string) string { // https://github.com/hashicorp/terraform-provider-aws/issues/17074 return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"), fmt.Sprintf(` @@ -4649,7 +4649,7 @@ resource "aws_volume_attachment" "test" { } func testAccInstanceConfigBlockDeviceTagsRootTagsConflict() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4677,7 +4677,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigBlockDeviceTagsEBSTagsConflict() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4705,7 +4705,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigBlockDeviceTagsNoVolumeTags() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4743,7 +4743,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigBlockDeviceTagsEBSTags(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4776,7 +4776,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigBlockDeviceTagsEBSAndRootTags(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4814,7 +4814,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigBlockDeviceTagsEBSAndRootTagsUpdate(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4882,7 +4882,7 @@ resource "aws_instance" "test" { `) func testAccInstanceConfigBlockDeviceTagsVolumeTags() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4924,7 +4924,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigBlockDeviceTagsVolumeTagsUpdate() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -4967,7 +4967,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigTagsUpdate() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` resource "aws_instance" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.small" @@ -4980,7 +4980,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigWithoutInstanceProfile(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_iam_role" "test" { name = %[1]q @@ -5016,7 +5016,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigWithInstanceProfile(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_iam_role" "test" { name = %[1]q @@ -5058,7 +5058,7 @@ resource "aws_instance" "test" { } func testAccInstanceConfigWithInstanceProfilePath(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` data "aws_partition" "current" {} resource "aws_iam_role" "test" { @@ -5104,7 +5104,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigPrivateIP(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5118,7 +5118,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigEmptyPrivateIP(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5132,7 +5132,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigAssociatePublicIPAndPrivateIP(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5147,7 +5147,7 @@ resource "aws_instance" "test" { func testAccInstanceNetworkInstanceSecurityGroups(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), testAccInstanceVPCSecurityGroupConfig(rName), ` @@ -5170,7 +5170,7 @@ resource "aws_eip" "test" { func testAccInstanceNetworkInstanceVPCSecurityGroupIDs(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), testAccInstanceVPCSecurityGroupConfig(rName), ` @@ -5192,7 +5192,7 @@ resource "aws_eip" "test" { func testAccInstanceNetworkInstanceVPCRemoveSecurityGroupIDs(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), testAccInstanceVPCSecurityGroupConfig(rName), ` @@ -5214,7 +5214,7 @@ resource "aws_eip" "test" { func testAccInstanceConfigKeyPair(rName, publicKey string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_key_pair" "test" { key_name = %[1]q @@ -5253,7 +5253,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigForceNewAndTagsDrift(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5266,7 +5266,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigForceNewAndTagsDrift_Update(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5279,7 +5279,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigPrimaryNetworkInterface(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_network_interface" "test" { @@ -5305,7 +5305,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigPrimaryNetworkInterfaceSourceDestCheck(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_network_interface" "test" { @@ -5332,7 +5332,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigAddSecondaryNetworkInterfaceBefore(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_network_interface" "primary" { @@ -5367,7 +5367,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigAddSecondaryNetworkInterfaceAfter(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_network_interface" "primary" { @@ -5408,7 +5408,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigAddSecurityGroupBefore(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_subnet" "test2" { @@ -5468,7 +5468,7 @@ resource "aws_network_interface" "test" { func testAccInstanceConfigAddSecurityGroupAfter(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_subnet" "test2" { @@ -5529,7 +5529,7 @@ resource "aws_network_interface" "test" { func testAccInstanceConfigPublicAndPrivateSecondaryIPs(rName string, isPublic bool) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_security_group" "test" { @@ -5560,7 +5560,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigPrivateIPAndSecondaryIPs(rName, privateIP, secondaryIPs string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_security_group" "test" { @@ -5590,7 +5590,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_associatePublic_defaultPrivate(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_instance" "test" { @@ -5607,7 +5607,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_associatePublic_defaultPublic(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, true), fmt.Sprintf(` resource "aws_instance" "test" { @@ -5624,7 +5624,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_associatePublic_explicitPublic(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, true), fmt.Sprintf(` resource "aws_instance" "test" { @@ -5642,7 +5642,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_associatePublic_explicitPrivate(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, true), fmt.Sprintf(` resource "aws_instance" "test" { @@ -5660,7 +5660,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_associatePublic_overridePublic(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_instance" "test" { @@ -5678,7 +5678,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_associatePublic_overridePrivate(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, true), fmt.Sprintf(` resource "aws_instance" "test" { @@ -5713,7 +5713,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_CreditSpecification_Empty_NonBurstable(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5728,7 +5728,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_CreditSpecification_Unspecified_NonBurstable(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5741,7 +5741,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_unspecified(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5754,7 +5754,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_unspecified_t3(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5767,7 +5767,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_standardCpuCredits(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5784,7 +5784,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_standardCpuCredits_t3(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5801,7 +5801,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_unlimitedCpuCredits(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5818,7 +5818,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_unlimitedCpuCredits_t3(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5835,7 +5835,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_isNotAppliedToNonBurstable(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5852,7 +5852,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_creditSpecification_unknownCpuCredits(rName, instanceType string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), fmt.Sprintf(` resource "aws_instance" "test" { @@ -5867,7 +5867,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_UserData_Unspecified(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -5880,7 +5880,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_UserData_EmptyString(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), ` resource "aws_instance" "test" { @@ -6005,7 +6005,7 @@ resource "aws_subnet" "test" { func testAccInstanceConfigHibernation(hibernation bool) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" @@ -6041,7 +6041,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigMetadataOptions(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` @@ -6067,7 +6067,7 @@ data "aws_instance" "test" { func testAccInstanceConfigMetadataOptionsUpdated(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(rName, false), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` @@ -6092,7 +6092,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigEnclaveOptions(enabled bool) string { name := "tf-acc-instance-enclaves" return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccInstanceVPCConfig(name, false), acctest.AvailableEC2InstanceTypeForRegion("c5a.xlarge", "c5.xlarge"), fmt.Sprintf(` @@ -6135,7 +6135,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigCapacityReservationSpecification_unspecified(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { @@ -6151,7 +6151,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigCapacityReservationSpecification_preference(rName, crPreference string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { @@ -6171,7 +6171,7 @@ resource "aws_instance" "test" { func testAccInstanceConfigCapacityReservationSpecification_targetId(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { @@ -6213,7 +6213,7 @@ resource "aws_ec2_capacity_reservation" "test" { func testAccInstanceConfig_WithTemplate_Basic(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro", "t1.micro", "m1.small"), fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -6232,7 +6232,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_WithTemplate_OverrideTemplate(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegionNamed("micro", "t3.micro", "t2.micro", "t1.micro", "m1.small"), acctest.AvailableEC2InstanceTypeForRegionNamed("small", "t3.small", "t2.small", "t1.small", "m1.medium"), fmt.Sprintf(` @@ -6254,7 +6254,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_WithTemplate_SpecificVersion(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro", "t1.micro", "m1.small"), fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -6274,7 +6274,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_WithTemplate_ModifyTemplate(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.small", "t2.small", "t1.small", "m1.medium"), fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -6293,7 +6293,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_WithTemplate_UpdateVersion(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.small", "t2.small", "t1.small", "m1.medium"), fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -6315,7 +6315,7 @@ resource "aws_instance" "test" { func testAccInstanceConfig_WithTemplate_WithName(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro", "t1.micro", "m1.small"), fmt.Sprintf(` resource "aws_launch_template" "test" { diff --git a/internal/service/ec2/instances_data_source_test.go b/internal/service/ec2/instances_data_source_test.go index 4f5d1db941fa..9f4c2ca7887b 100644 --- a/internal/service/ec2/instances_data_source_test.go +++ b/internal/service/ec2/instances_data_source_test.go @@ -69,7 +69,7 @@ func TestAccEC2InstancesDataSource_instanceStateNames(t *testing.T) { func testAccInstancesDataSourceConfig_ids(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { @@ -93,7 +93,7 @@ data "aws_instances" "test" { func testAccInstancesDataSourceConfig_tags(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { @@ -120,7 +120,7 @@ data "aws_instances" "test" { func testAccInstancesDataSourceConfig_instanceStateNames(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_instance" "test" { diff --git a/internal/service/ec2/launch_template_test.go b/internal/service/ec2/launch_template_test.go index 50fe54ce1939..e52795c8325d 100644 --- a/internal/service/ec2/launch_template_test.go +++ b/internal/service/ec2/launch_template_test.go @@ -1425,7 +1425,7 @@ resource "aws_launch_template" "test" { func testAccLaunchTemplateConfig_BlockDeviceMappings_EBS(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` @@ -1462,7 +1462,7 @@ resource "aws_autoscaling_group" "test" { func testAccLaunchTemplateConfig_BlockDeviceMappings_EBS_DeleteOnTermination(rName string, deleteOnTermination bool) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` @@ -1500,7 +1500,7 @@ resource "aws_autoscaling_group" "test" { func testAccLaunchTemplateConfig_BlockDeviceMappings_EBS_GP3(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` diff --git a/internal/service/ec2/network_interface_attachment_test.go b/internal/service/ec2/network_interface_attachment_test.go index 282433e11559..ccb9e96d6142 100644 --- a/internal/service/ec2/network_interface_attachment_test.go +++ b/internal/service/ec2/network_interface_attachment_test.go @@ -41,7 +41,7 @@ func TestAccEC2NetworkInterfaceAttachment_basic(t *testing.T) { } func testAccNetworkInterfaceAttachmentConfig_basic(rInt int) string { - return acctest.ConfigLatestAmazonLinuxHVMEBSAMI() + fmt.Sprintf(` + return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` resource "aws_vpc" "foo" { cidr_block = "172.16.0.0/16" diff --git a/internal/service/ec2/network_interface_test.go b/internal/service/ec2/network_interface_test.go index c1aa7256bd4d..8fb758ca131c 100644 --- a/internal/service/ec2/network_interface_test.go +++ b/internal/service/ec2/network_interface_test.go @@ -717,7 +717,7 @@ resource "aws_network_interface" "test" { func testAccENIAttachmentConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), testAccENIIPV4BaseConfig(rName), fmt.Sprintf(` @@ -762,7 +762,7 @@ resource "aws_network_interface" "test" { func testAccENIExternalAttachmentConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), testAccENIIPV4BaseConfig(rName), fmt.Sprintf(` diff --git a/internal/service/ec2/route_data_source_test.go b/internal/service/ec2/route_data_source_test.go index 1d156f2ea8f1..789aac320eb2 100644 --- a/internal/service/ec2/route_data_source_test.go +++ b/internal/service/ec2/route_data_source_test.go @@ -194,7 +194,7 @@ func TestAccEC2RouteDataSource_gatewayVPCEndpoint(t *testing.T) { func testAccRouteBasicDataSourceConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptInDefaultExclude(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"), fmt.Sprintf(` diff --git a/internal/service/ec2/route_table_test.go b/internal/service/ec2/route_table_test.go index 391f7e151d5e..64515a253752 100644 --- a/internal/service/ec2/route_table_test.go +++ b/internal/service/ec2/route_table_test.go @@ -1476,7 +1476,7 @@ func testAccRouteTableConfigNoDestination(rName string) string { return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_route_table" "test" { vpc_id = aws_vpc.test.id diff --git a/internal/service/ec2/route_test.go b/internal/service/ec2/route_test.go index 690b15f878de..21dbc241fd11 100644 --- a/internal/service/ec2/route_test.go +++ b/internal/service/ec2/route_test.go @@ -3107,7 +3107,7 @@ resource "aws_route" "test" { func testAccRouteIPv4FlexiTargetConfig(rName, destinationCidr, targetAttribute, targetValue string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptInDefaultExclude(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"), fmt.Sprintf(` @@ -3282,7 +3282,7 @@ resource "aws_route" "test" { func testAccRouteIPv6FlexiTargetConfig(rName, destinationCidr, targetAttribute, targetValue 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(` diff --git a/internal/service/ec2/spot_fleet_request_test.go b/internal/service/ec2/spot_fleet_request_test.go index 2b49c4e221af..75b8592001e7 100644 --- a/internal/service/ec2/spot_fleet_request_test.go +++ b/internal/service/ec2/spot_fleet_request_test.go @@ -1697,7 +1697,7 @@ func testAccCheckSpotFleetRequest_IAMInstanceProfileARN(sfr *ec2.SpotFleetReques func testAccSpotFleetRequestBaseConfig(rName, publicKey string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.ConfigAvailableAZsNoOptIn(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` diff --git a/internal/service/ec2/spot_instance_request_test.go b/internal/service/ec2/spot_instance_request_test.go index 148e4e3086ac..777add05ea8c 100644 --- a/internal/service/ec2/spot_instance_request_test.go +++ b/internal/service/ec2/spot_instance_request_test.go @@ -804,7 +804,7 @@ func testAccCheckSpotInstanceRequestNotRecreated(before, after *ec2.SpotInstance func testAccSpotInstanceRequestConfig() string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), ` resource "aws_spot_instance_request" "test" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id @@ -817,7 +817,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestTags1Config(rName, tagKey1, tagValue1 string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -834,7 +834,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestTags2Config(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -852,7 +852,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestValidUntilConfig(rName string, validUntil string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -871,7 +871,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestConfig_withoutSpotPrice(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -888,7 +888,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestConfig_KeyName(rName, publicKey string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -915,7 +915,7 @@ resource "aws_key_pair" "test" { func testAccSpotInstanceRequestConfig_withLaunchGroup(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -934,7 +934,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestConfig_withBlockDuration(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -954,7 +954,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestVPCConfig(rName string) string { return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptIn(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_vpc" "test" { @@ -992,7 +992,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestConfig_SubnetAndSGAndPublicIPAddress(rName string) string { return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptIn(), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -1067,7 +1067,7 @@ resource "aws_key_pair" "test" { func testAccSpotInstanceRequestInterruptConfig(interruptionBehavior string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("c5.large", "c4.large"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { @@ -1082,7 +1082,7 @@ resource "aws_spot_instance_request" "test" { func testAccSpotInstanceRequestInterruptConfig_Deprecated(interruptionBehavior string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForRegion("c5.large", "c4.large"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { diff --git a/internal/service/ec2/traffic_mirror_session_test.go b/internal/service/ec2/traffic_mirror_session_test.go index aaa648630326..fb98c9eb1604 100644 --- a/internal/service/ec2/traffic_mirror_session_test.go +++ b/internal/service/ec2/traffic_mirror_session_test.go @@ -189,7 +189,7 @@ func testAccCheckTrafficMirrorSessionExists(name string, session *ec2.TrafficMir } func testAccTrafficMirrorSessionConfigBase(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` data "aws_availability_zones" "azs" { state = "available" diff --git a/internal/service/ec2/traffic_mirror_target_test.go b/internal/service/ec2/traffic_mirror_target_test.go index 8dc33e3f321a..29a01141dfcc 100644 --- a/internal/service/ec2/traffic_mirror_target_test.go +++ b/internal/service/ec2/traffic_mirror_target_test.go @@ -258,7 +258,7 @@ resource "aws_ec2_traffic_mirror_target" "test" { func testAccTrafficMirrorTargetConfigEni(rName, description string) string { return acctest.ConfigCompose( testAccTrafficMirrorTargetConfigBase(rName), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_instance" "src" { ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id diff --git a/internal/service/ec2/volume_attachment_test.go b/internal/service/ec2/volume_attachment_test.go index 01a3941b8a54..d0e71ca40442 100644 --- a/internal/service/ec2/volume_attachment_test.go +++ b/internal/service/ec2/volume_attachment_test.go @@ -313,7 +313,7 @@ func testAccCheckVolumeAttachmentDestroy(s *terraform.State) error { func testAccVolumeAttachmentInstanceOnlyConfigBase(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"), fmt.Sprintf(` data "aws_availability_zones" "available" { diff --git a/internal/service/elb/attachment_test.go b/internal/service/elb/attachment_test.go index 04a105b72c3e..cc8d31115871 100644 --- a/internal/service/elb/attachment_test.go +++ b/internal/service/elb/attachment_test.go @@ -113,7 +113,7 @@ func testAccAttachmentCheckInstanceCount(conf *elb.LoadBalancerDescription, expe // add one attachment func testAccAttachment1Config() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` data "aws_availability_zones" "available" { state = "available" @@ -148,7 +148,7 @@ resource "aws_elb_attachment" "foo1" { // add a second attachment func testAccAttachment2Config() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` data "aws_availability_zones" "available" { state = "available" @@ -193,7 +193,7 @@ resource "aws_elb_attachment" "foo2" { // swap attachments between resources func testAccAttachment3Config() string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), ` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` data "aws_availability_zones" "available" { state = "available" diff --git a/internal/service/globalaccelerator/endpoint_group_test.go b/internal/service/globalaccelerator/endpoint_group_test.go index e60ad8eb0e15..613d5cd4b646 100644 --- a/internal/service/globalaccelerator/endpoint_group_test.go +++ b/internal/service/globalaccelerator/endpoint_group_test.go @@ -633,7 +633,7 @@ func testAccGlobalAcceleratorEndpointGroupConfigInstanceEndpoint(rName string) s return acctest.ConfigCompose( acctest.ConfigAvailableAZsNoOptInDefaultExclude(), acctest.AvailableEC2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"), - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), testAccGlobalAcceleratorEndpointGroupConfigBaseVpc(rName), fmt.Sprintf(` resource "aws_subnet" "test" { diff --git a/internal/service/servicediscovery/instance_test.go b/internal/service/servicediscovery/instance_test.go index 61db4f37f7ac..eec351045a6c 100644 --- a/internal/service/servicediscovery/instance_test.go +++ b/internal/service/servicediscovery/instance_test.go @@ -239,7 +239,7 @@ resource "aws_service_discovery_service" "sd_register_instance" { } func testAccInstanceHTTPNamespaceConfig(rName, domainName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_instance" "test_instance" { instance_type = "t2.micro" ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id diff --git a/internal/service/ssm/association_test.go b/internal/service/ssm/association_test.go index bc3600d1952b..ac141fe83e08 100644 --- a/internal/service/ssm/association_test.go +++ b/internal/service/ssm/association_test.go @@ -609,7 +609,7 @@ resource "aws_ssm_association" "test" { } func testAccAssociationBasicWithAutomationTargetParamNameConfig(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_iam_instance_profile" "ssm_profile" { name = "ssm_profile-%[1]s" role = aws_iam_role.ssm_role.name diff --git a/internal/service/ssm/document_test.go b/internal/service/ssm/document_test.go index 927c1b26c687..c6ac7b3ff4ab 100644 --- a/internal/service/ssm/document_test.go +++ b/internal/service/ssm/document_test.go @@ -935,7 +935,7 @@ DOC } func testAccDocumentTypeAutomationConfig(rName string) string { - return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_iam_instance_profile" "ssm_profile" { name = "ssm_profile-%[1]s" role = aws_iam_role.ssm_role.name diff --git a/internal/service/ssm/parameter_test.go b/internal/service/ssm/parameter_test.go index 08a57a6f37c8..e1d76f7f9c64 100644 --- a/internal/service/ssm/parameter_test.go +++ b/internal/service/ssm/parameter_test.go @@ -743,7 +743,7 @@ resource "aws_ssm_parameter" "test" { func testAccParameterDataTypeEC2ImageConfig(rName string) string { return acctest.ConfigCompose( - acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` resource "aws_ssm_parameter" "test" { name = %[1]q