From 85ea7360203276fd10ff5deda4f287dffb33eede Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Wed, 1 Jun 2022 15:03:38 +0200
Subject: [PATCH] Tagging fragment - Move simplest cases over to the docs
 fragment. (#1182)

Tagging fragment - Move simplest cases over to the docs fragment.

Depends-On: ansible-collections/amazon.aws#844
SUMMARY
Migrate simplest cases over to the new docs fragment and add resource_tags as an alias to tags.
ISSUE TYPE

Docs Pull Request
Feature Pull Request

COMPONENT NAME
changelogs/fragments/1182-tagging.yml
plugins/modules/aws_glue_job.py
plugins/modules/aws_msk_cluster.py
plugins/modules/aws_secret.py
plugins/modules/aws_step_functions_state_machine.py
plugins/modules/dynamodb_table.py
plugins/modules/ec2_eip.py
plugins/modules/ec2_transit_gateway_vpc_attachment.py
plugins/modules/ec2_vpc_peer.py
plugins/modules/elb_application_lb.py
plugins/modules/elb_network_lb.py
plugins/modules/iam_role.py
plugins/modules/iam_user.py
plugins/modules/networkfirewall.py
plugins/modules/networkfirewall_policy.py
plugins/modules/networkfirewall_rule_group.py
plugins/modules/rds_cluster.py
plugins/modules/rds_instance.py
plugins/modules/rds_instance_snapshot.py
plugins/modules/rds_option_group.py
plugins/modules/rds_subnet_group.py
plugins/modules/redshift.py
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: https://github.com/ansible-collections/community.aws/commit/b11ffaed2b3450f6fee9721878090da404401021
---
 plugins/modules/ec2_eip.py | 39 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/plugins/modules/ec2_eip.py b/plugins/modules/ec2_eip.py
index 37ef0fa7540..531af689792 100644
--- a/plugins/modules/ec2_eip.py
+++ b/plugins/modules/ec2_eip.py
@@ -14,8 +14,8 @@
 version_added: 1.0.0
 short_description: manages EC2 elastic IP (EIP) addresses.
 description:
-    - This module can allocate or release an EIP.
-    - This module can associate/disassociate an EIP with instances or network interfaces.
+  - This module can allocate or release an EIP.
+  - This module can associate/disassociate an EIP with instances or network interfaces.
 options:
   device_id:
     description:
@@ -64,16 +64,6 @@
          network interface or instance to be re-associated with the specified instance or interface.
     default: false
     type: bool
-  tags:
-    description: A dictionary of tags to apply to the EIP.
-    type: dict
-    version_added: 2.1.0
-  purge_tags:
-    description: Whether the I(tags) argument should cause tags not in the
-      dictionary to be removed.
-    default: True
-    type: bool
-    version_added: 2.1.0
   tag_name:
     description:
       - When I(reuse_existing_ip_allowed=true), supplement with this option to only reuse
@@ -89,18 +79,21 @@
         only applies to newly allocated Elastic IPs, isn't validated when I(reuse_existing_ip_allowed=true).
     type: str
 extends_documentation_fragment:
-- amazon.aws.aws
-- amazon.aws.ec2
+  - amazon.aws.aws
+  - amazon.aws.ec2
+  - amazon.aws.tags
 
-author: "Rick Mendes (@rickmendes) <rmendes@illumina.com>"
+author:
+  - "Rick Mendes (@rickmendes) <rmendes@illumina.com>"
 notes:
-   - There may be a delay between the time the EIP is assigned and when
-     the cloud instance is reachable via the new address. Use wait_for and
-     pause to delay further playbook execution until the instance is reachable,
-     if necessary.
-   - This module returns multiple changed statuses on disassociation or release.
-     It returns an overall status based on any changes occurring. It also returns
-     individual changed statuses for disassociation and release.
+  - There may be a delay between the time the EIP is assigned and when
+    the cloud instance is reachable via the new address. Use wait_for and
+    pause to delay further playbook execution until the instance is reachable,
+    if necessary.
+  - This module returns multiple changed statuses on disassociation or release.
+    It returns an overall status based on any changes occurring. It also returns
+    individual changed statuses for disassociation and release.
+  - Support for I(tags) and I(purge_tags) was added in release 2.1.0.
 '''
 
 EXAMPLES = '''
@@ -543,7 +536,7 @@ def main():
         release_on_disassociation=dict(required=False, type='bool', default=False),
         allow_reassociation=dict(type='bool', default=False),
         private_ip_address=dict(),
-        tags=dict(required=False, type='dict'),
+        tags=dict(required=False, type='dict', aliases=['resource_tags']),
         purge_tags=dict(required=False, type='bool', default=True),
         tag_name=dict(),
         tag_value=dict(),