Skip to content

Commit 6c50885

Browse files
YakDriverYakDriver
authored
Merge pull request #30828 from hashicorp/b-autoscaling-attachment-remove-alb
autoscaling/attachment: Remove alb_target_group_arn
2 parents 34aaf87 + bbbbf29 commit 6c50885

File tree

4 files changed

+19
-48
lines changed

4 files changed

+19
-48
lines changed

‎.changelog/30828.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:breaking-change
2+
resource/aws_autoscaling_attachment: `alb_target_group_arn` has been removed -- use `lb_target_group_arn` instead
3+
```
4+
5+
```release-note:note
6+
resource/aws_autoscaling_attachment: Update configurations to use `lb_target_group_arn` instead of `alb_target_group_arn` which has been removed
7+
```

‎internal/service/autoscaling/attachment.go

+8-36
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ func ResourceAttachment() *schema.Resource {
2424
DeleteWithoutTimeout: resourceAttachmentDelete,
2525

2626
Schema: map[string]*schema.Schema{
27-
"alb_target_group_arn": {
28-
Type: schema.TypeString,
29-
ForceNew: true,
30-
Optional: true,
31-
Deprecated: "Use lb_target_group_arn instead",
32-
ExactlyOneOf: []string{"alb_target_group_arn", "elb", "lb_target_group_arn"},
33-
},
3427
"autoscaling_group_name": {
3528
Type: schema.TypeString,
3629
ForceNew: true,
@@ -40,13 +33,13 @@ func ResourceAttachment() *schema.Resource {
4033
Type: schema.TypeString,
4134
ForceNew: true,
4235
Optional: true,
43-
ExactlyOneOf: []string{"alb_target_group_arn", "elb", "lb_target_group_arn"},
36+
ExactlyOneOf: []string{"elb", "lb_target_group_arn"},
4437
},
4538
"lb_target_group_arn": {
4639
Type: schema.TypeString,
4740
ForceNew: true,
4841
Optional: true,
49-
ExactlyOneOf: []string{"alb_target_group_arn", "elb", "lb_target_group_arn"},
42+
ExactlyOneOf: []string{"elb", "lb_target_group_arn"},
5043
},
5144
},
5245
}
@@ -75,16 +68,9 @@ func resourceAttachmentCreate(ctx context.Context, d *schema.ResourceData, meta
7568
return sdkdiag.AppendErrorf(diags, "attaching Auto Scaling Group (%s) load balancer (%s): %s", asgName, lbName, err)
7669
}
7770
} else {
78-
var targetGroupARN string
79-
if v, ok := d.GetOk("alb_target_group_arn"); ok {
80-
targetGroupARN = v.(string)
81-
} else if v, ok := d.GetOk("lb_target_group_arn"); ok {
82-
targetGroupARN = v.(string)
83-
}
84-
8571
input := &autoscaling.AttachLoadBalancerTargetGroupsInput{
8672
AutoScalingGroupName: aws.String(asgName),
87-
TargetGroupARNs: aws.StringSlice([]string{targetGroupARN}),
73+
TargetGroupARNs: aws.StringSlice([]string{d.Get("lb_target_group_arn").(string)}),
8874
}
8975

9076
_, err := tfresource.RetryWhenAWSErrMessageContains(ctx, d.Timeout(schema.TimeoutCreate),
@@ -94,7 +80,7 @@ func resourceAttachmentCreate(ctx context.Context, d *schema.ResourceData, meta
9480
ErrCodeValidationError, "update too many")
9581

9682
if err != nil {
97-
return sdkdiag.AppendErrorf(diags, "attaching Auto Scaling Group (%s) target group (%s): %s", asgName, targetGroupARN, err)
83+
return sdkdiag.AppendErrorf(diags, "attaching Auto Scaling Group (%s) target group (%s): %s", asgName, d.Get("lb_target_group_arn").(string), err)
9884
}
9985
}
10086

@@ -112,16 +98,9 @@ func resourceAttachmentRead(ctx context.Context, d *schema.ResourceData, meta in
11298
var err error
11399

114100
if v, ok := d.GetOk("elb"); ok {
115-
lbName := v.(string)
116-
err = FindAttachmentByLoadBalancerName(ctx, conn, asgName, lbName)
101+
err = FindAttachmentByLoadBalancerName(ctx, conn, asgName, v.(string))
117102
} else {
118-
var targetGroupARN string
119-
if v, ok := d.GetOk("alb_target_group_arn"); ok {
120-
targetGroupARN = v.(string)
121-
} else if v, ok := d.GetOk("lb_target_group_arn"); ok {
122-
targetGroupARN = v.(string)
123-
}
124-
err = FindAttachmentByTargetGroupARN(ctx, conn, asgName, targetGroupARN)
103+
err = FindAttachmentByTargetGroupARN(ctx, conn, asgName, d.Get("lb_target_group_arn").(string))
125104
}
126105

127106
if !d.IsNewResource() && tfresource.NotFound(err) {
@@ -159,16 +138,9 @@ func resourceAttachmentDelete(ctx context.Context, d *schema.ResourceData, meta
159138
return sdkdiag.AppendErrorf(diags, "detaching Auto Scaling Group (%s) load balancer (%s): %s", asgName, lbName, err)
160139
}
161140
} else {
162-
var targetGroupARN string
163-
if v, ok := d.GetOk("alb_target_group_arn"); ok {
164-
targetGroupARN = v.(string)
165-
} else if v, ok := d.GetOk("lb_target_group_arn"); ok {
166-
targetGroupARN = v.(string)
167-
}
168-
169141
input := &autoscaling.DetachLoadBalancerTargetGroupsInput{
170142
AutoScalingGroupName: aws.String(asgName),
171-
TargetGroupARNs: aws.StringSlice([]string{targetGroupARN}),
143+
TargetGroupARNs: aws.StringSlice([]string{d.Get("lb_target_group_arn").(string)}),
172144
}
173145

174146
_, err := tfresource.RetryWhenAWSErrMessageContains(ctx, d.Timeout(schema.TimeoutCreate),
@@ -178,7 +150,7 @@ func resourceAttachmentDelete(ctx context.Context, d *schema.ResourceData, meta
178150
ErrCodeValidationError, "update too many")
179151

180152
if err != nil {
181-
return sdkdiag.AppendErrorf(diags, "detaching Auto Scaling Group (%s) target group (%s): %s", asgName, targetGroupARN, err)
153+
return sdkdiag.AppendErrorf(diags, "detaching Auto Scaling Group (%s) target group (%s): %s", asgName, d.Get("lb_target_group_arn").(string), err)
182154
}
183155
}
184156

‎internal/service/autoscaling/attachment_test.go

+4-11
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,10 @@ func testAccCheckAttachmentDestroy(ctx context.Context) resource.TestCheckFunc {
128128

129129
var err error
130130

131-
if targetGroupARN := rs.Primary.Attributes["lb_target_group_arn"]; targetGroupARN == "" {
132-
targetGroupARN = rs.Primary.Attributes["alb_target_group_arn"]
133-
134-
err = tfautoscaling.FindAttachmentByTargetGroupARN(ctx, conn, rs.Primary.Attributes["autoscaling_group_name"], targetGroupARN)
131+
if lbName := rs.Primary.Attributes["elb"]; lbName != "" {
132+
err = tfautoscaling.FindAttachmentByLoadBalancerName(ctx, conn, rs.Primary.Attributes["autoscaling_group_name"], lbName)
135133
} else {
136-
err = tfautoscaling.FindAttachmentByLoadBalancerName(ctx, conn, rs.Primary.Attributes["autoscaling_group_name"], rs.Primary.Attributes["elb"])
134+
err = tfautoscaling.FindAttachmentByTargetGroupARN(ctx, conn, rs.Primary.Attributes["autoscaling_group_name"], rs.Primary.Attributes["lb_target_group_arn"])
137135
}
138136

139137
if tfresource.NotFound(err) {
@@ -173,12 +171,7 @@ func testAccCheckAttachmentByTargetGroupARNExists(ctx context.Context, n string)
173171

174172
conn := acctest.Provider.Meta().(*conns.AWSClient).AutoScalingConn()
175173

176-
targetGroupARN := rs.Primary.Attributes["lb_target_group_arn"]
177-
if targetGroupARN == "" {
178-
targetGroupARN = rs.Primary.Attributes["alb_target_group_arn"]
179-
}
180-
181-
return tfautoscaling.FindAttachmentByTargetGroupARN(ctx, conn, rs.Primary.Attributes["autoscaling_group_name"], targetGroupARN)
174+
return tfautoscaling.FindAttachmentByTargetGroupARN(ctx, conn, rs.Primary.Attributes["autoscaling_group_name"], rs.Primary.Attributes["lb_target_group_arn"])
182175
}
183176
}
184177

‎website/docs/r/autoscaling_attachment.html.markdown

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ The following arguments are supported:
6060

6161
* `autoscaling_group_name` - (Required) Name of ASG to associate with the ELB.
6262
* `elb` - (Optional) Name of the ELB.
63-
* `alb_target_group_arn` - (Optional, **Deprecated** use `lb_target_group_arn` instead) ARN of an ALB Target Group.
6463
* `lb_target_group_arn` - (Optional) ARN of a load balancer target group.
6564

6665
## Attributes Reference

0 commit comments

Comments
 (0)