Merge pull request #36423 from arianvp/arianvp-patch-1

aws_lb_target_group: always support ip_address_type
hashicorp · Jul 12, 2024 · c48039b · c48039b
2 parents e9f4926 + 2a82a87
commit c48039b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.changelog/36423.txt b/.changelog/36423.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_lb_target_group: Use the configured `ip_address_type` value when `target_type` is `instance`
+```
diff --git a/.changelog/38323.txt b/.changelog/38323.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_pinpoint_app: Fix `interface conversion: interface {} is nil, not map[string]interface {}` panic when `campaign_hook` is empty (`{}`) 
+```
diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go
@@ -395,7 +395,8 @@ func resourceTargetGroupCreate(ctx context.Context, d *schema.ResourceData, meta
 		}
 		input.VpcId = aws.String(d.Get(names.AttrVPCID).(string))
 
-		if targetType == awstypes.TargetTypeEnumIp {
+		switch targetType {
+		case awstypes.TargetTypeEnumInstance, awstypes.TargetTypeEnumIp:
 			if v, ok := d.GetOk(names.AttrIPAddressType); ok {
 				input.IpAddressType = awstypes.TargetGroupIpAddressTypeEnum(v.(string))
 			}