[AWS::Organizations::Policy] - [BUG] - Duplicate tag keys when Stack tags and Resource tags are the same

[rehanvdm]

Name of the resource

AWS::Organizations::Policy

Resource Name

No response

Issue Description

Stack levels and resource level tags are not deduped as they should be. Both are added by CFN when making the API call and CFN errors with: "Your request includes duplicate tag keys".

When creating the stack it works as expected, the resource level tags take precedence over the stack level tag that has the same key. But as soon as another Org policy is added, it does not do this anymore and just adds the keys together in the array.

Expected Behavior

Resource level tags take precedence over the stack level tags and override them like with all resources.

Observed Behavior

The stack has Tag Key named "Owner", each Org policy also has the key name Owner in the CFN template (resource level)

1. Stack Create (with 1 org policy) ✅

• Creates new Org policy with the correct tag

2. Stack Update (add another org policy) ❌

• Creates new Org policy, fails with the duplicate key error, rolls back

Test Cases

As mentioned above.

The CFN changeset does not show duplicate keys but Cloudtrails shows that there are duplicate keys when CFN makes the API call only once the CFN stack already exists. Then adding another Org policy throws and error.

Other Details

No response