Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Realign inconsistent launch_configuration names #21571

Closed
wants to merge 3 commits into from
Closed

Realign inconsistent launch_configuration names #21571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c778273
Realign inconsistent launch_configuration names
YakDriver Nov 1, 2021
2e584cd
Add changelog
YakDriver Nov 1, 2021
b23f2ef
Ignore docs for aliases
YakDriver Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/21571.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
```
4 changes: 2 additions & 2 deletions .github/workflows/terraform_provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/contributing/running-and-writing-acceptance-tests.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions examples/asg/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}"]
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/asg/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions examples/ecs-alb/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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,
]
Expand Down
2 changes: 1 addition & 1 deletion examples/ecs-alb/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
24 changes: 13 additions & 11 deletions internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),

Expand Down
8 changes: 4 additions & 4 deletions internal/service/autoscaling/attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions internal/service/autoscaling/group_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
}

Expand All @@ -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
Expand Down
Loading