From 28d3513619d608e3c069ebb75dc1dbcaf244e6aa Mon Sep 17 00:00:00 2001 From: Mark Chappell 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 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/rds_cluster.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/plugins/modules/rds_cluster.py b/plugins/modules/rds_cluster.py index 1d2ed3fdd9b..68e0ef17fc9 100644 --- a/plugins/modules/rds_cluster.py +++ b/plugins/modules/rds_cluster.py @@ -15,8 +15,9 @@ description: - Create, modify, and delete RDS clusters. extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 + - amazon.aws.aws + - amazon.aws.ec2 + - amazon.aws.tags author: - Sloane Hertel (@s-hertel) - Alina Buzachis (@alinabuzachis) @@ -47,12 +48,6 @@ Set I(enable_cloudwatch_logs_exports) to an empty list to disable all. type: bool default: true - purge_tags: - description: - - Whether or not to remove tags assigned to the DB cluster if not specified in the playbook. To remove all tags - set I(tags) to an empty dictionary in conjunction with this. - type: bool - default: true purge_security_groups: description: - Set to C(false) to retain any enabled security groups that aren't specified in the task and are associated with the cluster. @@ -322,10 +317,6 @@ description: - Whether the DB cluster is encrypted. type: bool - tags: - description: - - A dictionary of key value pairs to assign the DB cluster. - type: dict use_earliest_time_on_point_in_time_unavailable: description: - If I(backtrack_to) is set to a timestamp earlier than the earliest backtrack time, this value backtracks the DB cluster to @@ -951,7 +942,7 @@ def main(): source_engine_version=dict(), source_region=dict(), storage_encrypted=dict(type='bool'), - tags=dict(type='dict'), + tags=dict(type='dict', aliases=['resource_tags']), use_earliest_time_on_point_in_time_unavailable=dict(type='bool'), use_latest_restorable_time=dict(type='bool'), vpc_security_group_ids=dict(type='list', elements='str'),