From c77827398c323b340e39fbd69d9a3ff96b14ac16 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Mon, 1 Nov 2021 16:17:49 -0400 Subject: [PATCH 1/3] Realign inconsistent launch_configuration names --- .../running-and-writing-acceptance-tests.md | 2 +- examples/asg/main.tf | 4 +- examples/asg/outputs.tf | 2 +- examples/ecs-alb/main.tf | 4 +- examples/ecs-alb/outputs.tf | 2 +- internal/provider/provider.go | 24 +-- .../service/autoscaling/attachment_test.go | 8 +- .../autoscaling/group_data_source_test.go | 6 +- internal/service/autoscaling/group_test.go | 144 +++++++++--------- .../autoscaling/groups_data_source_test.go | 16 +- .../launch_configuration_data_source_test.go | 38 ++--- .../autoscaling/launch_configuration_test.go | 74 ++++----- .../autoscaling/lifecycle_hook_test.go | 8 +- .../service/autoscaling/notification_test.go | 14 +- internal/service/autoscaling/policy_test.go | 4 +- internal/service/autoscaling/schedule_test.go | 16 +- internal/service/autoscaling/sweep.go | 4 +- .../autoscalingplans/scaling_plan_test.go | 4 +- .../codedeploy/deployment_group_test.go | 8 +- internal/service/iam/sweep.go | 2 +- ...caling_launch_configuration.html.markdown} | 6 +- .../docs/r/autoscaling_group.html.markdown | 4 +- ...caling_launch_configuration.html.markdown} | 16 +- .../docs/r/autoscaling_policy.html.markdown | 2 +- ...utoscalingplans_scaling_plan.html.markdown | 4 +- 25 files changed, 209 insertions(+), 207 deletions(-) rename website/docs/d/{launch_configuration.html.markdown => autoscaling_launch_configuration.html.markdown} (95%) rename website/docs/r/{launch_configuration.html.markdown => autoscaling_launch_configuration.html.markdown} (95%) diff --git a/docs/contributing/running-and-writing-acceptance-tests.md b/docs/contributing/running-and-writing-acceptance-tests.md index 36d1eaae8401..2c0117541ba2 100644 --- a/docs/contributing/running-and-writing-acceptance-tests.md +++ b/docs/contributing/running-and-writing-acceptance-tests.md @@ -1380,7 +1380,7 @@ func testAccLaunchConfigurationDataSourceConfig_basic(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = %[1]q image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "m1.small" diff --git a/examples/asg/main.tf b/examples/asg/main.tf index 58db7486c4c5..15c39578b6b3 100644 --- a/examples/asg/main.tf +++ b/examples/asg/main.tf @@ -39,7 +39,7 @@ resource "aws_autoscaling_group" "web-asg" { min_size = var.asg_min desired_capacity = var.asg_desired force_delete = true - launch_configuration = aws_launch_configuration.web-lc.name + launch_configuration = aws_autoscaling_launch_configuration.web-lc.name load_balancers = [aws_elb.web-elb.name] #vpc_zone_identifier = ["${split(",", var.availability_zones)}"] @@ -50,7 +50,7 @@ resource "aws_autoscaling_group" "web-asg" { } } -resource "aws_launch_configuration" "web-lc" { +resource "aws_autoscaling_launch_configuration" "web-lc" { name = "terraform-example-lc" image_id = var.aws_amis[var.aws_region] instance_type = var.instance_type diff --git a/examples/asg/outputs.tf b/examples/asg/outputs.tf index 0f5acfd9d530..e5f02f3bfd4a 100644 --- a/examples/asg/outputs.tf +++ b/examples/asg/outputs.tf @@ -3,7 +3,7 @@ output "security_group" { } output "launch_configuration" { - value = aws_launch_configuration.web-lc.id + value = aws_autoscaling_launch_configuration.web-lc.id } output "asg_name" { diff --git a/examples/ecs-alb/main.tf b/examples/ecs-alb/main.tf index c4c38a3bfe96..135f37156b27 100644 --- a/examples/ecs-alb/main.tf +++ b/examples/ecs-alb/main.tf @@ -50,7 +50,7 @@ resource "aws_autoscaling_group" "app" { min_size = var.asg_min max_size = var.asg_max desired_capacity = var.asg_desired - launch_configuration = aws_launch_configuration.app.name + launch_configuration = aws_autoscaling_launch_configuration.app.name } data "template_file" "cloud_config" { @@ -86,7 +86,7 @@ data "aws_ami" "stable_coreos" { owners = ["595879546273"] # CoreOS } -resource "aws_launch_configuration" "app" { +resource "aws_autoscaling_launch_configuration" "app" { security_groups = [ aws_security_group.instance_sg.id, ] diff --git a/examples/ecs-alb/outputs.tf b/examples/ecs-alb/outputs.tf index 980e04a41018..66906a5f0477 100644 --- a/examples/ecs-alb/outputs.tf +++ b/examples/ecs-alb/outputs.tf @@ -3,7 +3,7 @@ output "instance_security_group" { } output "launch_configuration" { - value = aws_launch_configuration.app.id + value = aws_autoscaling_launch_configuration.app.id } output "asg_name" { diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 7471764fb8fd..a5a0f748b7b3 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -353,9 +353,10 @@ func Provider() *schema.Provider { "aws_appmesh_mesh": appmesh.DataSourceMesh(), "aws_appmesh_virtual_service": appmesh.DataSourceVirtualService(), - "aws_autoscaling_group": autoscaling.DataSourceGroup(), - "aws_autoscaling_groups": autoscaling.DataSourceGroups(), - "aws_launch_configuration": autoscaling.DataSourceLaunchConfiguration(), + "aws_autoscaling_group": autoscaling.DataSourceGroup(), + "aws_autoscaling_groups": autoscaling.DataSourceGroups(), + "aws_autoscaling_launch_configuration": autoscaling.DataSourceLaunchConfiguration(), + "aws_launch_configuration": autoscaling.DataSourceLaunchConfiguration(), // backward compatible alias "aws_backup_plan": backup.DataSourcePlan(), "aws_backup_selection": backup.DataSourceSelection(), @@ -798,14 +799,15 @@ func Provider() *schema.Provider { "aws_athena_named_query": athena.ResourceNamedQuery(), "aws_athena_workgroup": athena.ResourceWorkGroup(), - "aws_autoscaling_attachment": autoscaling.ResourceAttachment(), - "aws_autoscaling_group": autoscaling.ResourceGroup(), - "aws_autoscaling_group_tag": autoscaling.ResourceGroupTag(), - "aws_autoscaling_lifecycle_hook": autoscaling.ResourceLifecycleHook(), - "aws_autoscaling_notification": autoscaling.ResourceNotification(), - "aws_autoscaling_policy": autoscaling.ResourcePolicy(), - "aws_autoscaling_schedule": autoscaling.ResourceSchedule(), - "aws_launch_configuration": autoscaling.ResourceLaunchConfiguration(), + "aws_autoscaling_attachment": autoscaling.ResourceAttachment(), + "aws_autoscaling_group": autoscaling.ResourceGroup(), + "aws_autoscaling_group_tag": autoscaling.ResourceGroupTag(), + "aws_autoscaling_lifecycle_hook": autoscaling.ResourceLifecycleHook(), + "aws_autoscaling_notification": autoscaling.ResourceNotification(), + "aws_autoscaling_policy": autoscaling.ResourcePolicy(), + "aws_autoscaling_schedule": autoscaling.ResourceSchedule(), + "aws_autoscaling_launch_configuration": autoscaling.ResourceLaunchConfiguration(), + "aws_launch_configuration": autoscaling.ResourceLaunchConfiguration(), // backward compatible alias "aws_autoscalingplans_scaling_plan": autoscalingplans.ResourceScalingPlan(), diff --git a/internal/service/autoscaling/attachment_test.go b/internal/service/autoscaling/attachment_test.go index 851223a1e443..de1f11355ec2 100644 --- a/internal/service/autoscaling/attachment_test.go +++ b/internal/service/autoscaling/attachment_test.go @@ -256,7 +256,7 @@ resource "aws_autoscaling_group" "asg" { desired_capacity = 0 health_check_grace_period = 300 force_delete = true - launch_configuration = aws_launch_configuration.as_conf.name + launch_configuration = aws_autoscaling_launch_configuration.as_conf.name tag { key = "Name" @@ -269,7 +269,7 @@ resource "aws_autoscaling_group" "asg" { } } -resource "aws_launch_configuration" "as_conf" { +resource "aws_autoscaling_launch_configuration" "as_conf" { name = "test_config_%d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -318,7 +318,7 @@ resource "aws_elb" "bar" { } } -resource "aws_launch_configuration" "as_conf" { +resource "aws_autoscaling_launch_configuration" "as_conf" { name = "test_config_%d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -332,7 +332,7 @@ resource "aws_autoscaling_group" "asg" { desired_capacity = 0 health_check_grace_period = 300 force_delete = true - launch_configuration = aws_launch_configuration.as_conf.name + launch_configuration = aws_autoscaling_launch_configuration.as_conf.name tag { key = "Name" diff --git a/internal/service/autoscaling/group_data_source_test.go b/internal/service/autoscaling/group_data_source_test.go index b4527ca5b34f..7f39bac208ff 100644 --- a/internal/service/autoscaling/group_data_source_test.go +++ b/internal/service/autoscaling/group_data_source_test.go @@ -99,7 +99,7 @@ resource "aws_autoscaling_group" "match" { health_check_type = "ELB" desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.data_source_aws_autoscaling_group_test.name + launch_configuration = aws_autoscaling_launch_configuration.data_source_aws_autoscaling_group_test.name availability_zones = [data.aws_availability_zones.available.names[0], data.aws_availability_zones.available.names[1]] } @@ -111,11 +111,11 @@ resource "aws_autoscaling_group" "no_match" { health_check_type = "ELB" desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.data_source_aws_autoscaling_group_test.name + launch_configuration = aws_autoscaling_launch_configuration.data_source_aws_autoscaling_group_test.name availability_zones = [data.aws_availability_zones.available.names[0], data.aws_availability_zones.available.names[1]] } -resource "aws_launch_configuration" "data_source_aws_autoscaling_group_test" { +resource "aws_autoscaling_launch_configuration" "data_source_aws_autoscaling_group_test" { name = "%[1]s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = data.aws_ec2_instance_type_offering.available.instance_type diff --git a/internal/service/autoscaling/group_test.go b/internal/service/autoscaling/group_test.go index 9930009401de..6f661d4d1391 100644 --- a/internal/service/autoscaling/group_test.go +++ b/internal/service/autoscaling/group_test.go @@ -62,7 +62,7 @@ func TestAccAutoScalingGroup_basic(t *testing.T) { resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "health_check_grace_period", "300"), resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "health_check_type", "ELB"), resource.TestCheckNoResourceAttr("aws_autoscaling_group.bar", "initial_lifecycle_hook.#"), - resource.TestCheckResourceAttrPair("aws_autoscaling_group.bar", "launch_configuration", "aws_launch_configuration.foobar", "name"), + resource.TestCheckResourceAttrPair("aws_autoscaling_group.bar", "launch_configuration", "aws_autoscaling_launch_configuration.foobar", "name"), resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "launch_template.#", "0"), resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "load_balancers.#", "0"), resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "max_size", "5"), @@ -102,7 +102,7 @@ func TestAccAutoScalingGroup_basic(t *testing.T) { Config: testAccGroupUpdateConfig(randName), Check: resource.ComposeTestCheckFunc( testAccCheckGroupExists("aws_autoscaling_group.bar", &group), - testAccCheckLaunchConfigurationExists("aws_launch_configuration.new", &lc), + testAccCheckLaunchConfigurationExists("aws_autoscaling_launch_configuration.new", &lc), testAccCheckAutoScalingInstanceRefreshCount(&group, 0), resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "desired_capacity", "5"), resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "termination_policies.0", "ClosestToNextInstanceHour"), @@ -1005,7 +1005,7 @@ func TestAccAutoScalingGroup_InstanceRefresh_basic(t *testing.T) { func TestAccAutoScalingGroup_InstanceRefresh_start(t *testing.T) { var group autoscaling.Group resourceName := "aws_autoscaling_group.test" - launchConfigurationName := "aws_launch_configuration.test" + launchConfigurationName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -2298,7 +2298,7 @@ func testAccGroupNameGeneratedConfig() string { acctest.ConfigAvailableAZsNoOptInDefaultExclude(), acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" } @@ -2307,7 +2307,7 @@ resource "aws_autoscaling_group" "test" { availability_zones = [data.aws_availability_zones.available.names[0]] max_size = 0 min_size = 0 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name } `) } @@ -2317,7 +2317,7 @@ func testAccGroupNamePrefixConfig(namePrefix string) string { acctest.ConfigAvailableAZsNoOptInDefaultExclude(), acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" } @@ -2327,7 +2327,7 @@ resource "aws_autoscaling_group" "test" { max_size = 0 min_size = 0 name_prefix = %[1]q - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name } `, namePrefix)) } @@ -2345,7 +2345,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2356,7 +2356,7 @@ resource "aws_autoscaling_group" "bar" { min_size = 0 desired_capacity = 0 - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } `) } @@ -2374,7 +2374,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2386,7 +2386,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 termination_policies = ["Default"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } `) } @@ -2404,7 +2404,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2416,7 +2416,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } `) } @@ -2434,7 +2434,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2455,7 +2455,7 @@ resource "aws_autoscaling_group" "bar" { force_delete = true termination_policies = ["OldestInstance", "ClosestToNextInstanceHour"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tags = [ { @@ -2491,12 +2491,12 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } -resource "aws_launch_configuration" "new" { +resource "aws_autoscaling_launch_configuration" "new" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2513,7 +2513,7 @@ resource "aws_autoscaling_group" "bar" { termination_policies = ["ClosestToNextInstanceHour"] protect_from_scale_in = true - launch_configuration = aws_launch_configuration.new.name + launch_configuration = aws_autoscaling_launch_configuration.new.name tags = [ { @@ -2601,7 +2601,7 @@ resource "aws_elb" "bar" { depends_on = [aws_internet_gateway.gw] } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" security_groups = [aws_security_group.foo.id] @@ -2623,7 +2623,7 @@ resource "aws_autoscaling_group" "bar" { wait_for_elb_capacity = 2 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name load_balancers = [aws_elb.bar.name] } `) @@ -2700,7 +2700,7 @@ resource "aws_elb" "bar" { depends_on = [aws_internet_gateway.gw] } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" security_groups = [aws_security_group.foo.id] @@ -2722,7 +2722,7 @@ resource "aws_autoscaling_group" "bar" { wait_for_elb_capacity = 2 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name target_group_arns = [aws_lb_target_group.foo.arn] } `) @@ -2757,7 +2757,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2769,7 +2769,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 max_size = 0 min_size = 0 - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } `) } @@ -2803,7 +2803,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2815,7 +2815,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 max_size = 0 min_size = 0 - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } `) } @@ -2833,7 +2833,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "c3.large" } @@ -2855,7 +2855,7 @@ resource "aws_autoscaling_group" "bar" { termination_policies = ["OldestInstance", "ClosestToNextInstanceHour"] placement_group = aws_placement_group.test.name - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -2883,7 +2883,7 @@ data "aws_iam_role" "autoscaling_service_linked_role" { name = "AWSServiceRoleForAutoScaling" } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2893,7 +2893,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 max_size = 0 min_size = 0 - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name service_linked_role_arn = data.aws_iam_role.autoscaling_service_linked_role.arn } `) @@ -2912,7 +2912,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2922,7 +2922,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 max_size = 0 min_size = 0 - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name max_instance_lifetime = "864000" } `) @@ -2941,7 +2941,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2951,7 +2951,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 max_size = 0 min_size = 0 - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name max_instance_lifetime = "604800" } `) @@ -2970,7 +2970,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -2984,7 +2984,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true termination_policies = ["OldestInstance", "ClosestToNextInstanceHour"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name enabled_metrics = ["GroupTotalInstances", "GroupPendingInstances", "GroupTerminatingInstances", @@ -3017,7 +3017,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -3031,7 +3031,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true termination_policies = ["OldestInstance", "ClosestToNextInstanceHour"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name enabled_metrics = ["GroupTotalInstances", "GroupPendingInstances", "GroupTerminatingInstances", @@ -3091,7 +3091,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" enable_monitoring = false @@ -3110,7 +3110,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } resource "aws_security_group" "tf_test_self" { @@ -3180,7 +3180,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" enable_monitoring = false @@ -3201,7 +3201,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } resource "aws_security_group" "tf_test_self" { @@ -3278,7 +3278,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" enable_monitoring = false @@ -3302,7 +3302,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } resource "aws_security_group" "tf_test_self" { @@ -3396,7 +3396,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -3411,7 +3411,7 @@ resource "aws_autoscaling_group" "bar" { force_delete = true termination_policies = ["OldestInstance", "ClosestToNextInstanceHour"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name initial_lifecycle_hook { name = "launching" @@ -3527,7 +3527,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" associate_public_ip_address = "true" @@ -3557,7 +3557,7 @@ resource "aws_autoscaling_group" "bar" { wait_for_elb_capacity = 2 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } `, rInt) } @@ -3575,7 +3575,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -3595,7 +3595,7 @@ resource "aws_autoscaling_group" "bar" { force_delete = true termination_policies = ["OldestInstance", "ClosestToNextInstanceHour"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name suspended_processes = ["AlarmNotification", "ScheduledActions"] @@ -3621,7 +3621,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -3641,7 +3641,7 @@ resource "aws_autoscaling_group" "bar" { force_delete = true termination_policies = ["OldestInstance", "ClosestToNextInstanceHour"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name suspended_processes = ["AZRebalance", "ScheduledActions"] @@ -3662,7 +3662,7 @@ resource "aws_autoscaling_group" "test" { max_size = 0 availability_zones = [data.aws_availability_zones.available.names[0]] - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name } data "aws_ami" "test_ami" { @@ -3675,7 +3675,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test_ami.id instance_type = "t1.micro" } @@ -3733,7 +3733,7 @@ resource "aws_launch_template" "foobar" { instance_type = "t2.micro" } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -3743,7 +3743,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 max_size = 0 min_size = 0 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name } `) } @@ -3767,7 +3767,7 @@ resource "aws_launch_template" "foobar" { instance_type = "t2.micro" } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -3809,7 +3809,7 @@ resource "aws_launch_template" "foobar" { instance_type = "t2.micro" } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test_ami.id instance_type = "t2.micro" } @@ -4441,7 +4441,7 @@ resource "aws_autoscaling_group" "test" { max_size = 2 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name instance_refresh { strategy = "Rolling" @@ -4467,7 +4467,7 @@ data "aws_availability_zones" "current" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test.id instance_type = "t3.nano" } @@ -4481,7 +4481,7 @@ resource "aws_autoscaling_group" "test" { max_size = 2 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name instance_refresh { strategy = "Rolling" @@ -4513,7 +4513,7 @@ data "aws_availability_zones" "current" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test.id instance_type = "t3.nano" } @@ -4527,7 +4527,7 @@ resource "aws_autoscaling_group" "test" { max_size = 2 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name } data "aws_ami" "test" { @@ -4549,7 +4549,7 @@ data "aws_availability_zones" "current" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test.id instance_type = "t3.nano" } @@ -4563,7 +4563,7 @@ resource "aws_autoscaling_group" "test" { max_size = 2 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name instance_refresh { strategy = "Rolling" @@ -4589,7 +4589,7 @@ data "aws_availability_zones" "current" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name_prefix = %[1]q image_id = data.aws_ami.test.id instance_type = "t3.nano" @@ -4608,7 +4608,7 @@ resource "aws_autoscaling_group" "test" { max_size = 2 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name instance_refresh { strategy = "Rolling" @@ -4641,7 +4641,7 @@ data "aws_availability_zones" "current" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test.id instance_type = "t3.nano" } @@ -4669,7 +4669,7 @@ data "aws_availability_zones" "current" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.test.id instance_type = "t3.nano" } @@ -4683,7 +4683,7 @@ resource "aws_autoscaling_group" "test" { max_size = 5 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name warm_pool {} } @@ -4697,7 +4697,7 @@ resource "aws_autoscaling_group" "test" { max_size = 5 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name warm_pool { pool_state = "Stopped" @@ -4715,7 +4715,7 @@ resource "aws_autoscaling_group" "test" { max_size = 5 min_size = 1 desired_capacity = 1 - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name } ` } diff --git a/internal/service/autoscaling/groups_data_source_test.go b/internal/service/autoscaling/groups_data_source_test.go index 269c5c86f010..18b3484c3044 100644 --- a/internal/service/autoscaling/groups_data_source_test.go +++ b/internal/service/autoscaling/groups_data_source_test.go @@ -95,7 +95,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t1.micro" } @@ -109,7 +109,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -127,7 +127,7 @@ resource "aws_autoscaling_group" "foo" { desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -145,7 +145,7 @@ resource "aws_autoscaling_group" "barbaz" { desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -168,7 +168,7 @@ data "aws_ami" "test_ami" { } } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.test_ami.id instance_type = "t1.micro" } @@ -182,7 +182,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -200,7 +200,7 @@ resource "aws_autoscaling_group" "foo" { desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -218,7 +218,7 @@ resource "aws_autoscaling_group" "barbaz" { desired_capacity = 0 force_delete = true - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" diff --git a/internal/service/autoscaling/launch_configuration_data_source_test.go b/internal/service/autoscaling/launch_configuration_data_source_test.go index 9ceb9ed5e596..3db828ec6e1d 100644 --- a/internal/service/autoscaling/launch_configuration_data_source_test.go +++ b/internal/service/autoscaling/launch_configuration_data_source_test.go @@ -12,8 +12,8 @@ import ( ) func TestAccAutoScalingLaunchConfigurationDataSource_basic(t *testing.T) { - resourceName := "aws_launch_configuration.test" - datasourceName := "data.aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" + datasourceName := "data.aws_autoscaling_launch_configuration.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -42,7 +42,7 @@ func TestAccAutoScalingLaunchConfigurationDataSource_basic(t *testing.T) { func TestAccAutoScalingLaunchConfigurationDataSource_securityGroups(t *testing.T) { rInt := sdkacctest.RandInt() - rName := "data.aws_launch_configuration.foo" + rName := "data.aws_autoscaling_launch_configuration.foo" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -60,8 +60,8 @@ func TestAccAutoScalingLaunchConfigurationDataSource_securityGroups(t *testing.T } func TestAccAutoScalingLaunchConfigurationDataSource_ebsNoDevice(t *testing.T) { - resourceName := "aws_launch_configuration.test" - datasourceName := "data.aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" + datasourceName := "data.aws_autoscaling_launch_configuration.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -84,8 +84,8 @@ func TestAccAutoScalingLaunchConfigurationDataSource_ebsNoDevice(t *testing.T) { func TestAccAutoScalingLaunchConfigurationDataSource_metadataOptions(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - dataSourceName := "data.aws_launch_configuration.test" - resourceName := "aws_launch_configuration.test" + dataSourceName := "data.aws_autoscaling_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -108,7 +108,7 @@ func TestAccAutoScalingLaunchConfigurationDataSource_metadataOptions(t *testing. func testAccLaunchConfigurationDataSourceConfig_basic(rName string) string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = %[1]q image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "m1.small" @@ -138,8 +138,8 @@ resource "aws_launch_configuration" "test" { } } -data "aws_launch_configuration" "test" { - name = aws_launch_configuration.test.name +data "aws_autoscaling_launch_configuration" "test" { + name = aws_autoscaling_launch_configuration.test.name } `, rName)) } @@ -155,15 +155,15 @@ resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = "terraform-test-%d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "m1.small" security_groups = [aws_security_group.test.id] } -data "aws_launch_configuration" "foo" { - name = aws_launch_configuration.test.name +data "aws_autoscaling_launch_configuration" "foo" { + name = aws_autoscaling_launch_configuration.test.name } `, rInt, rInt) } @@ -172,7 +172,7 @@ func testAccLaunchConfigurationDataSourceConfig_metadataOptions(rName string) st return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.nano" name = %[1]q @@ -183,8 +183,8 @@ resource "aws_launch_configuration" "test" { } } -data "aws_launch_configuration" "test" { - name = aws_launch_configuration.test.name +data "aws_autoscaling_launch_configuration" "test" { + name = aws_autoscaling_launch_configuration.test.name } `, rName)) } @@ -193,7 +193,7 @@ func testAccLaunchConfigurationDataSourceConfigEbsNoDevice(rName string) string return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = %[1]q image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "m1.small" @@ -204,8 +204,8 @@ resource "aws_launch_configuration" "test" { } } -data "aws_launch_configuration" "test" { - name = aws_launch_configuration.test.name +data "aws_autoscaling_launch_configuration" "test" { + name = aws_autoscaling_launch_configuration.test.name } `, rName)) } diff --git a/internal/service/autoscaling/launch_configuration_test.go b/internal/service/autoscaling/launch_configuration_test.go index 5317db845159..32e656f14d3b 100644 --- a/internal/service/autoscaling/launch_configuration_test.go +++ b/internal/service/autoscaling/launch_configuration_test.go @@ -23,7 +23,7 @@ import ( func TestAccAutoScalingLaunchConfiguration_basic(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -50,7 +50,7 @@ func TestAccAutoScalingLaunchConfiguration_basic(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_Name_generated(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -78,7 +78,7 @@ func TestAccAutoScalingLaunchConfiguration_Name_generated(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_namePrefix(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -106,7 +106,7 @@ func TestAccAutoScalingLaunchConfiguration_namePrefix(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_withBlockDevices(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -138,7 +138,7 @@ func TestAccAutoScalingLaunchConfiguration_withBlockDevices(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_withInstanceStoreAMI(t *testing.T) { var conf autoscaling.LaunchConfiguration rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -166,7 +166,7 @@ func TestAccAutoScalingLaunchConfiguration_RootBlockDevice_amiDisappears(t *test var ami ec2.Image var conf autoscaling.LaunchConfiguration amiCopyResourceName := "aws_ami_copy.test" - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -196,7 +196,7 @@ func TestAccAutoScalingLaunchConfiguration_RootBlockDevice_amiDisappears(t *test func TestAccAutoScalingLaunchConfiguration_RootBlockDevice_volumeSize(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -232,7 +232,7 @@ func TestAccAutoScalingLaunchConfiguration_RootBlockDevice_volumeSize(t *testing func TestAccAutoScalingLaunchConfiguration_encryptedRootBlockDevice(t *testing.T) { var conf autoscaling.LaunchConfiguration rInt := sdkacctest.RandInt() - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -259,7 +259,7 @@ func TestAccAutoScalingLaunchConfiguration_encryptedRootBlockDevice(t *testing.T func TestAccAutoScalingLaunchConfiguration_withSpotPrice(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -289,7 +289,7 @@ func TestAccAutoScalingLaunchConfiguration_withVPCClassicLink(t *testing.T) { var group ec2.SecurityGroup var conf autoscaling.LaunchConfiguration rInt := sdkacctest.RandInt() - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckEC2Classic(t) }, @@ -317,7 +317,7 @@ func TestAccAutoScalingLaunchConfiguration_withVPCClassicLink(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_withIAMProfile(t *testing.T) { var conf autoscaling.LaunchConfiguration rInt := sdkacctest.RandInt() - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -343,7 +343,7 @@ func TestAccAutoScalingLaunchConfiguration_withIAMProfile(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_withEncryption(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -354,7 +354,7 @@ func TestAccAutoScalingLaunchConfiguration_withEncryption(t *testing.T) { { Config: testAccLaunchConfigurationWithEncryption(), Check: resource.ComposeTestCheckFunc( - testAccCheckLaunchConfigurationExists("aws_launch_configuration.test", &conf), + testAccCheckLaunchConfigurationExists("aws_autoscaling_launch_configuration.test", &conf), testAccCheckLaunchConfigurationWithEncryption(&conf), ), }, @@ -370,7 +370,7 @@ func TestAccAutoScalingLaunchConfiguration_withEncryption(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_withGP3(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -381,7 +381,7 @@ func TestAccAutoScalingLaunchConfiguration_withGP3(t *testing.T) { { Config: testAccLaunchConfigurationWithGP3(), Check: resource.ComposeTestCheckFunc( - testAccCheckLaunchConfigurationExists("aws_launch_configuration.test", &conf), + testAccCheckLaunchConfigurationExists("aws_autoscaling_launch_configuration.test", &conf), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "ebs_block_device.*", map[string]string{ "volume_type": "gp3", }), @@ -402,7 +402,7 @@ func TestAccAutoScalingLaunchConfiguration_withGP3(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_updateEBSBlockDevices(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -441,7 +441,7 @@ func TestAccAutoScalingLaunchConfiguration_updateEBSBlockDevices(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_metadataOptions(t *testing.T) { var conf autoscaling.LaunchConfiguration rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -471,7 +471,7 @@ func TestAccAutoScalingLaunchConfiguration_metadataOptions(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_EBS_noDevice(t *testing.T) { var conf autoscaling.LaunchConfiguration rInt := sdkacctest.RandInt() - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -502,7 +502,7 @@ func TestAccAutoScalingLaunchConfiguration_EBS_noDevice(t *testing.T) { func TestAccAutoScalingLaunchConfiguration_userData(t *testing.T) { var conf autoscaling.LaunchConfiguration - resourceName := "aws_launch_configuration.test" + resourceName := "aws_autoscaling_launch_configuration.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, @@ -564,7 +564,7 @@ func testAccCheckLaunchConfigurationDestroy(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).AutoScalingConn for _, rs := range s.RootModule().Resources { - if rs.Type != "aws_launch_configuration" { + if rs.Type != "aws_autoscaling_launch_configuration" { continue } @@ -686,7 +686,7 @@ data "aws_ami" "amzn-ami-minimal-pv-instance-store" { func testAccLaunchConfigurationWithInstanceStoreAMIConfig(rName string) string { return acctest.ConfigCompose(testAccLatestAmazonLinuxPVInstanceStoreAMIConfig(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = %[1]q image_id = data.aws_ami.amzn-ami-minimal-pv-instance-store.id @@ -706,7 +706,7 @@ resource "aws_ami_copy" "test" { source_ami_region = data.aws_region.current.name } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = %[1]q image_id = aws_ami_copy.test.id instance_type = "t3.micro" @@ -720,7 +720,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationWithRootBlockDeviceVolumeSizeConfig(rName string, volumeSize int) string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = %[1]q image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.micro" @@ -755,7 +755,7 @@ resource "aws_subnet" "test" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name_prefix = "tf-acc-test-%[1]d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.nano" @@ -775,7 +775,7 @@ func testAccLaunchConfigurationMetadataOptionsConfig(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t3.nano" name = %[1]q @@ -790,7 +790,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationConfig() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = "tf-acc-test-%d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "m1.small" @@ -824,7 +824,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationWithSpotPriceConfig() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = "tf-acc-test-%d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -835,7 +835,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationNameGeneratedConfig() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" } @@ -844,7 +844,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationNamePrefixConfig(namePrefix string) string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name_prefix = %[1]q image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -854,7 +854,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationWithEncryption() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" associate_public_ip_address = false @@ -875,7 +875,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationWithGP3() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" associate_public_ip_address = false @@ -898,7 +898,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationWithEncryptionUpdated() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" associate_public_ip_address = false @@ -933,7 +933,7 @@ resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = "tf-acc-test-%[1]d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -971,7 +971,7 @@ resource "aws_iam_instance_profile" "profile" { role = aws_iam_role.role.name } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.nano" iam_instance_profile = aws_iam_instance_profile.profile.name @@ -981,7 +981,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationEBSNoDeviceConfig(rInt int) string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name_prefix = "tf-acc-test-%d" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "m1.small" @@ -996,7 +996,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationConfig_userData() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" user_data = "foo:-with-character's" @@ -1007,7 +1007,7 @@ resource "aws_launch_configuration" "test" { func testAccLaunchConfigurationConfig_userDataBase64() string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHvmEbsAmi(), ` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" user_data_base64 = base64encode("hello world") diff --git a/internal/service/autoscaling/lifecycle_hook_test.go b/internal/service/autoscaling/lifecycle_hook_test.go index a85d18fa88cb..596f3facf13e 100644 --- a/internal/service/autoscaling/lifecycle_hook_test.go +++ b/internal/service/autoscaling/lifecycle_hook_test.go @@ -130,7 +130,7 @@ func testAccLifecycleHookImportStateIdFunc(resourceName string) resource.ImportS func testAccLifecycleHookConfig(name string) string { return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -199,7 +199,7 @@ resource "aws_autoscaling_group" "foobar" { health_check_type = "ELB" force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -229,7 +229,7 @@ EOF func testAccLifecycleHookConfig_omitDefaultResult(name string, rInt int) string { return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -298,7 +298,7 @@ resource "aws_autoscaling_group" "foobar" { health_check_type = "ELB" force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" diff --git a/internal/service/autoscaling/notification_test.go b/internal/service/autoscaling/notification_test.go index 7545561bb1ad..d9e5e49adace 100644 --- a/internal/service/autoscaling/notification_test.go +++ b/internal/service/autoscaling/notification_test.go @@ -223,7 +223,7 @@ resource "aws_sns_topic" "topic_example" { name = "user-updates-topic-%s" } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "foobarautoscaling-terraform-test-%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -248,7 +248,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 1 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } resource "aws_autoscaling_notification" "example" { @@ -270,7 +270,7 @@ resource "aws_sns_topic" "topic_example" { name = "user-updates-topic-%s" } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "foobarautoscaling-terraform-test-%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" @@ -295,7 +295,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 1 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } resource "aws_autoscaling_group" "foo" { @@ -308,7 +308,7 @@ resource "aws_autoscaling_group" "foo" { desired_capacity = 1 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } resource "aws_autoscaling_notification" "example" { @@ -334,7 +334,7 @@ resource "aws_sns_topic" "user_updates" { name = "user-updates-topic" } -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" } @@ -359,7 +359,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 0 force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name } resource "aws_autoscaling_notification" "example" { diff --git a/internal/service/autoscaling/policy_test.go b/internal/service/autoscaling/policy_test.go index 98e702974010..da9d09a13beb 100644 --- a/internal/service/autoscaling/policy_test.go +++ b/internal/service/autoscaling/policy_test.go @@ -504,7 +504,7 @@ data "aws_availability_zones" "available" { } } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { name = "%s" image_id = data.aws_ami.amzn.id instance_type = "t2.micro" @@ -516,7 +516,7 @@ resource "aws_autoscaling_group" "test" { max_size = 0 min_size = 0 force_delete = true - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name } `, name, name) } diff --git a/internal/service/autoscaling/schedule_test.go b/internal/service/autoscaling/schedule_test.go index 0b71f0c1f645..38b9f19ec124 100644 --- a/internal/service/autoscaling/schedule_test.go +++ b/internal/service/autoscaling/schedule_test.go @@ -276,7 +276,7 @@ func testAccCheckScalingScheduleHasNoDesiredCapacity( func testAccScheduleConfig(r, start, end string) string { return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -300,7 +300,7 @@ resource "aws_autoscaling_group" "foobar" { health_check_type = "ELB" force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -323,7 +323,7 @@ resource "aws_autoscaling_schedule" "foobar" { func testAccScheduleConfig_recurrence(r string) string { return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -347,7 +347,7 @@ resource "aws_autoscaling_group" "foobar" { health_check_type = "ELB" force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -370,7 +370,7 @@ resource "aws_autoscaling_schedule" "foobar" { func testAccScheduleConfig_zeroValues(r, start, end string) string { return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -394,7 +394,7 @@ resource "aws_autoscaling_group" "foobar" { health_check_type = "ELB" force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" @@ -417,7 +417,7 @@ resource "aws_autoscaling_schedule" "foobar" { func testAccScheduleConfig_negativeOne(r, start, end string) string { return acctest.ConfigLatestAmazonLinuxHvmEbsAmi() + fmt.Sprintf(` -resource "aws_launch_configuration" "foobar" { +resource "aws_autoscaling_launch_configuration" "foobar" { name = "%s" image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t1.micro" @@ -441,7 +441,7 @@ resource "aws_autoscaling_group" "foobar" { health_check_type = "ELB" force_delete = true termination_policies = ["OldestInstance"] - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name tag { key = "Foo" diff --git a/internal/service/autoscaling/sweep.go b/internal/service/autoscaling/sweep.go index de2f1f74f84b..55d3f6d302fb 100644 --- a/internal/service/autoscaling/sweep.go +++ b/internal/service/autoscaling/sweep.go @@ -23,8 +23,8 @@ func init() { F: sweepGroups, }) - resource.AddTestSweepers("aws_launch_configuration", &resource.Sweeper{ - Name: "aws_launch_configuration", + resource.AddTestSweepers("aws_autoscaling_launch_configuration", &resource.Sweeper{ + Name: "aws_autoscaling_launch_configuration", Dependencies: []string{"aws_autoscaling_group"}, F: sweepLaunchConfigurations, }) diff --git a/internal/service/autoscalingplans/scaling_plan_test.go b/internal/service/autoscalingplans/scaling_plan_test.go index 791497ffe337..3d3b22d953e8 100644 --- a/internal/service/autoscalingplans/scaling_plan_test.go +++ b/internal/service/autoscalingplans/scaling_plan_test.go @@ -441,7 +441,7 @@ func testAccAutoScalingPlansScalingPlanConfigBase(rName, tagName string) string acctest.ConfigAvailableAZsNoOptInDefaultExclude(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = data.aws_ec2_instance_type_offering.available.instance_type } @@ -449,7 +449,7 @@ resource "aws_launch_configuration" "test" { resource "aws_autoscaling_group" "test" { name = %[1]q - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name availability_zones = [data.aws_availability_zones.available.names[0]] min_size = 0 diff --git a/internal/service/codedeploy/deployment_group_test.go b/internal/service/codedeploy/deployment_group_test.go index db2b9dabd7e3..8c59694f1515 100644 --- a/internal/service/codedeploy/deployment_group_test.go +++ b/internal/service/codedeploy/deployment_group_test.go @@ -3062,7 +3062,7 @@ data "aws_subnet" "test" { default_for_az = "true" } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" name_prefix = "tf-acc-test-codedeploy-deployment-group-" @@ -3080,7 +3080,7 @@ resource "aws_autoscaling_group" "test" { vpc_zone_identifier = [data.aws_subnet.test.id] - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name lifecycle { create_before_destroy = true @@ -3154,7 +3154,7 @@ data "aws_subnet" "test" { default_for_az = "true" } -resource "aws_launch_configuration" "test" { +resource "aws_autoscaling_launch_configuration" "test" { image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id instance_type = "t2.micro" name_prefix = "tf-acc-test-codedeploy-deployment-group-" @@ -3172,7 +3172,7 @@ resource "aws_autoscaling_group" "test" { vpc_zone_identifier = [data.aws_subnet.test.id] - launch_configuration = aws_launch_configuration.test.name + launch_configuration = aws_autoscaling_launch_configuration.test.name lifecycle { create_before_destroy = true diff --git a/internal/service/iam/sweep.go b/internal/service/iam/sweep.go index 88411458766f..333e8623582e 100644 --- a/internal/service/iam/sweep.go +++ b/internal/service/iam/sweep.go @@ -68,7 +68,7 @@ func init() { "aws_glue_job", "aws_instance", "aws_lambda_function", - "aws_launch_configuration", + "aws_autoscaling_launch_configuration", "aws_redshift_cluster", "aws_redshift_scheduled_action", "aws_spot_fleet_request", diff --git a/website/docs/d/launch_configuration.html.markdown b/website/docs/d/autoscaling_launch_configuration.html.markdown similarity index 95% rename from website/docs/d/launch_configuration.html.markdown rename to website/docs/d/autoscaling_launch_configuration.html.markdown index 33c7ea4dd732..69ff7c6d410a 100644 --- a/website/docs/d/launch_configuration.html.markdown +++ b/website/docs/d/autoscaling_launch_configuration.html.markdown @@ -1,19 +1,19 @@ --- subcategory: "Autoscaling" layout: "aws" -page_title: "AWS: aws_launch_configuration" +page_title: "AWS: aws_autoscaling_launch_configuration" description: |- Provides a Launch Configuration data source. --- -# Data Source: aws_launch_configuration +# Data Source: aws_autoscaling_launch_configuration Provides information about a Launch Configuration. ## Example Usage ```terraform -data "aws_launch_configuration" "ubuntu" { +data "aws_autoscaling_launch_configuration" "ubuntu" { name = "test-launch-config" } ``` diff --git a/website/docs/r/autoscaling_group.html.markdown b/website/docs/r/autoscaling_group.html.markdown index 16b986a16525..e7127edfd878 100644 --- a/website/docs/r/autoscaling_group.html.markdown +++ b/website/docs/r/autoscaling_group.html.markdown @@ -38,7 +38,7 @@ resource "aws_autoscaling_group" "bar" { desired_capacity = 4 force_delete = true placement_group = aws_placement_group.test.id - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name vpc_zone_identifier = [aws_subnet.example1.id, aws_subnet.example2.id] initial_lifecycle_hook { @@ -241,7 +241,7 @@ resource "aws_autoscaling_group" "bar" { name = "foobar3-terraform-test" max_size = 5 min_size = 2 - launch_configuration = aws_launch_configuration.foobar.name + launch_configuration = aws_autoscaling_launch_configuration.foobar.name vpc_zone_identifier = [aws_subnet.example1.id, aws_subnet.example2.id] tags = concat( diff --git a/website/docs/r/launch_configuration.html.markdown b/website/docs/r/autoscaling_launch_configuration.html.markdown similarity index 95% rename from website/docs/r/launch_configuration.html.markdown rename to website/docs/r/autoscaling_launch_configuration.html.markdown index 163ea5922c07..35babf7bd5b8 100644 --- a/website/docs/r/launch_configuration.html.markdown +++ b/website/docs/r/autoscaling_launch_configuration.html.markdown @@ -1,12 +1,12 @@ --- subcategory: "Autoscaling" layout: "aws" -page_title: "AWS: aws_launch_configuration" +page_title: "AWS: aws_autoscaling_launch_configuration" description: |- Provides a resource to create a new launch configuration, used for autoscaling groups. --- -# Resource: aws_launch_configuration +# Resource: aws_autoscaling_launch_configuration Provides a resource to create a new launch configuration, used for autoscaling groups. @@ -29,7 +29,7 @@ data "aws_ami" "ubuntu" { owners = ["099720109477"] # Canonical } -resource "aws_launch_configuration" "as_conf" { +resource "aws_autoscaling_launch_configuration" "as_conf" { name = "web_config" image_id = data.aws_ami.ubuntu.id instance_type = "t2.micro" @@ -63,7 +63,7 @@ data "aws_ami" "ubuntu" { owners = ["099720109477"] # Canonical } -resource "aws_launch_configuration" "as_conf" { +resource "aws_autoscaling_launch_configuration" "as_conf" { name_prefix = "terraform-lc-example-" image_id = data.aws_ami.ubuntu.id instance_type = "t2.micro" @@ -75,7 +75,7 @@ resource "aws_launch_configuration" "as_conf" { resource "aws_autoscaling_group" "bar" { name = "terraform-asg-example" - launch_configuration = aws_launch_configuration.as_conf.name + launch_configuration = aws_autoscaling_launch_configuration.as_conf.name min_size = 1 max_size = 2 @@ -115,7 +115,7 @@ data "aws_ami" "ubuntu" { owners = ["099720109477"] # Canonical } -resource "aws_launch_configuration" "as_conf" { +resource "aws_autoscaling_launch_configuration" "as_conf" { image_id = data.aws_ami.ubuntu.id instance_type = "m4.large" spot_price = "0.001" @@ -127,7 +127,7 @@ resource "aws_launch_configuration" "as_conf" { resource "aws_autoscaling_group" "bar" { name = "terraform-asg-example" - launch_configuration = aws_launch_configuration.as_conf.name + launch_configuration = aws_autoscaling_launch_configuration.as_conf.name } ``` @@ -243,5 +243,5 @@ In addition to all arguments above, the following attributes are exported: Launch configurations can be imported using the `name`, e.g., ``` -$ terraform import aws_launch_configuration.as_conf terraform-lg-123456 +$ terraform import aws_autoscaling_launch_configuration.as_conf terraform-lg-123456 ``` diff --git a/website/docs/r/autoscaling_policy.html.markdown b/website/docs/r/autoscaling_policy.html.markdown index d4098a50075f..d7d069d0fb16 100644 --- a/website/docs/r/autoscaling_policy.html.markdown +++ b/website/docs/r/autoscaling_policy.html.markdown @@ -35,7 +35,7 @@ resource "aws_autoscaling_group" "bar" { health_check_grace_period = 300 health_check_type = "ELB" force_delete = true - launch_configuration = aws_launch_configuration.foo.name + launch_configuration = aws_autoscaling_launch_configuration.foo.name } ``` diff --git a/website/docs/r/autoscalingplans_scaling_plan.html.markdown b/website/docs/r/autoscalingplans_scaling_plan.html.markdown index bd55cb5544e4..e3d466a16daa 100644 --- a/website/docs/r/autoscalingplans_scaling_plan.html.markdown +++ b/website/docs/r/autoscalingplans_scaling_plan.html.markdown @@ -25,7 +25,7 @@ data "aws_availability_zones" "available" {} resource "aws_autoscaling_group" "example" { name_prefix = "example" - launch_configuration = aws_launch_configuration.example.name + launch_configuration = aws_autoscaling_launch_configuration.example.name availability_zones = [data.aws_availability_zones.available.names[0]] min_size = 0 @@ -76,7 +76,7 @@ data "aws_availability_zones" "available" {} resource "aws_autoscaling_group" "example" { name_prefix = "example" - launch_configuration = aws_launch_configuration.example.name + launch_configuration = aws_autoscaling_launch_configuration.example.name availability_zones = [data.aws_availability_zones.available.names[0]] min_size = 0 From 2e584cd1da424c60f6eaf23b153094f85475e191 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Mon, 1 Nov 2021 16:19:42 -0400 Subject: [PATCH 2/3] Add changelog --- .changelog/21571.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/21571.txt diff --git a/.changelog/21571.txt b/.changelog/21571.txt new file mode 100644 index 000000000000..5298d23147a6 --- /dev/null +++ b/.changelog/21571.txt @@ -0,0 +1,7 @@ +```release-note:enhancement + data-source/aws_launch_configuration: Rename data source to aws_autoscaling_launch_configuration (with alias for aws_launch_configuration) + ``` + + ```release-note:enhancement +resource/aws_launch_configuration: Rename resource to aws_autoscaling_launch_configuration (with alias for aws_launch_configuration) + ``` \ No newline at end of file From b23f2eff34c4902b347f2835de85407ed544339a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 2 Nov 2021 14:46:40 -0400 Subject: [PATCH 3/3] Ignore docs for aliases --- .github/workflows/terraform_provider.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index cbaa27418556..2d126db21287 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -311,8 +311,8 @@ jobs: tfproviderdocs check \ -allowed-resource-subcategories-file website/allowed-subcategories.txt \ -enable-contents-check \ - -ignore-file-missing-data-sources aws_alb,aws_alb_listener,aws_alb_target_group \ - -ignore-file-missing-resources aws_alb,aws_alb_listener,aws_alb_listener_certificate,aws_alb_listener_rule,aws_alb_target_group,aws_alb_target_group_attachment \ + -ignore-file-missing-data-sources aws_alb,aws_alb_listener,aws_alb_target_group,aws_launch_configuration \ + -ignore-file-missing-resources aws_alb,aws_alb_listener,aws_alb_listener_certificate,aws_alb_listener_rule,aws_alb_target_group,aws_alb_target_group_attachment,aws_launch_configuration \ -provider-source registry.terraform.io/hashicorp/aws \ -providers-schema-json terraform-providers-schema/schema.json \ -require-resource-subcategory