From b6e5102d4af8768efb42a51c3be21c0a3d6d141e Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Sat, 16 Mar 2024 22:38:10 +0100 Subject: [PATCH 1/3] aws_lb_target_group: always support ip_address_type ip_address_type is supported for both type instance and type IP Fixes #35010 --- internal/service/elbv2/target_group.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go index 2ff5a14f0fe0..c284d6d53510 100644 --- a/internal/service/elbv2/target_group.go +++ b/internal/service/elbv2/target_group.go @@ -390,11 +390,8 @@ func resourceTargetGroupCreate(ctx context.Context, d *schema.ResourceData, meta input.ProtocolVersion = aws.String(d.Get("protocol_version").(string)) } input.VpcId = aws.String(d.Get("vpc_id").(string)) - - if targetType == elbv2.TargetTypeEnumIp { - if v, ok := d.GetOk("ip_address_type"); ok { - input.IpAddressType = aws.String(v.(string)) - } + if v, ok := d.GetOk("ip_address_type"); ok { + input.IpAddressType = aws.String(v.(string)) } } From 178795901bf1b0513d8e86566e10fdc7198d40f2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 12 Jul 2024 14:58:21 -0400 Subject: [PATCH 2/3] Add CHANGELOG entry. --- .changelog/36423.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/36423.txt diff --git a/.changelog/36423.txt b/.changelog/36423.txt new file mode 100644 index 000000000000..164dda3c323a --- /dev/null +++ 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` +``` From 2a82a8756ed5f84e7a77c264ea79644038757f91 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 12 Jul 2024 15:04:23 -0400 Subject: [PATCH 3/3] Add missing CHANGELOG entry (#38323). --- .changelog/38323.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/38323.txt diff --git a/.changelog/38323.txt b/.changelog/38323.txt new file mode 100644 index 000000000000..5871ffbf3f4b --- /dev/null +++ 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 (`{}`) +``` \ No newline at end of file