From 886013281733bab9b3fc8f325f875adf51dafd9a Mon Sep 17 00:00:00 2001 From: Stano Bocinec Date: Mon, 15 Aug 2022 18:10:18 +0200 Subject: [PATCH 1/2] fix(ec2_eip): Fix default tags not set, #25567 Signed-off-by: Stano Bocinec --- internal/service/ec2/ec2_eip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ec2/ec2_eip.go b/internal/service/ec2/ec2_eip.go index 310745e0abd6..8ee837735403 100644 --- a/internal/service/ec2/ec2_eip.go +++ b/internal/service/ec2/ec2_eip.go @@ -142,7 +142,7 @@ func resourceEIPCreate(d *schema.ResourceData, meta interface{}) error { Domain: aws.String(domainOpt), } - if v := d.Get("tags").(map[string]interface{}); len(v) > 0 { + if len(tags) > 0 { supportedPlatforms := meta.(*conns.AWSClient).SupportedPlatforms if domainOpt != ec2.DomainTypeVpc && len(supportedPlatforms) > 0 && conns.HasEC2Classic(supportedPlatforms) { return fmt.Errorf("tags cannot be set for a standard-domain EIP - must be a VPC-domain EIP") From 890f7382d3aa23bdaec45f8df497aa94f219bf42 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 22 Aug 2022 10:22:07 -0400 Subject: [PATCH 2/2] Add CHANGELOG entry. --- .changelog/26308.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/26308.txt diff --git a/.changelog/26308.txt b/.changelog/26308.txt new file mode 100644 index 000000000000..8641f0fcefa6 --- /dev/null +++ b/.changelog/26308.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_eip: Include any provider-level configured `default_tags` on resource Create +``` \ No newline at end of file