From c0c23b43054bbe148f6d8a5d371d46d9f14a39eb Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 6 Mar 2023 15:15:39 +0100 Subject: [PATCH 1/7] Bulk header cleanup --- plugins/connection/aws_ssm.py | 7 +++---- plugins/module_utils/base.py | 5 ++--- plugins/module_utils/common.py | 2 ++ plugins/module_utils/ec2.py | 5 ++--- plugins/module_utils/etag.py | 2 ++ plugins/module_utils/modules.py | 2 ++ plugins/module_utils/networkfirewall.py | 5 ++--- plugins/module_utils/opensearch.py | 8 +++---- plugins/module_utils/sns.py | 6 ++++-- plugins/module_utils/transitgateway.py | 5 ++--- plugins/module_utils/wafv2.py | 6 ++++-- .../accessanalyzer_validate_policy_info.py | 6 ++---- plugins/modules/acm_certificate.py | 21 ++----------------- plugins/modules/acm_certificate_info.py | 6 ++---- plugins/modules/api_gateway.py | 4 ---- plugins/modules/api_gateway_domain.py | 6 ++---- .../modules/application_autoscaling_policy.py | 6 ++---- .../autoscaling_complete_lifecycle_action.py | 5 ++--- .../modules/autoscaling_instance_refresh.py | 6 ++---- .../autoscaling_instance_refresh_info.py | 8 ++----- plugins/modules/autoscaling_launch_config.py | 9 +++----- .../modules/autoscaling_launch_config_find.py | 6 +----- .../modules/autoscaling_launch_config_info.py | 5 +---- plugins/modules/autoscaling_lifecycle_hook.py | 5 +---- plugins/modules/autoscaling_policy.py | 6 ++---- .../modules/autoscaling_scheduled_action.py | 4 +--- plugins/modules/aws_region_info.py | 6 ++---- plugins/modules/batch_compute_environment.py | 6 ++---- plugins/modules/batch_job_definition.py | 6 ++---- plugins/modules/batch_job_queue.py | 6 ++---- .../modules/cloudformation_exports_info.py | 6 ++---- plugins/modules/cloudformation_stack_set.py | 6 ++---- plugins/modules/cloudfront_distribution.py | 6 ++---- .../modules/cloudfront_distribution_info.py | 7 ++----- plugins/modules/cloudfront_invalidation.py | 6 ++---- .../cloudfront_origin_access_identity.py | 6 ++---- .../cloudfront_response_headers_policy.py | 6 ++---- plugins/modules/codebuild_project.py | 7 ++----- plugins/modules/codecommit_repository.py | 5 +---- plugins/modules/codepipeline.py | 7 ++----- .../config_aggregation_authorization.py | 5 +---- plugins/modules/config_aggregator.py | 5 +---- plugins/modules/config_delivery_channel.py | 5 +---- plugins/modules/config_recorder.py | 5 +---- plugins/modules/config_rule.py | 5 +---- plugins/modules/data_pipeline.py | 7 ++----- .../directconnect_confirm_connection.py | 9 ++------ plugins/modules/directconnect_connection.py | 6 ++---- plugins/modules/directconnect_gateway.py | 6 ++---- .../directconnect_link_aggregation_group.py | 6 ++---- .../directconnect_virtual_interface.py | 6 ++---- plugins/modules/dms_endpoint.py | 8 +++---- .../modules/dms_replication_subnet_group.py | 6 ++---- plugins/modules/dynamodb_table.py | 6 ++---- plugins/modules/dynamodb_ttl.py | 6 ++---- plugins/modules/ec2_ami_copy.py | 5 +---- plugins/modules/ec2_customer_gateway.py | 8 +++---- plugins/modules/ec2_customer_gateway_info.py | 6 ++---- plugins/modules/ec2_launch_template.py | 5 ++--- plugins/modules/ec2_placement_group.py | 6 ++---- plugins/modules/ec2_placement_group_info.py | 6 ++---- plugins/modules/ec2_snapshot_copy.py | 5 +---- plugins/modules/ec2_transit_gateway.py | 6 ++---- plugins/modules/ec2_transit_gateway_info.py | 7 ++----- .../ec2_transit_gateway_vpc_attachment.py | 6 ++---- ...ec2_transit_gateway_vpc_attachment_info.py | 6 ++---- plugins/modules/ec2_vpc_egress_igw.py | 6 ++---- plugins/modules/ec2_vpc_nacl.py | 6 ++---- plugins/modules/ec2_vpc_nacl_info.py | 7 +++---- plugins/modules/ec2_vpc_peer.py | 6 ++---- plugins/modules/ec2_vpc_peering_info.py | 6 ++---- plugins/modules/ec2_vpc_vgw.py | 6 ++---- plugins/modules/ec2_vpc_vgw_info.py | 6 ++---- plugins/modules/ec2_vpc_vpn.py | 6 ++---- plugins/modules/ec2_vpc_vpn_info.py | 6 ++---- plugins/modules/ec2_win_password.py | 6 ++---- plugins/modules/ecs_attribute.py | 6 ++---- plugins/modules/ecs_cluster.py | 6 ++---- plugins/modules/ecs_ecr.py | 7 +------ plugins/modules/ecs_service.py | 7 +++---- plugins/modules/ecs_service_info.py | 6 ++---- plugins/modules/ecs_tag.py | 3 +-- plugins/modules/ecs_task.py | 6 ++---- plugins/modules/ecs_taskdefinition.py | 8 +++---- plugins/modules/ecs_taskdefinition_info.py | 6 ++---- plugins/modules/efs.py | 6 ++---- plugins/modules/efs_info.py | 6 ++---- plugins/modules/efs_tag.py | 10 +++------ plugins/modules/eks_cluster.py | 6 ++---- plugins/modules/eks_fargate_profile.py | 6 ++---- plugins/modules/eks_nodegroup.py | 6 ++---- plugins/modules/elasticache.py | 7 ++----- plugins/modules/elasticache_info.py | 6 ++---- .../modules/elasticache_parameter_group.py | 8 +++---- plugins/modules/elasticache_snapshot.py | 6 ++---- plugins/modules/elasticache_subnet_group.py | 6 ++---- plugins/modules/elasticbeanstalk_app.py | 6 ++---- plugins/modules/elb_classic_lb_info.py | 19 +++-------------- plugins/modules/elb_instance.py | 6 ++---- plugins/modules/elb_network_lb.py | 5 +---- plugins/modules/elb_target.py | 6 ++---- plugins/modules/elb_target_group.py | 6 ++---- plugins/modules/elb_target_group_info.py | 6 ++---- plugins/modules/elb_target_info.py | 4 ++-- plugins/modules/glue_connection.py | 6 ++---- plugins/modules/glue_crawler.py | 6 ++---- plugins/modules/glue_job.py | 6 ++---- plugins/modules/iam_access_key.py | 6 ++---- plugins/modules/iam_access_key_info.py | 6 ++---- plugins/modules/iam_group.py | 20 +++--------------- plugins/modules/iam_managed_policy.py | 6 ++---- plugins/modules/iam_mfa_device_info.py | 6 ++---- plugins/modules/iam_password_policy.py | 5 +---- plugins/modules/iam_role.py | 7 +++---- plugins/modules/iam_role_info.py | 6 ++---- plugins/modules/iam_saml_federation.py | 19 ++--------------- plugins/modules/iam_server_certificate.py | 20 +++--------------- .../modules/iam_server_certificate_info.py | 6 ++---- plugins/modules/inspector_target.py | 6 ++---- plugins/modules/kinesis_stream.py | 6 ++---- plugins/modules/lightsail.py | 5 +---- plugins/modules/lightsail_static_ip.py | 6 +----- plugins/modules/msk_cluster.py | 7 ++----- plugins/modules/msk_config.py | 7 ++----- plugins/modules/networkfirewall.py | 6 ++---- plugins/modules/networkfirewall_info.py | 6 ++---- plugins/modules/networkfirewall_policy.py | 6 ++---- .../modules/networkfirewall_policy_info.py | 6 ++---- plugins/modules/networkfirewall_rule_group.py | 6 ++---- .../networkfirewall_rule_group_info.py | 6 ++---- plugins/modules/opensearch.py | 5 +---- plugins/modules/opensearch_info.py | 5 +---- plugins/modules/redshift.py | 6 +----- .../redshift_cross_region_snapshots.py | 5 +---- plugins/modules/redshift_info.py | 5 +---- plugins/modules/redshift_subnet_group.py | 5 +---- plugins/modules/s3_bucket_info.py | 10 +++------ plugins/modules/s3_bucket_notification.py | 6 +----- plugins/modules/s3_cors.py | 7 ++----- plugins/modules/s3_lifecycle.py | 6 ++---- plugins/modules/s3_logging.py | 6 ++---- plugins/modules/s3_metrics_configuration.py | 6 ++---- plugins/modules/s3_sync.py | 20 +++--------------- plugins/modules/s3_website.py | 6 ++---- plugins/modules/secretsmanager_secret.py | 4 +--- plugins/modules/ses_identity.py | 6 ++---- plugins/modules/ses_identity_policy.py | 6 ++---- plugins/modules/ses_rule_set.py | 6 ++---- plugins/modules/sns.py | 4 ---- plugins/modules/sns_topic.py | 5 +---- plugins/modules/sns_topic_info.py | 5 +---- plugins/modules/sqs_queue.py | 6 ++---- plugins/modules/ssm_parameter.py | 6 ++---- .../modules/stepfunctions_state_machine.py | 7 ++----- .../stepfunctions_state_machine_execution.py | 7 ++----- plugins/modules/storagegateway_info.py | 6 ++---- plugins/modules/sts_assume_role.py | 6 ++---- plugins/modules/sts_session_token.py | 6 ++---- plugins/modules/waf_condition.py | 6 ++---- plugins/modules/waf_info.py | 6 ++---- plugins/modules/waf_rule.py | 6 ++---- plugins/modules/waf_web_acl.py | 6 ++---- plugins/modules/wafv2_ip_set.py | 5 ++--- plugins/modules/wafv2_ip_set_info.py | 5 ++--- plugins/modules/wafv2_resources.py | 5 ++--- plugins/modules/wafv2_resources_info.py | 5 ++--- plugins/modules/wafv2_rule_group.py | 5 ++--- plugins/modules/wafv2_rule_group_info.py | 5 ++--- plugins/modules/wafv2_web_acl.py | 5 ++--- plugins/modules/wafv2_web_acl_info.py | 5 ++--- 170 files changed, 328 insertions(+), 758 deletions(-) diff --git a/plugins/connection/aws_ssm.py b/plugins/connection/aws_ssm.py index fb1da6097eb..f717584d361 100644 --- a/plugins/connection/aws_ssm.py +++ b/plugins/connection/aws_ssm.py @@ -1,10 +1,9 @@ -# Based on the ssh connection plugin by Michael DeHaan -# +# -*- coding: utf-8 -*- + # Copyright: (c) 2018, Pat Sharkey # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# Based on the ssh connection plugin by Michael DeHaan DOCUMENTATION = ''' name: aws_ssm diff --git a/plugins/module_utils/base.py b/plugins/module_utils/base.py index 1ce732d7a25..48e3132540c 100644 --- a/plugins/module_utils/base.py +++ b/plugins/module_utils/base.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) @@ -7,9 +9,6 @@ # sense for it to start life in community.aws. # -from __future__ import absolute_import, division, print_function -__metaclass__ = type - from copy import deepcopy from functools import wraps diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index dc9da365dc6..fec3684aacb 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/plugins/module_utils/ec2.py b/plugins/module_utils/ec2.py index 5ae78985765..897a7458724 100644 --- a/plugins/module_utils/ec2.py +++ b/plugins/module_utils/ec2.py @@ -1,9 +1,8 @@ +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - from copy import deepcopy from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code diff --git a/plugins/module_utils/etag.py b/plugins/module_utils/etag.py index a8cab508275..072a6514cc9 100644 --- a/plugins/module_utils/etag.py +++ b/plugins/module_utils/etag.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + # source: https://github.com/tlastowka/calculate_multipart_etag/blob/master/calculate_multipart_etag.py # # calculate_multipart_etag Copyright (C) 2015 diff --git a/plugins/module_utils/modules.py b/plugins/module_utils/modules.py index 6d8f65b986d..cab9e8afc72 100644 --- a/plugins/module_utils/modules.py +++ b/plugins/module_utils/modules.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/plugins/module_utils/networkfirewall.py b/plugins/module_utils/networkfirewall.py index 920c9f09233..cc1e349685c 100644 --- a/plugins/module_utils/networkfirewall.py +++ b/plugins/module_utils/networkfirewall.py @@ -1,9 +1,8 @@ +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - from copy import deepcopy import time diff --git a/plugins/module_utils/opensearch.py b/plugins/module_utils/opensearch.py index 8189378e5c3..9ea76bec4f5 100644 --- a/plugins/module_utils/opensearch.py +++ b/plugins/module_utils/opensearch.py @@ -1,9 +1,7 @@ -# This file is part of Ansible -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import absolute_import, division, print_function +# -*- coding: utf-8 -*- -__metaclass__ = type +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from copy import deepcopy import datetime diff --git a/plugins/module_utils/sns.py b/plugins/module_utils/sns.py index 44327d49362..23271df20cb 100644 --- a/plugins/module_utils/sns.py +++ b/plugins/module_utils/sns.py @@ -1,5 +1,7 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- + +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) import re import copy diff --git a/plugins/module_utils/transitgateway.py b/plugins/module_utils/transitgateway.py index 3ec198abdde..40d8f3f9602 100644 --- a/plugins/module_utils/transitgateway.py +++ b/plugins/module_utils/transitgateway.py @@ -1,9 +1,8 @@ +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - from copy import deepcopy from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code diff --git a/plugins/module_utils/wafv2.py b/plugins/module_utils/wafv2.py index 18f19974daf..68611bec058 100644 --- a/plugins/module_utils/wafv2.py +++ b/plugins/module_utils/wafv2.py @@ -1,5 +1,7 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- + +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) try: from botocore.exceptions import ClientError, BotoCoreError diff --git a/plugins/modules/accessanalyzer_validate_policy_info.py b/plugins/modules/accessanalyzer_validate_policy_info.py index 790486e13c2..c5d1fc4db9f 100644 --- a/plugins/modules/accessanalyzer_validate_policy_info.py +++ b/plugins/modules/accessanalyzer_validate_policy_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: accessanalyzer_validate_policy_info diff --git a/plugins/modules/acm_certificate.py b/plugins/modules/acm_certificate.py index 313bdc424a3..f9e52fd6a0b 100644 --- a/plugins/modules/acm_certificate.py +++ b/plugins/modules/acm_certificate.py @@ -1,30 +1,13 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# + # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# -# This module is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this software. If not, see . -# + # Author: # - Matthew Davis # on behalf of Telstra Corporation Limited -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: acm_certificate diff --git a/plugins/modules/acm_certificate_info.py b/plugins/modules/acm_certificate_info.py index 7395ec65ddc..d713e87a1a0 100644 --- a/plugins/modules/acm_certificate_info.py +++ b/plugins/modules/acm_certificate_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' module: acm_certificate_info short_description: Retrieve certificate information from AWS Certificate Manager service diff --git a/plugins/modules/api_gateway.py b/plugins/modules/api_gateway.py index e4085deced8..8b2dba83faa 100644 --- a/plugins/modules/api_gateway.py +++ b/plugins/modules/api_gateway.py @@ -4,10 +4,6 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: api_gateway diff --git a/plugins/modules/api_gateway_domain.py b/plugins/modules/api_gateway_domain.py index ab0486d4f75..18801ff2f55 100644 --- a/plugins/modules/api_gateway_domain.py +++ b/plugins/modules/api_gateway_domain.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: api_gateway_domain diff --git a/plugins/modules/application_autoscaling_policy.py b/plugins/modules/application_autoscaling_policy.py index 08264400341..24fc953ceff 100644 --- a/plugins/modules/application_autoscaling_policy.py +++ b/plugins/modules/application_autoscaling_policy.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: application_autoscaling_policy diff --git a/plugins/modules/autoscaling_complete_lifecycle_action.py b/plugins/modules/autoscaling_complete_lifecycle_action.py index 62d5e64b3bc..06cfbcac266 100644 --- a/plugins/modules/autoscaling_complete_lifecycle_action.py +++ b/plugins/modules/autoscaling_complete_lifecycle_action.py @@ -1,10 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- module: autoscaling_complete_lifecycle_action diff --git a/plugins/modules/autoscaling_instance_refresh.py b/plugins/modules/autoscaling_instance_refresh.py index 73e223af3de..fcd1209e1e4 100644 --- a/plugins/modules/autoscaling_instance_refresh.py +++ b/plugins/modules/autoscaling_instance_refresh.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: autoscaling_instance_refresh diff --git a/plugins/modules/autoscaling_instance_refresh_info.py b/plugins/modules/autoscaling_instance_refresh_info.py index 064e92789b6..b7cf0129f91 100644 --- a/plugins/modules/autoscaling_instance_refresh_info.py +++ b/plugins/modules/autoscaling_instance_refresh_info.py @@ -1,13 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - - DOCUMENTATION = ''' --- module: autoscaling_instance_refresh_info diff --git a/plugins/modules/autoscaling_launch_config.py b/plugins/modules/autoscaling_launch_config.py index 0e5cf844673..5735be4992a 100644 --- a/plugins/modules/autoscaling_launch_config.py +++ b/plugins/modules/autoscaling_launch_config.py @@ -1,11 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import absolute_import, division, print_function -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/autoscaling_launch_config_find.py b/plugins/modules/autoscaling_launch_config_find.py index 699859af7e1..3194cc8131d 100644 --- a/plugins/modules/autoscaling_launch_config_find.py +++ b/plugins/modules/autoscaling_launch_config_find.py @@ -1,13 +1,9 @@ #!/usr/bin/python -# encoding: utf-8 +# -*- coding: utf-8 -*- # (c) 2015, Jose Armesto # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: autoscaling_launch_config_find diff --git a/plugins/modules/autoscaling_launch_config_info.py b/plugins/modules/autoscaling_launch_config_info.py index 44359bc64da..37635dafae6 100644 --- a/plugins/modules/autoscaling_launch_config_info.py +++ b/plugins/modules/autoscaling_launch_config_info.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: autoscaling_launch_config_info diff --git a/plugins/modules/autoscaling_lifecycle_hook.py b/plugins/modules/autoscaling_lifecycle_hook.py index 72d3c6dfda2..50e0ff93d01 100644 --- a/plugins/modules/autoscaling_lifecycle_hook.py +++ b/plugins/modules/autoscaling_lifecycle_hook.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: autoscaling_lifecycle_hook diff --git a/plugins/modules/autoscaling_policy.py b/plugins/modules/autoscaling_policy.py index 19c7e46b481..78a05dfb849 100644 --- a/plugins/modules/autoscaling_policy.py +++ b/plugins/modules/autoscaling_policy.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' module: autoscaling_policy short_description: Create or delete AWS scaling policies for Autoscaling groups diff --git a/plugins/modules/autoscaling_scheduled_action.py b/plugins/modules/autoscaling_scheduled_action.py index cbccf7f1fe3..42a7fde804e 100644 --- a/plugins/modules/autoscaling_scheduled_action.py +++ b/plugins/modules/autoscaling_scheduled_action.py @@ -1,4 +1,5 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) @@ -6,9 +7,6 @@ # Based off of https://github.com/mmochan/ansible-aws-ec2-asg-scheduled-actions/blob/master/library/ec2_asg_scheduled_action.py # (c) 2016, Mike Mochan <@mmochan> -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - DOCUMENTATION = r''' --- module: autoscaling_scheduled_action diff --git a/plugins/modules/aws_region_info.py b/plugins/modules/aws_region_info.py index ad9368ef14c..56df747dedc 100644 --- a/plugins/modules/aws_region_info.py +++ b/plugins/modules/aws_region_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' module: aws_region_info short_description: Gather information about AWS regions diff --git a/plugins/modules/batch_compute_environment.py b/plugins/modules/batch_compute_environment.py index c6c752a3c40..1e9cbb35f36 100644 --- a/plugins/modules/batch_compute_environment.py +++ b/plugins/modules/batch_compute_environment.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Jon Meran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: batch_compute_environment diff --git a/plugins/modules/batch_job_definition.py b/plugins/modules/batch_job_definition.py index 021d833b464..5a8c1fb6da9 100644 --- a/plugins/modules/batch_job_definition.py +++ b/plugins/modules/batch_job_definition.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Jon Meran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: batch_job_definition diff --git a/plugins/modules/batch_job_queue.py b/plugins/modules/batch_job_queue.py index e20c430ba6a..98ba7b8d2f1 100644 --- a/plugins/modules/batch_job_queue.py +++ b/plugins/modules/batch_job_queue.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Jon Meran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: batch_job_queue diff --git a/plugins/modules/cloudformation_exports_info.py b/plugins/modules/cloudformation_exports_info.py index 7030ca8ba5c..3f979a35bb2 100644 --- a/plugins/modules/cloudformation_exports_info.py +++ b/plugins/modules/cloudformation_exports_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: cloudformation_exports_info short_description: Read a value from CloudFormation Exports diff --git a/plugins/modules/cloudformation_stack_set.py b/plugins/modules/cloudformation_stack_set.py index 2d5bd83d455..edd18886990 100644 --- a/plugins/modules/cloudformation_stack_set.py +++ b/plugins/modules/cloudformation_stack_set.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: cloudformation_stack_set diff --git a/plugins/modules/cloudfront_distribution.py b/plugins/modules/cloudfront_distribution.py index f7ff3b51553..dc1a6fad91d 100644 --- a/plugins/modules/cloudfront_distribution.py +++ b/plugins/modules/cloudfront_distribution.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- diff --git a/plugins/modules/cloudfront_distribution_info.py b/plugins/modules/cloudfront_distribution_info.py index 179e572e0c9..ca145a1a246 100644 --- a/plugins/modules/cloudfront_distribution_info.py +++ b/plugins/modules/cloudfront_distribution_info.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # This file is part of Ansible # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) - -__metaclass__ = type - - DOCUMENTATION = ''' --- module: cloudfront_distribution_info diff --git a/plugins/modules/cloudfront_invalidation.py b/plugins/modules/cloudfront_invalidation.py index dbf478e4408..ea2bee2f993 100644 --- a/plugins/modules/cloudfront_invalidation.py +++ b/plugins/modules/cloudfront_invalidation.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- diff --git a/plugins/modules/cloudfront_origin_access_identity.py b/plugins/modules/cloudfront_origin_access_identity.py index e59c9439701..e637664a485 100644 --- a/plugins/modules/cloudfront_origin_access_identity.py +++ b/plugins/modules/cloudfront_origin_access_identity.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- diff --git a/plugins/modules/cloudfront_response_headers_policy.py b/plugins/modules/cloudfront_response_headers_policy.py index f009fe89b3c..8d7f747d4cf 100644 --- a/plugins/modules/cloudfront_response_headers_policy.py +++ b/plugins/modules/cloudfront_response_headers_policy.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- version_added: 3.2.0 diff --git a/plugins/modules/codebuild_project.py b/plugins/modules/codebuild_project.py index cd372258d67..bc86b78c3f1 100644 --- a/plugins/modules/codebuild_project.py +++ b/plugins/modules/codebuild_project.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type - - DOCUMENTATION = r''' --- module: codebuild_project diff --git a/plugins/modules/codecommit_repository.py b/plugins/modules/codecommit_repository.py index b9282183d58..89672558918 100644 --- a/plugins/modules/codecommit_repository.py +++ b/plugins/modules/codecommit_repository.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: (c) 2018, Shuang Wang # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: codecommit_repository diff --git a/plugins/modules/codepipeline.py b/plugins/modules/codepipeline.py index 774231d5bdd..63b394743b7 100644 --- a/plugins/modules/codepipeline.py +++ b/plugins/modules/codepipeline.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type - - DOCUMENTATION = r''' --- module: codepipeline diff --git a/plugins/modules/config_aggregation_authorization.py b/plugins/modules/config_aggregation_authorization.py index 9060fcd97d8..2966b9ea0ce 100644 --- a/plugins/modules/config_aggregation_authorization.py +++ b/plugins/modules/config_aggregation_authorization.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: config_aggregation_authorization diff --git a/plugins/modules/config_aggregator.py b/plugins/modules/config_aggregator.py index c54357700a3..ac8e1b1cb1a 100644 --- a/plugins/modules/config_aggregator.py +++ b/plugins/modules/config_aggregator.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: config_aggregator diff --git a/plugins/modules/config_delivery_channel.py b/plugins/modules/config_delivery_channel.py index d97467502a2..17fbeb241aa 100644 --- a/plugins/modules/config_delivery_channel.py +++ b/plugins/modules/config_delivery_channel.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: config_delivery_channel diff --git a/plugins/modules/config_recorder.py b/plugins/modules/config_recorder.py index 7d6ebae8ef1..adfad41bb04 100644 --- a/plugins/modules/config_recorder.py +++ b/plugins/modules/config_recorder.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: config_recorder diff --git a/plugins/modules/config_rule.py b/plugins/modules/config_rule.py index aa1ff626a92..83a929312f0 100644 --- a/plugins/modules/config_rule.py +++ b/plugins/modules/config_rule.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: config_rule diff --git a/plugins/modules/data_pipeline.py b/plugins/modules/data_pipeline.py index a5b0e627a40..fc6a5bc964a 100644 --- a/plugins/modules/data_pipeline.py +++ b/plugins/modules/data_pipeline.py @@ -1,12 +1,9 @@ #!/usr/bin/python -# +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: data_pipeline diff --git a/plugins/modules/directconnect_confirm_connection.py b/plugins/modules/directconnect_confirm_connection.py index 2705c50a6b5..8cc9099fd8f 100644 --- a/plugins/modules/directconnect_confirm_connection.py +++ b/plugins/modules/directconnect_confirm_connection.py @@ -1,14 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - -ANSIBLE_METADATA = {'metadata_version': '1.1', - 'status': ['preview'], - 'supported_by': 'community'} - DOCUMENTATION = ''' --- module: directconnect_confirm_connection diff --git a/plugins/modules/directconnect_connection.py b/plugins/modules/directconnect_connection.py index 11ac14dfa22..588a2202c65 100644 --- a/plugins/modules/directconnect_connection.py +++ b/plugins/modules/directconnect_connection.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: directconnect_connection diff --git a/plugins/modules/directconnect_gateway.py b/plugins/modules/directconnect_gateway.py index 8ad4f9bf161..8b27565534e 100644 --- a/plugins/modules/directconnect_gateway.py +++ b/plugins/modules/directconnect_gateway.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: directconnect_gateway author: diff --git a/plugins/modules/directconnect_link_aggregation_group.py b/plugins/modules/directconnect_link_aggregation_group.py index 6b7ec8bdbe8..7d49f38f433 100644 --- a/plugins/modules/directconnect_link_aggregation_group.py +++ b/plugins/modules/directconnect_link_aggregation_group.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: directconnect_link_aggregation_group diff --git a/plugins/modules/directconnect_virtual_interface.py b/plugins/modules/directconnect_virtual_interface.py index 88a8f5622a8..d203c68fbf8 100644 --- a/plugins/modules/directconnect_virtual_interface.py +++ b/plugins/modules/directconnect_virtual_interface.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: directconnect_virtual_interface diff --git a/plugins/modules/dms_endpoint.py b/plugins/modules/dms_endpoint.py index 692fb25bd88..3a01b31c3ce 100644 --- a/plugins/modules/dms_endpoint.py +++ b/plugins/modules/dms_endpoint.py @@ -1,10 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = ''' --- diff --git a/plugins/modules/dms_replication_subnet_group.py b/plugins/modules/dms_replication_subnet_group.py index 3fdbdc0a429..d622263e4ca 100644 --- a/plugins/modules/dms_replication_subnet_group.py +++ b/plugins/modules/dms_replication_subnet_group.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: dms_replication_subnet_group diff --git a/plugins/modules/dynamodb_table.py b/plugins/modules/dynamodb_table.py index 71b0e4ccc26..9206513507f 100644 --- a/plugins/modules/dynamodb_table.py +++ b/plugins/modules/dynamodb_table.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: dynamodb_table diff --git a/plugins/modules/dynamodb_ttl.py b/plugins/modules/dynamodb_ttl.py index ec7d6ed2f65..07b5bc2fcf2 100644 --- a/plugins/modules/dynamodb_ttl.py +++ b/plugins/modules/dynamodb_ttl.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: dynamodb_ttl diff --git a/plugins/modules/ec2_ami_copy.py b/plugins/modules/ec2_ami_copy.py index 665aeab8a25..f0442fa6dba 100644 --- a/plugins/modules/ec2_ami_copy.py +++ b/plugins/modules/ec2_ami_copy.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # This file is part of Ansible # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ec2_ami_copy diff --git a/plugins/modules/ec2_customer_gateway.py b/plugins/modules/ec2_customer_gateway.py index a4637f38659..368b4f23513 100644 --- a/plugins/modules/ec2_customer_gateway.py +++ b/plugins/modules/ec2_customer_gateway.py @@ -1,10 +1,8 @@ #!/usr/bin/python -# -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import absolute_import, division, print_function -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = ''' --- diff --git a/plugins/modules/ec2_customer_gateway_info.py b/plugins/modules/ec2_customer_gateway_info.py index ce576b7ae81..3ae054e14dd 100644 --- a/plugins/modules/ec2_customer_gateway_info.py +++ b/plugins/modules/ec2_customer_gateway_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ec2_customer_gateway_info diff --git a/plugins/modules/ec2_launch_template.py b/plugins/modules/ec2_launch_template.py index 094a6afdfa0..07247a94f36 100644 --- a/plugins/modules/ec2_launch_template.py +++ b/plugins/modules/ec2_launch_template.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = r''' --- diff --git a/plugins/modules/ec2_placement_group.py b/plugins/modules/ec2_placement_group.py index 4b4adc964e5..6bd3993ed00 100644 --- a/plugins/modules/ec2_placement_group.py +++ b/plugins/modules/ec2_placement_group.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ec2_placement_group diff --git a/plugins/modules/ec2_placement_group_info.py b/plugins/modules/ec2_placement_group_info.py index 4bcc9cfb4ae..eb532f860ad 100644 --- a/plugins/modules/ec2_placement_group_info.py +++ b/plugins/modules/ec2_placement_group_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ec2_placement_group_info diff --git a/plugins/modules/ec2_snapshot_copy.py b/plugins/modules/ec2_snapshot_copy.py index 7b38b1ea29a..377bc901138 100644 --- a/plugins/modules/ec2_snapshot_copy.py +++ b/plugins/modules/ec2_snapshot_copy.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ec2_snapshot_copy diff --git a/plugins/modules/ec2_transit_gateway.py b/plugins/modules/ec2_transit_gateway.py index 158fcf929a8..39375a8ff10 100644 --- a/plugins/modules/ec2_transit_gateway.py +++ b/plugins/modules/ec2_transit_gateway.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: ec2_transit_gateway short_description: Create and delete AWS Transit Gateways diff --git a/plugins/modules/ec2_transit_gateway_info.py b/plugins/modules/ec2_transit_gateway_info.py index cae82e570cd..712f20c9f74 100644 --- a/plugins/modules/ec2_transit_gateway_info.py +++ b/plugins/modules/ec2_transit_gateway_info.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' module: ec2_transit_gateway_info short_description: Gather information about ec2 transit gateways in AWS diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment.py b/plugins/modules/ec2_transit_gateway_vpc_attachment.py index 55267bc9185..7f4dbf6d47b 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: ec2_transit_gateway_vpc_attachment short_description: Create and delete AWS Transit Gateway VPC attachments diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py index 88f57fefa1b..a85ad434433 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: ec2_transit_gateway_vpc_attachment_info short_description: describes AWS Transit Gateway VPC attachments diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py index 09531892548..8ffa3da9a95 100644 --- a/plugins/modules/ec2_vpc_egress_igw.py +++ b/plugins/modules/ec2_vpc_egress_igw.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ec2_vpc_egress_igw diff --git a/plugins/modules/ec2_vpc_nacl.py b/plugins/modules/ec2_vpc_nacl.py index 3b10a0a66f9..13690e49d64 100644 --- a/plugins/modules/ec2_vpc_nacl.py +++ b/plugins/modules/ec2_vpc_nacl.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' module: ec2_vpc_nacl short_description: create and delete Network ACLs diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py index 3684d0d397b..56113a79e35 100644 --- a/plugins/modules/ec2_vpc_nacl_info.py +++ b/plugins/modules/ec2_vpc_nacl_info.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import absolute_import, division, print_function -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/ec2_vpc_peer.py b/plugins/modules/ec2_vpc_peer.py index 3c39f11dede..238db4fb761 100644 --- a/plugins/modules/ec2_vpc_peer.py +++ b/plugins/modules/ec2_vpc_peer.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: ec2_vpc_peer short_description: create, delete, accept, and reject VPC peering connections between two VPCs. diff --git a/plugins/modules/ec2_vpc_peering_info.py b/plugins/modules/ec2_vpc_peering_info.py index 2e257a31ffe..deec8b963b6 100644 --- a/plugins/modules/ec2_vpc_peering_info.py +++ b/plugins/modules/ec2_vpc_peering_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' module: ec2_vpc_peering_info short_description: Retrieves AWS VPC Peering details using AWS methods. diff --git a/plugins/modules/ec2_vpc_vgw.py b/plugins/modules/ec2_vpc_vgw.py index 990ad908acc..41f2902113a 100644 --- a/plugins/modules/ec2_vpc_vgw.py +++ b/plugins/modules/ec2_vpc_vgw.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: ec2_vpc_vgw short_description: Create and delete AWS VPN Virtual Gateways diff --git a/plugins/modules/ec2_vpc_vgw_info.py b/plugins/modules/ec2_vpc_vgw_info.py index dcddd69bc31..c08aaab73ee 100644 --- a/plugins/modules/ec2_vpc_vgw_info.py +++ b/plugins/modules/ec2_vpc_vgw_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ec2_vpc_vgw_info diff --git a/plugins/modules/ec2_vpc_vpn.py b/plugins/modules/ec2_vpc_vpn.py index d543cde00e7..da5ad603ba7 100644 --- a/plugins/modules/ec2_vpc_vpn.py +++ b/plugins/modules/ec2_vpc_vpn.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ec2_vpc_vpn diff --git a/plugins/modules/ec2_vpc_vpn_info.py b/plugins/modules/ec2_vpc_vpn_info.py index ac9be556e23..dbe9fa95c26 100644 --- a/plugins/modules/ec2_vpc_vpn_info.py +++ b/plugins/modules/ec2_vpc_vpn_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ec2_vpc_vpn_info diff --git a/plugins/modules/ec2_win_password.py b/plugins/modules/ec2_win_password.py index 10d33658f88..c1b13e09de5 100644 --- a/plugins/modules/ec2_win_password.py +++ b/plugins/modules/ec2_win_password.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ec2_win_password diff --git a/plugins/modules/ecs_attribute.py b/plugins/modules/ecs_attribute.py index a942228e305..c44a84e01a3 100644 --- a/plugins/modules/ecs_attribute.py +++ b/plugins/modules/ecs_attribute.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ecs_attribute diff --git a/plugins/modules/ecs_cluster.py b/plugins/modules/ecs_cluster.py index 8b64a14abbd..ad3c2f40a42 100644 --- a/plugins/modules/ecs_cluster.py +++ b/plugins/modules/ecs_cluster.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ecs_cluster diff --git a/plugins/modules/ecs_ecr.py b/plugins/modules/ecs_ecr.py index fd335928e0a..1dfd2d4ee59 100644 --- a/plugins/modules/ecs_ecr.py +++ b/plugins/modules/ecs_ecr.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -* +# -*- coding: utf-8 -*- # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ecs_ecr diff --git a/plugins/modules/ecs_service.py b/plugins/modules/ecs_service.py index 15c74b92c50..cc531624a90 100644 --- a/plugins/modules/ecs_service.py +++ b/plugins/modules/ecs_service.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +# -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/ecs_service_info.py b/plugins/modules/ecs_service_info.py index fe651444cea..04054056032 100644 --- a/plugins/modules/ecs_service_info.py +++ b/plugins/modules/ecs_service_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ecs_service_info diff --git a/plugins/modules/ecs_tag.py b/plugins/modules/ecs_tag.py index 9f25881d207..a6d8a37ba80 100644 --- a/plugins/modules/ecs_tag.py +++ b/plugins/modules/ecs_tag.py @@ -1,9 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: (c) 2019, Michael Pechner # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - DOCUMENTATION = r''' --- diff --git a/plugins/modules/ecs_task.py b/plugins/modules/ecs_task.py index ebc872ba959..d977375daed 100644 --- a/plugins/modules/ecs_task.py +++ b/plugins/modules/ecs_task.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: ecs_task diff --git a/plugins/modules/ecs_taskdefinition.py b/plugins/modules/ecs_taskdefinition.py index 3eb7716f503..6fbb08919ad 100644 --- a/plugins/modules/ecs_taskdefinition.py +++ b/plugins/modules/ecs_taskdefinition.py @@ -1,10 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/ecs_taskdefinition_info.py b/plugins/modules/ecs_taskdefinition_info.py index d57214cf419..cfe71026e14 100644 --- a/plugins/modules/ecs_taskdefinition_info.py +++ b/plugins/modules/ecs_taskdefinition_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ecs_taskdefinition_info diff --git a/plugins/modules/efs.py b/plugins/modules/efs.py index 7223c99f3a4..a70a9744353 100644 --- a/plugins/modules/efs.py +++ b/plugins/modules/efs.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: efs diff --git a/plugins/modules/efs_info.py b/plugins/modules/efs_info.py index 634ff2a4273..e4bce9b5e9b 100644 --- a/plugins/modules/efs_info.py +++ b/plugins/modules/efs_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: efs_info diff --git a/plugins/modules/efs_tag.py b/plugins/modules/efs_tag.py index bc99d110635..09d13790a57 100644 --- a/plugins/modules/efs_tag.py +++ b/plugins/modules/efs_tag.py @@ -1,12 +1,8 @@ #!/usr/bin/python -""" -Copyright: (c) 2021, Milan Zink -GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -""" - -from __future__ import absolute_import, division, print_function -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: (c) 2021, Milan Zink +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/eks_cluster.py b/plugins/modules/eks_cluster.py index 73467d7322b..bc3199b6603 100644 --- a/plugins/modules/eks_cluster.py +++ b/plugins/modules/eks_cluster.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: eks_cluster diff --git a/plugins/modules/eks_fargate_profile.py b/plugins/modules/eks_fargate_profile.py index c54d67aec02..db1f18f3375 100644 --- a/plugins/modules/eks_fargate_profile.py +++ b/plugins/modules/eks_fargate_profile.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: eks_fargate_profile diff --git a/plugins/modules/eks_nodegroup.py b/plugins/modules/eks_nodegroup.py index 5ba33128a66..39763dc2803 100644 --- a/plugins/modules/eks_nodegroup.py +++ b/plugins/modules/eks_nodegroup.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: eks_nodegroup diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index eeabcfe76cf..3100aea4cfa 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -1,12 +1,9 @@ #!/usr/bin/python -# +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: elasticache diff --git a/plugins/modules/elasticache_info.py b/plugins/modules/elasticache_info.py index 3aa7a4317c7..21c74a89078 100644 --- a/plugins/modules/elasticache_info.py +++ b/plugins/modules/elasticache_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' module: elasticache_info short_description: Retrieve information for AWS ElastiCache clusters diff --git a/plugins/modules/elasticache_parameter_group.py b/plugins/modules/elasticache_parameter_group.py index fe8cc08fc00..ea538f9e899 100644 --- a/plugins/modules/elasticache_parameter_group.py +++ b/plugins/modules/elasticache_parameter_group.py @@ -1,10 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = ''' --- diff --git a/plugins/modules/elasticache_snapshot.py b/plugins/modules/elasticache_snapshot.py index 9ae5be427ca..6e3611cdc6b 100644 --- a/plugins/modules/elasticache_snapshot.py +++ b/plugins/modules/elasticache_snapshot.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: elasticache_snapshot diff --git a/plugins/modules/elasticache_subnet_group.py b/plugins/modules/elasticache_subnet_group.py index 802d8c0949e..3f66ace941e 100644 --- a/plugins/modules/elasticache_subnet_group.py +++ b/plugins/modules/elasticache_subnet_group.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: elasticache_subnet_group diff --git a/plugins/modules/elasticbeanstalk_app.py b/plugins/modules/elasticbeanstalk_app.py index 46529276997..54110715e5f 100644 --- a/plugins/modules/elasticbeanstalk_app.py +++ b/plugins/modules/elasticbeanstalk_app.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: elasticbeanstalk_app diff --git a/plugins/modules/elb_classic_lb_info.py b/plugins/modules/elb_classic_lb_info.py index 9298085e28f..9c3b8312ed8 100644 --- a/plugins/modules/elb_classic_lb_info.py +++ b/plugins/modules/elb_classic_lb_info.py @@ -1,21 +1,8 @@ #!/usr/bin/python -# -# This is a free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This Ansible library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this library. If not, see . - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/elb_instance.py b/plugins/modules/elb_instance.py index c09ae0429bb..7acff77a5e8 100644 --- a/plugins/modules/elb_instance.py +++ b/plugins/modules/elb_instance.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: elb_instance diff --git a/plugins/modules/elb_network_lb.py b/plugins/modules/elb_network_lb.py index 44025cccb94..6e927496cc6 100644 --- a/plugins/modules/elb_network_lb.py +++ b/plugins/modules/elb_network_lb.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: elb_network_lb diff --git a/plugins/modules/elb_target.py b/plugins/modules/elb_target.py index 133419a1757..1cacc02e856 100644 --- a/plugins/modules/elb_target.py +++ b/plugins/modules/elb_target.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: elb_target diff --git a/plugins/modules/elb_target_group.py b/plugins/modules/elb_target_group.py index 18f9ca5e46b..b6943d1a6fd 100644 --- a/plugins/modules/elb_target_group.py +++ b/plugins/modules/elb_target_group.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: elb_target_group diff --git a/plugins/modules/elb_target_group_info.py b/plugins/modules/elb_target_group_info.py index d6a73d3307f..c7cae3ecac7 100644 --- a/plugins/modules/elb_target_group_info.py +++ b/plugins/modules/elb_target_group_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: elb_target_group_info diff --git a/plugins/modules/elb_target_info.py b/plugins/modules/elb_target_info.py index 92ab33ba945..e619e53b7e9 100644 --- a/plugins/modules/elb_target_info.py +++ b/plugins/modules/elb_target_info.py @@ -1,8 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2018, Yaakov Kuperman # GNU General Public License v3.0+ # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - DOCUMENTATION = ''' --- diff --git a/plugins/modules/glue_connection.py b/plugins/modules/glue_connection.py index 2e01b6fed32..b84f91aa808 100644 --- a/plugins/modules/glue_connection.py +++ b/plugins/modules/glue_connection.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: glue_connection diff --git a/plugins/modules/glue_crawler.py b/plugins/modules/glue_crawler.py index d5cdc04d6d5..ca115512a92 100644 --- a/plugins/modules/glue_crawler.py +++ b/plugins/modules/glue_crawler.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: glue_crawler diff --git a/plugins/modules/glue_job.py b/plugins/modules/glue_job.py index ea6e79180fc..8486d45bd1e 100644 --- a/plugins/modules/glue_job.py +++ b/plugins/modules/glue_job.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' --- module: glue_job diff --git a/plugins/modules/iam_access_key.py b/plugins/modules/iam_access_key.py index 32220a216e3..5d017b2f993 100644 --- a/plugins/modules/iam_access_key.py +++ b/plugins/modules/iam_access_key.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: iam_access_key diff --git a/plugins/modules/iam_access_key_info.py b/plugins/modules/iam_access_key_info.py index 9d7363b420a..12f1ddbb8e5 100644 --- a/plugins/modules/iam_access_key_info.py +++ b/plugins/modules/iam_access_key_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: iam_access_key_info diff --git a/plugins/modules/iam_group.py b/plugins/modules/iam_group.py index cedf41613eb..0e425f78564 100644 --- a/plugins/modules/iam_group.py +++ b/plugins/modules/iam_group.py @@ -1,22 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -from __future__ import absolute_import, division, print_function -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/iam_managed_policy.py b/plugins/modules/iam_managed_policy.py index eabf03b23d7..c0954f72669 100644 --- a/plugins/modules/iam_managed_policy.py +++ b/plugins/modules/iam_managed_policy.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: iam_managed_policy diff --git a/plugins/modules/iam_mfa_device_info.py b/plugins/modules/iam_mfa_device_info.py index 8b78eee02f9..0d551b2c247 100644 --- a/plugins/modules/iam_mfa_device_info.py +++ b/plugins/modules/iam_mfa_device_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: iam_mfa_device_info diff --git a/plugins/modules/iam_password_policy.py b/plugins/modules/iam_password_policy.py index 00b4f8872c0..6b67975ba53 100644 --- a/plugins/modules/iam_password_policy.py +++ b/plugins/modules/iam_password_policy.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: iam_password_policy diff --git a/plugins/modules/iam_role.py b/plugins/modules/iam_role.py index 255b4cb7964..b9a3c4c5e0e 100644 --- a/plugins/modules/iam_role.py +++ b/plugins/modules/iam_role.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = r''' --- diff --git a/plugins/modules/iam_role_info.py b/plugins/modules/iam_role_info.py index 23da3e04097..6e660381ebd 100644 --- a/plugins/modules/iam_role_info.py +++ b/plugins/modules/iam_role_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: iam_role_info diff --git a/plugins/modules/iam_saml_federation.py b/plugins/modules/iam_saml_federation.py index b20f44d3690..8e144edcdad 100644 --- a/plugins/modules/iam_saml_federation.py +++ b/plugins/modules/iam_saml_federation.py @@ -1,23 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = ''' --- diff --git a/plugins/modules/iam_server_certificate.py b/plugins/modules/iam_server_certificate.py index 4b8ee782ddb..5c14d762b1d 100644 --- a/plugins/modules/iam_server_certificate.py +++ b/plugins/modules/iam_server_certificate.py @@ -1,22 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -from __future__ import absolute_import, division, print_function -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = ''' --- diff --git a/plugins/modules/iam_server_certificate_info.py b/plugins/modules/iam_server_certificate_info.py index ac33a36f1a2..7a49225106a 100644 --- a/plugins/modules/iam_server_certificate_info.py +++ b/plugins/modules/iam_server_certificate_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: iam_server_certificate_info diff --git a/plugins/modules/inspector_target.py b/plugins/modules/inspector_target.py index 4bfe5b502d6..c8701e11ac5 100644 --- a/plugins/modules/inspector_target.py +++ b/plugins/modules/inspector_target.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2018 Dennis Conrad for Sainsbury's # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: inspector_target diff --git a/plugins/modules/kinesis_stream.py b/plugins/modules/kinesis_stream.py index 001fad26546..4c9718b9f5a 100644 --- a/plugins/modules/kinesis_stream.py +++ b/plugins/modules/kinesis_stream.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: kinesis_stream diff --git a/plugins/modules/lightsail.py b/plugins/modules/lightsail.py index 3b29fa0ba13..e0887113db5 100644 --- a/plugins/modules/lightsail.py +++ b/plugins/modules/lightsail.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: lightsail diff --git a/plugins/modules/lightsail_static_ip.py b/plugins/modules/lightsail_static_ip.py index dc956fd5337..ed658ca5abc 100644 --- a/plugins/modules/lightsail_static_ip.py +++ b/plugins/modules/lightsail_static_ip.py @@ -1,13 +1,9 @@ #!/usr/bin/python - # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: lightsail_static_ip diff --git a/plugins/modules/msk_cluster.py b/plugins/modules/msk_cluster.py index 8bd8f9bba13..1c8db45981b 100644 --- a/plugins/modules/msk_cluster.py +++ b/plugins/modules/msk_cluster.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2021, Daniil Kupchenko (@oukooveu) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type - - DOCUMENTATION = r""" --- module: msk_cluster diff --git a/plugins/modules/msk_config.py b/plugins/modules/msk_config.py index 7f7874b74d4..80a0900c1cd 100644 --- a/plugins/modules/msk_config.py +++ b/plugins/modules/msk_config.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2021, Daniil Kupchenko (@oukooveu) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type - - DOCUMENTATION = r""" --- module: msk_config diff --git a/plugins/modules/networkfirewall.py b/plugins/modules/networkfirewall.py index 9bb6ebb753e..8de51b59486 100644 --- a/plugins/modules/networkfirewall.py +++ b/plugins/modules/networkfirewall.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: networkfirewall short_description: manage AWS Network Firewall firewalls diff --git a/plugins/modules/networkfirewall_info.py b/plugins/modules/networkfirewall_info.py index 85df6b026ba..a436e9b6245 100644 --- a/plugins/modules/networkfirewall_info.py +++ b/plugins/modules/networkfirewall_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: networkfirewall_info short_description: describe AWS Network Firewall firewalls diff --git a/plugins/modules/networkfirewall_policy.py b/plugins/modules/networkfirewall_policy.py index 1026138a6b4..8ddb926e6d2 100644 --- a/plugins/modules/networkfirewall_policy.py +++ b/plugins/modules/networkfirewall_policy.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: networkfirewall_policy short_description: manage AWS Network Firewall policies diff --git a/plugins/modules/networkfirewall_policy_info.py b/plugins/modules/networkfirewall_policy_info.py index 1f170f5b304..1e5f1035e9c 100644 --- a/plugins/modules/networkfirewall_policy_info.py +++ b/plugins/modules/networkfirewall_policy_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: networkfirewall_policy_info short_description: describe AWS Network Firewall policies diff --git a/plugins/modules/networkfirewall_rule_group.py b/plugins/modules/networkfirewall_rule_group.py index c8e2ea38bd3..b1502b5f124 100644 --- a/plugins/modules/networkfirewall_rule_group.py +++ b/plugins/modules/networkfirewall_rule_group.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: networkfirewall_rule_group short_description: create, delete and modify AWS Network Firewall rule groups diff --git a/plugins/modules/networkfirewall_rule_group_info.py b/plugins/modules/networkfirewall_rule_group_info.py index a9cec3778bb..ddd570a1621 100644 --- a/plugins/modules/networkfirewall_rule_group_info.py +++ b/plugins/modules/networkfirewall_rule_group_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: networkfirewall_rule_group_info short_description: describe AWS Network Firewall rule groups diff --git a/plugins/modules/opensearch.py b/plugins/modules/opensearch.py index 7ed8c0722a2..ea7d9bd7048 100644 --- a/plugins/modules/opensearch.py +++ b/plugins/modules/opensearch.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = """ --- module: opensearch diff --git a/plugins/modules/opensearch_info.py b/plugins/modules/opensearch_info.py index 9ef4a1eac37..ad86a2a3fd7 100644 --- a/plugins/modules/opensearch_info.py +++ b/plugins/modules/opensearch_info.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = """ --- module: opensearch_info diff --git a/plugins/modules/redshift.py b/plugins/modules/redshift.py index f218e0a70c9..8b730fce444 100644 --- a/plugins/modules/redshift.py +++ b/plugins/modules/redshift.py @@ -1,13 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright 2014 Jens Carl, Hothead Games Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type - - DOCUMENTATION = r''' --- author: diff --git a/plugins/modules/redshift_cross_region_snapshots.py b/plugins/modules/redshift_cross_region_snapshots.py index be4a5cbb46d..7477e7bf2df 100644 --- a/plugins/modules/redshift_cross_region_snapshots.py +++ b/plugins/modules/redshift_cross_region_snapshots.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, JR Kerkstra # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: redshift_cross_region_snapshots diff --git a/plugins/modules/redshift_info.py b/plugins/modules/redshift_info.py index 2b94e313640..63c7339ca13 100644 --- a/plugins/modules/redshift_info.py +++ b/plugins/modules/redshift_info.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: redshift_info diff --git a/plugins/modules/redshift_subnet_group.py b/plugins/modules/redshift_subnet_group.py index 902cee75282..03b7e6d4abf 100644 --- a/plugins/modules/redshift_subnet_group.py +++ b/plugins/modules/redshift_subnet_group.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright 2014 Jens Carl, Hothead Games Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: redshift_subnet_group diff --git a/plugins/modules/s3_bucket_info.py b/plugins/modules/s3_bucket_info.py index b4f72dd55a0..69f888fbd6b 100644 --- a/plugins/modules/s3_bucket_info.py +++ b/plugins/modules/s3_bucket_info.py @@ -1,12 +1,8 @@ #!/usr/bin/python -""" -Copyright (c) 2017 Ansible Project -GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -""" - -from __future__ import absolute_import, division, print_function -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright (c) 2017 Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = ''' --- diff --git a/plugins/modules/s3_bucket_notification.py b/plugins/modules/s3_bucket_notification.py index fa0424b40c2..412a6e76a37 100644 --- a/plugins/modules/s3_bucket_notification.py +++ b/plugins/modules/s3_bucket_notification.py @@ -1,14 +1,10 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2021, Ansible Project # (c) 2019, XLAB d.o.o # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) - -__metaclass__ = type - - DOCUMENTATION = r''' --- module: s3_bucket_notification diff --git a/plugins/modules/s3_cors.py b/plugins/modules/s3_cors.py index e7dc16cbaa7..ee0cf3cd10e 100644 --- a/plugins/modules/s3_cors.py +++ b/plugins/modules/s3_cors.py @@ -1,11 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - DOCUMENTATION = r''' --- diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index 1bad5dbecf0..bee07282cd0 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: s3_lifecycle diff --git a/plugins/modules/s3_logging.py b/plugins/modules/s3_logging.py index 5e600582d9c..dfba34a110c 100644 --- a/plugins/modules/s3_logging.py +++ b/plugins/modules/s3_logging.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: s3_logging diff --git a/plugins/modules/s3_metrics_configuration.py b/plugins/modules/s3_metrics_configuration.py index d4c73e55267..cd17ab7a9cd 100644 --- a/plugins/modules/s3_metrics_configuration.py +++ b/plugins/modules/s3_metrics_configuration.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: s3_metrics_configuration diff --git a/plugins/modules/s3_sync.py b/plugins/modules/s3_sync.py index 19466f21f26..9b840468010 100644 --- a/plugins/modules/s3_sync.py +++ b/plugins/modules/s3_sync.py @@ -1,22 +1,8 @@ #!/usr/bin/python -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +# -*- coding: utf-8 -*- +# Copyright: Contributors to the Ansible project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DOCUMENTATION = ''' --- diff --git a/plugins/modules/s3_website.py b/plugins/modules/s3_website.py index f5ba78bf746..ec1a8716638 100644 --- a/plugins/modules/s3_website.py +++ b/plugins/modules/s3_website.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: s3_website diff --git a/plugins/modules/secretsmanager_secret.py b/plugins/modules/secretsmanager_secret.py index 870ed89059e..c86760cd176 100644 --- a/plugins/modules/secretsmanager_secret.py +++ b/plugins/modules/secretsmanager_secret.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # Copyright: (c) 2018, REY Remi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = r''' --- module: secretsmanager_secret diff --git a/plugins/modules/ses_identity.py b/plugins/modules/ses_identity.py index c68f3984c65..54b258a3f7c 100644 --- a/plugins/modules/ses_identity.py +++ b/plugins/modules/ses_identity.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ses_identity diff --git a/plugins/modules/ses_identity_policy.py b/plugins/modules/ses_identity_policy.py index 4aae1e933a9..68f21505c51 100644 --- a/plugins/modules/ses_identity_policy.py +++ b/plugins/modules/ses_identity_policy.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ses_identity_policy diff --git a/plugins/modules/ses_rule_set.py b/plugins/modules/ses_rule_set.py index 8dd85dfe35b..309282dd760 100644 --- a/plugins/modules/ses_rule_set.py +++ b/plugins/modules/ses_rule_set.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017, Ben Tomasik # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ses_rule_set diff --git a/plugins/modules/sns.py b/plugins/modules/sns.py index 798bf555318..652dcd220bf 100644 --- a/plugins/modules/sns.py +++ b/plugins/modules/sns.py @@ -4,10 +4,6 @@ # Copyright: (c) 2014, Michael J. Schultz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' module: sns short_description: Send Amazon Simple Notification Service messages diff --git a/plugins/modules/sns_topic.py b/plugins/modules/sns_topic.py index bcaf44a8840..04356e515a4 100644 --- a/plugins/modules/sns_topic.py +++ b/plugins/modules/sns_topic.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' module: sns_topic short_description: Manages AWS SNS topics and subscriptions diff --git a/plugins/modules/sns_topic_info.py b/plugins/modules/sns_topic_info.py index 6ff85ddd247..09e65280dab 100644 --- a/plugins/modules/sns_topic_info.py +++ b/plugins/modules/sns_topic_info.py @@ -1,12 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' module: sns_topic_info short_description: sns_topic_info module diff --git a/plugins/modules/sqs_queue.py b/plugins/modules/sqs_queue.py index b9cb0fa0f80..68738b35d7f 100644 --- a/plugins/modules/sqs_queue.py +++ b/plugins/modules/sqs_queue.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = r''' --- module: sqs_queue diff --git a/plugins/modules/ssm_parameter.py b/plugins/modules/ssm_parameter.py index d654d45ecf5..facd5a0acd6 100644 --- a/plugins/modules/ssm_parameter.py +++ b/plugins/modules/ssm_parameter.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: ssm_parameter diff --git a/plugins/modules/stepfunctions_state_machine.py b/plugins/modules/stepfunctions_state_machine.py index 8bab4f7fecd..082686264ce 100644 --- a/plugins/modules/stepfunctions_state_machine.py +++ b/plugins/modules/stepfunctions_state_machine.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2019, Tom De Keyser (@tdekeyser) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) - -__metaclass__ = type - - DOCUMENTATION = ''' --- module: stepfunctions_state_machine diff --git a/plugins/modules/stepfunctions_state_machine_execution.py b/plugins/modules/stepfunctions_state_machine_execution.py index 17273f8146c..334fd7190f4 100644 --- a/plugins/modules/stepfunctions_state_machine_execution.py +++ b/plugins/modules/stepfunctions_state_machine_execution.py @@ -1,12 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2019, Prasad Katti (@prasadkatti) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) - -__metaclass__ = type - - DOCUMENTATION = ''' --- module: stepfunctions_state_machine_execution diff --git a/plugins/modules/storagegateway_info.py b/plugins/modules/storagegateway_info.py index 252c13f87ca..356dccb1a14 100644 --- a/plugins/modules/storagegateway_info.py +++ b/plugins/modules/storagegateway_info.py @@ -1,13 +1,11 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: (c) 2018, Loic BLOT (@nerzhul) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # This module is sponsored by E.T.A.I. (www.etai.fr) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' --- module: storagegateway_info diff --git a/plugins/modules/sts_assume_role.py b/plugins/modules/sts_assume_role.py index fe29cd3c62a..cd50aeda72a 100644 --- a/plugins/modules/sts_assume_role.py +++ b/plugins/modules/sts_assume_role.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: sts_assume_role diff --git a/plugins/modules/sts_session_token.py b/plugins/modules/sts_session_token.py index 77e89f79687..1fa363020fc 100644 --- a/plugins/modules/sts_session_token.py +++ b/plugins/modules/sts_session_token.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - DOCUMENTATION = ''' --- module: sts_session_token diff --git a/plugins/modules/waf_condition.py b/plugins/modules/waf_condition.py index 2f9f16d116a..1ba8ef13e2b 100644 --- a/plugins/modules/waf_condition.py +++ b/plugins/modules/waf_condition.py @@ -1,12 +1,10 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Will Thames # Copyright (c) 2015 Mike Mochan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' module: waf_condition short_description: Create and delete WAF Conditions diff --git a/plugins/modules/waf_info.py b/plugins/modules/waf_info.py index a69d9793348..4a0a38f92d1 100644 --- a/plugins/modules/waf_info.py +++ b/plugins/modules/waf_info.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = ''' module: waf_info short_description: Retrieve information for WAF ACLs, Rules, Conditions and Filters diff --git a/plugins/modules/waf_rule.py b/plugins/modules/waf_rule.py index 116ba87ceb9..cd8612f7b33 100644 --- a/plugins/modules/waf_rule.py +++ b/plugins/modules/waf_rule.py @@ -1,12 +1,10 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Will Thames # Copyright (c) 2015 Mike Mochan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' module: waf_rule short_description: Create and delete WAF Rules diff --git a/plugins/modules/waf_web_acl.py b/plugins/modules/waf_web_acl.py index a6f84aa23db..a7254786190 100644 --- a/plugins/modules/waf_web_acl.py +++ b/plugins/modules/waf_web_acl.py @@ -1,11 +1,9 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - - DOCUMENTATION = r''' module: waf_web_acl short_description: Create and delete WAF Web ACLs diff --git a/plugins/modules/wafv2_ip_set.py b/plugins/modules/wafv2_ip_set.py index 83375c89002..13a58a27355 100644 --- a/plugins/modules/wafv2_ip_set.py +++ b/plugins/modules/wafv2_ip_set.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- diff --git a/plugins/modules/wafv2_ip_set_info.py b/plugins/modules/wafv2_ip_set_info.py index e800ed0b499..58d1920cc07 100644 --- a/plugins/modules/wafv2_ip_set_info.py +++ b/plugins/modules/wafv2_ip_set_info.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- diff --git a/plugins/modules/wafv2_resources.py b/plugins/modules/wafv2_resources.py index db59b91197b..5c69151ca35 100644 --- a/plugins/modules/wafv2_resources.py +++ b/plugins/modules/wafv2_resources.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- diff --git a/plugins/modules/wafv2_resources_info.py b/plugins/modules/wafv2_resources_info.py index 4833d7657f1..e2874b1ef0e 100644 --- a/plugins/modules/wafv2_resources_info.py +++ b/plugins/modules/wafv2_resources_info.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- diff --git a/plugins/modules/wafv2_rule_group.py b/plugins/modules/wafv2_rule_group.py index e2751b9b438..098afbf43f3 100644 --- a/plugins/modules/wafv2_rule_group.py +++ b/plugins/modules/wafv2_rule_group.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- diff --git a/plugins/modules/wafv2_rule_group_info.py b/plugins/modules/wafv2_rule_group_info.py index b59d4d613f4..eb407ed7743 100644 --- a/plugins/modules/wafv2_rule_group_info.py +++ b/plugins/modules/wafv2_rule_group_info.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- diff --git a/plugins/modules/wafv2_web_acl.py b/plugins/modules/wafv2_web_acl.py index e5770cd7439..449cc4433cf 100644 --- a/plugins/modules/wafv2_web_acl.py +++ b/plugins/modules/wafv2_web_acl.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- diff --git a/plugins/modules/wafv2_web_acl_info.py b/plugins/modules/wafv2_web_acl_info.py index 649cf10b884..832b7b358fa 100644 --- a/plugins/modules/wafv2_web_acl_info.py +++ b/plugins/modules/wafv2_web_acl_info.py @@ -1,9 +1,8 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - DOCUMENTATION = ''' --- From 80f40f86d25b39053d1dcbbbee7b5491550d5155 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 6 Mar 2023 15:37:42 +0100 Subject: [PATCH 2/7] DOCS1 --- plugins/connection/aws_ssm.py | 8 ++++---- .../modules/accessanalyzer_validate_policy_info.py | 12 ++++++------ plugins/modules/acm_certificate.py | 12 ++++++------ plugins/modules/acm_certificate_info.py | 12 ++++++------ plugins/modules/api_gateway.py | 12 ++++++------ plugins/modules/api_gateway_domain.py | 12 ++++++------ plugins/modules/application_autoscaling_policy.py | 12 ++++++------ .../autoscaling_complete_lifecycle_action.py | 12 ++++++------ plugins/modules/autoscaling_instance_refresh.py | 12 ++++++------ .../modules/autoscaling_instance_refresh_info.py | 12 ++++++------ plugins/modules/autoscaling_launch_config.py | 12 ++++++------ plugins/modules/autoscaling_launch_config_find.py | 12 ++++++------ plugins/modules/autoscaling_launch_config_info.py | 12 ++++++------ plugins/modules/autoscaling_lifecycle_hook.py | 12 ++++++------ plugins/modules/autoscaling_policy.py | 12 ++++++------ plugins/modules/autoscaling_scheduled_action.py | 13 +++++++------ plugins/modules/aws_region_info.py | 12 ++++++------ plugins/modules/batch_compute_environment.py | 12 ++++++------ plugins/modules/batch_job_definition.py | 12 ++++++------ plugins/modules/batch_job_queue.py | 12 ++++++------ plugins/modules/cloudformation_exports_info.py | 12 ++++++------ plugins/modules/cloudformation_stack_set.py | 12 ++++++------ plugins/modules/cloudfront_distribution.py | 12 ++++++------ plugins/modules/cloudfront_distribution_info.py | 12 ++++++------ plugins/modules/cloudfront_invalidation.py | 12 ++++++------ .../modules/cloudfront_origin_access_identity.py | 12 ++++++------ .../modules/cloudfront_response_headers_policy.py | 12 ++++++------ plugins/modules/codebuild_project.py | 12 ++++++------ plugins/modules/codecommit_repository.py | 12 ++++++------ plugins/modules/codepipeline.py | 12 ++++++------ plugins/modules/config_aggregation_authorization.py | 10 +++++----- plugins/modules/config_aggregator.py | 10 +++++----- plugins/modules/config_delivery_channel.py | 10 +++++----- plugins/modules/config_recorder.py | 10 +++++----- plugins/modules/config_rule.py | 10 +++++----- plugins/modules/data_pipeline.py | 12 ++++++------ plugins/modules/directconnect_confirm_connection.py | 12 ++++++------ plugins/modules/directconnect_connection.py | 8 ++++---- plugins/modules/directconnect_gateway.py | 12 ++++++------ .../modules/directconnect_link_aggregation_group.py | 8 ++++---- plugins/modules/directconnect_virtual_interface.py | 12 ++++++------ plugins/modules/dms_endpoint.py | 12 ++++++------ plugins/modules/dms_replication_subnet_group.py | 10 +++++----- plugins/modules/dynamodb_table.py | 12 ++++++------ plugins/modules/dynamodb_ttl.py | 12 ++++++------ plugins/modules/ec2_ami_copy.py | 12 ++++++------ plugins/modules/ec2_customer_gateway.py | 12 ++++++------ plugins/modules/ec2_customer_gateway_info.py | 13 +++++++------ plugins/modules/ec2_launch_template.py | 13 +++++++------ plugins/modules/ec2_placement_group.py | 12 ++++++------ plugins/modules/ec2_placement_group_info.py | 12 ++++++------ plugins/modules/ec2_snapshot_copy.py | 12 ++++++------ plugins/modules/ec2_transit_gateway.py | 12 ++++++------ plugins/modules/ec2_transit_gateway_info.py | 12 ++++++------ .../modules/ec2_transit_gateway_vpc_attachment.py | 12 ++++++------ .../ec2_transit_gateway_vpc_attachment_info.py | 12 ++++++------ plugins/modules/ec2_vpc_egress_igw.py | 12 ++++++------ plugins/modules/ec2_vpc_nacl.py | 12 ++++++------ plugins/modules/ec2_vpc_nacl_info.py | 12 ++++++------ plugins/modules/ec2_vpc_peer.py | 12 ++++++------ plugins/modules/ec2_vpc_peering_info.py | 12 ++++++------ plugins/modules/ec2_vpc_vgw.py | 12 ++++++------ plugins/modules/ec2_vpc_vgw_info.py | 12 ++++++------ plugins/modules/ec2_vpc_vpn.py | 4 ++-- plugins/modules/ec2_vpc_vpn_info.py | 13 +++++++------ plugins/modules/ec2_win_password.py | 9 +++++---- plugins/modules/ecs_attribute.py | 12 ++++++------ plugins/modules/ecs_cluster.py | 12 ++++++------ plugins/modules/ecs_ecr.py | 12 ++++++------ plugins/modules/ecs_service.py | 13 +++++++------ plugins/modules/ecs_service_info.py | 12 ++++++------ plugins/modules/ecs_tag.py | 12 ++++++------ plugins/modules/ecs_task.py | 12 ++++++------ plugins/modules/ecs_taskdefinition.py | 12 ++++++------ plugins/modules/ecs_taskdefinition_info.py | 12 ++++++------ plugins/modules/efs.py | 12 ++++++------ plugins/modules/efs_info.py | 12 ++++++------ plugins/modules/efs_tag.py | 12 ++++++------ plugins/modules/eks_cluster.py | 12 ++++++------ plugins/modules/eks_fargate_profile.py | 12 ++++++------ plugins/modules/eks_nodegroup.py | 12 ++++++------ plugins/modules/elasticache.py | 4 ++-- plugins/modules/elasticache_info.py | 12 ++++++------ plugins/modules/elasticache_parameter_group.py | 8 ++++---- plugins/modules/elasticache_snapshot.py | 8 ++++---- plugins/modules/elasticache_subnet_group.py | 12 ++++++------ plugins/modules/elasticbeanstalk_app.py | 12 ++++++------ plugins/modules/elb_classic_lb_info.py | 12 ++++++------ plugins/modules/elb_instance.py | 8 ++++---- plugins/modules/elb_network_lb.py | 12 ++++++------ plugins/modules/elb_target.py | 12 ++++++------ plugins/modules/elb_target_group.py | 12 ++++++------ plugins/modules/elb_target_group_info.py | 12 ++++++------ plugins/modules/elb_target_info.py | 8 ++++---- plugins/modules/glue_connection.py | 13 +++++++------ plugins/modules/glue_crawler.py | 12 ++++++------ plugins/modules/glue_job.py | 13 +++++++------ plugins/modules/iam_access_key.py | 12 ++++++------ plugins/modules/iam_access_key_info.py | 12 ++++++------ plugins/modules/iam_group.py | 12 ++++++------ plugins/modules/iam_managed_policy.py | 12 ++++++------ plugins/modules/iam_mfa_device_info.py | 10 +++++----- plugins/modules/iam_password_policy.py | 10 +++++----- plugins/modules/iam_role.py | 12 ++++++------ plugins/modules/iam_role_info.py | 12 ++++++------ plugins/modules/iam_saml_federation.py | 12 ++++++------ plugins/modules/iam_server_certificate.py | 8 ++++---- plugins/modules/iam_server_certificate_info.py | 12 ++++++------ plugins/modules/inspector_target.py | 12 ++++++------ plugins/modules/kinesis_stream.py | 12 ++++++------ plugins/modules/lightsail.py | 12 ++++++------ plugins/modules/lightsail_static_ip.py | 12 ++++++------ plugins/modules/networkfirewall.py | 12 ++++++------ plugins/modules/networkfirewall_info.py | 12 ++++++------ plugins/modules/networkfirewall_policy.py | 12 ++++++------ plugins/modules/networkfirewall_policy_info.py | 12 ++++++------ plugins/modules/networkfirewall_rule_group.py | 12 ++++++------ plugins/modules/networkfirewall_rule_group_info.py | 12 ++++++------ plugins/modules/opensearch.py | 4 ++-- plugins/modules/opensearch_info.py | 10 +++++----- plugins/modules/redshift.py | 12 ++++++------ plugins/modules/redshift_cross_region_snapshots.py | 10 +++++----- plugins/modules/redshift_info.py | 12 ++++++------ plugins/modules/redshift_subnet_group.py | 12 ++++++------ plugins/modules/s3_bucket_info.py | 12 ++++++------ plugins/modules/s3_bucket_notification.py | 12 ++++++------ plugins/modules/s3_cors.py | 12 ++++++------ plugins/modules/s3_lifecycle.py | 9 +++++---- plugins/modules/s3_logging.py | 8 ++++---- plugins/modules/s3_metrics_configuration.py | 8 ++++---- plugins/modules/s3_sync.py | 13 +++++++------ plugins/modules/s3_website.py | 12 ++++++------ plugins/modules/secretsmanager_secret.py | 12 ++++++------ plugins/modules/ses_identity.py | 12 ++++++------ plugins/modules/ses_identity_policy.py | 12 ++++++------ plugins/modules/ses_rule_set.py | 8 ++++---- plugins/modules/sns.py | 8 ++++---- plugins/modules/sns_topic.py | 8 ++++---- plugins/modules/sns_topic_info.py | 12 ++++++------ plugins/modules/sqs_queue.py | 12 ++++++------ plugins/modules/ssm_parameter.py | 12 ++++++------ plugins/modules/stepfunctions_state_machine.py | 12 ++++++------ .../stepfunctions_state_machine_execution.py | 12 ++++++------ plugins/modules/storagegateway_info.py | 12 ++++++------ plugins/modules/sts_assume_role.py | 12 ++++++------ plugins/modules/sts_session_token.py | 10 +++++----- plugins/modules/waf_condition.py | 12 ++++++------ plugins/modules/waf_info.py | 12 ++++++------ plugins/modules/waf_rule.py | 12 ++++++------ plugins/modules/waf_web_acl.py | 12 ++++++------ plugins/modules/wafv2_ip_set.py | 10 +++++----- plugins/modules/wafv2_ip_set_info.py | 10 +++++----- plugins/modules/wafv2_resources.py | 10 +++++----- plugins/modules/wafv2_resources_info.py | 10 +++++----- plugins/modules/wafv2_rule_group.py | 10 +++++----- plugins/modules/wafv2_rule_group_info.py | 10 +++++----- plugins/modules/wafv2_web_acl.py | 10 +++++----- plugins/modules/wafv2_web_acl_info.py | 10 +++++----- 158 files changed, 897 insertions(+), 887 deletions(-) diff --git a/plugins/connection/aws_ssm.py b/plugins/connection/aws_ssm.py index f717584d361..cdf4bf70522 100644 --- a/plugins/connection/aws_ssm.py +++ b/plugins/connection/aws_ssm.py @@ -5,7 +5,7 @@ # Based on the ssh connection plugin by Michael DeHaan -DOCUMENTATION = ''' +DOCUMENTATION = """ name: aws_ssm author: - Pat Sharkey (@psharkey) @@ -127,9 +127,9 @@ version_added: 5.2.0 vars: - name: ansible_aws_ssm_s3_addressing_style -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Wait for SSM Agent to be available on the Instance - name: Wait for connection to be available @@ -260,7 +260,7 @@ yum: name: nginx state: present -''' +""" import os import getpass diff --git a/plugins/modules/accessanalyzer_validate_policy_info.py b/plugins/modules/accessanalyzer_validate_policy_info.py index c5d1fc4db9f..8bba658150a 100644 --- a/plugins/modules/accessanalyzer_validate_policy_info.py +++ b/plugins/modules/accessanalyzer_validate_policy_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: accessanalyzer_validate_policy_info version_added: 5.0.0 @@ -64,16 +64,16 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Validate a policy - name: Validate a simple IAM policy community.aws.accessanalyzer_validate_policy_info: policy: "{{ lookup('template', 'managed_policy.json.j2') }}" -''' +""" -RETURN = r''' +RETURN = r""" findings: description: The list of findings in a policy returned by IAM Access Analyzer based on its suite of policy checks. returned: success @@ -158,7 +158,7 @@ description: The offset within the policy that corresponds to the position, starting from C(0). type: int returned: success -''' +""" try: import botocore diff --git a/plugins/modules/acm_certificate.py b/plugins/modules/acm_certificate.py index f9e52fd6a0b..fe6978939b4 100644 --- a/plugins/modules/acm_certificate.py +++ b/plugins/modules/acm_certificate.py @@ -8,7 +8,7 @@ # - Matthew Davis # on behalf of Telstra Corporation Limited -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: acm_certificate short_description: Upload and delete certificates in the AWS Certificate Manager service @@ -162,9 +162,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: upload a self-signed certificate community.aws.aws_acm: @@ -213,9 +213,9 @@ Application: search Environment: development purge_tags: true -''' +""" -RETURN = ''' +RETURN = r""" certificate: description: Information about the certificate which was uploaded type: complex @@ -238,7 +238,7 @@ returned: when I(state=absent) sample: - "arn:aws:acm:ap-southeast-2:123456789012:certificate/01234567-abcd-abcd-abcd-012345678901" -''' +""" import base64 diff --git a/plugins/modules/acm_certificate_info.py b/plugins/modules/acm_certificate_info.py index d713e87a1a0..6b5b428ffe6 100644 --- a/plugins/modules/acm_certificate_info.py +++ b/plugins/modules/acm_certificate_info.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: acm_certificate_info short_description: Retrieve certificate information from AWS Certificate Manager service version_added: 1.0.0 @@ -44,9 +44,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: obtain all ACM certificates community.aws.aws_acm_info: @@ -71,9 +71,9 @@ community.aws.aws_acm_info: certificate_arn: "arn:aws:acm:ap-southeast-2:123456789012:certificate/abcdeabc-abcd-1234-4321-abcdeabcde12" -''' +""" -RETURN = r''' +RETURN = r""" certificates: description: A list of certificates returned: always @@ -255,7 +255,7 @@ returned: always sample: AMAZON_ISSUED type: str -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.acm import ACMServiceManager diff --git a/plugins/modules/api_gateway.py b/plugins/modules/api_gateway.py index 8b2dba83faa..6f45d3104a0 100644 --- a/plugins/modules/api_gateway.py +++ b/plugins/modules/api_gateway.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: api_gateway version_added: 1.0.0 @@ -110,9 +110,9 @@ ID so that an API can be created only once. - As an early work around an intermediate version will probably do the same using a tag embedded in the API name. -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Setup AWS API Gateway setup on AWS and deploy API definition community.aws.api_gateway: swagger_file: my_api.yml @@ -141,9 +141,9 @@ cache_size: '6.1' canary_settings: { percentTraffic: 50.0, deploymentId: '123', useStageCache: True } state: present -''' +""" -RETURN = ''' +RETURN = r""" api_id: description: API id of the API endpoint created returned: success @@ -164,7 +164,7 @@ returned: always type: list sample: ["apigateway:CreateRestApi", "apigateway:CreateDeployment", "apigateway:PutRestApi"] -''' +""" import json import traceback diff --git a/plugins/modules/api_gateway_domain.py b/plugins/modules/api_gateway_domain.py index 18801ff2f55..63a8b4e428e 100644 --- a/plugins/modules/api_gateway_domain.py +++ b/plugins/modules/api_gateway_domain.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: api_gateway_domain short_description: Manage AWS API Gateway custom domains @@ -63,9 +63,9 @@ - Does not create a DNS entry on Route53, for that use the M(community.aws.route53) module. - Only supports TLS certificates from AWS ACM that can just be referenced by the ARN, while the AWS API still offers (deprecated) options to add own Certificates. -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Setup endpoint for a custom domain for your API Gateway HTTP API community.aws.api_gateway_domain: domain_name: myapi.foobar.com @@ -86,9 +86,9 @@ zone: foobar.com alias_hosted_zone_id: "{{ api_gw_domain_result.response.domain.distribution_hosted_zone_id }}" command: create -''' +""" -RETURN = ''' +RETURN = r""" response: description: The data returned by create_domain_name (or update and delete) and create_base_path_mapping methods by boto3. returned: success @@ -108,7 +108,7 @@ path_mappings: [ { base_path: '(empty)', rest_api_id: 'abcd123', stage: 'production' } ] -''' +""" try: from botocore.exceptions import ClientError, BotoCoreError, EndpointConnectionError diff --git a/plugins/modules/application_autoscaling_policy.py b/plugins/modules/application_autoscaling_policy.py index 24fc953ceff..e44925e827d 100644 --- a/plugins/modules/application_autoscaling_policy.py +++ b/plugins/modules/application_autoscaling_policy.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: application_autoscaling_policy version_added: 1.0.0 @@ -105,9 +105,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Create step scaling policy for ECS Service @@ -158,9 +158,9 @@ service_namespace: ecs resource_id: service/cluster-name/service-name scalable_dimension: ecs:service:DesiredCount -''' +""" -RETURN = ''' +RETURN = r""" alarms: description: List of the CloudWatch alarms associated with the scaling policy returned: when state present @@ -281,7 +281,7 @@ returned: when state present type: str sample: '2017-09-28T08:22:51.881000-03:00' -''' # NOQA +""" # NOQA from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import _camel_to_snake, camel_dict_to_snake_dict diff --git a/plugins/modules/autoscaling_complete_lifecycle_action.py b/plugins/modules/autoscaling_complete_lifecycle_action.py index 06cfbcac266..98dd48c1c18 100644 --- a/plugins/modules/autoscaling_complete_lifecycle_action.py +++ b/plugins/modules/autoscaling_complete_lifecycle_action.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: autoscaling_complete_lifecycle_action short_description: Completes the lifecycle action of an instance @@ -39,9 +39,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Complete the lifecycle action - aws_asg_complete_lifecycle_action: @@ -49,16 +49,16 @@ lifecycle_hook_name: my-lifecycle-hook lifecycle_action_result: CONTINUE instance_id: i-123knm1l2312 -''' +""" -RETURN = ''' +RETURN = r""" --- status: description: How things went returned: success type: str sample: ["OK"] -''' +""" try: import botocore diff --git a/plugins/modules/autoscaling_instance_refresh.py b/plugins/modules/autoscaling_instance_refresh.py index fcd1209e1e4..5c44352f13f 100644 --- a/plugins/modules/autoscaling_instance_refresh.py +++ b/plugins/modules/autoscaling_instance_refresh.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: autoscaling_instance_refresh version_added: 3.2.0 @@ -62,9 +62,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Start a refresh @@ -85,9 +85,9 @@ min_healthy_percentage: 91 instance_warmup: 60 -''' +""" -RETURN = ''' +RETURN = r""" --- instance_refresh_id: description: instance refresh id @@ -135,7 +135,7 @@ returned: success type: int sample: 5 -''' +""" try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/autoscaling_instance_refresh_info.py b/plugins/modules/autoscaling_instance_refresh_info.py index b7cf0129f91..bf2e58f48d7 100644 --- a/plugins/modules/autoscaling_instance_refresh_info.py +++ b/plugins/modules/autoscaling_instance_refresh_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: autoscaling_instance_refresh_info version_added: 3.2.0 @@ -40,9 +40,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Find an refresh by ASG name @@ -66,9 +66,9 @@ name: somename-asg next_token: 'some-token-123' register: asgs -''' +""" -RETURN = ''' +RETURN = r""" --- instance_refresh_id: description: instance refresh id @@ -116,7 +116,7 @@ returned: success type: int sample: 5 -''' +""" try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/autoscaling_launch_config.py b/plugins/modules/autoscaling_launch_config.py index 5735be4992a..c7b145aad06 100644 --- a/plugins/modules/autoscaling_launch_config.py +++ b/plugins/modules/autoscaling_launch_config.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: autoscaling_launch_config version_added: 1.0.0 @@ -183,9 +183,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: create a launch configuration with an encrypted volume community.aws.autoscaling_launch_config: @@ -251,9 +251,9 @@ security_groups: "['sg-xxxx']" volumes: "{{ volumes }}" register: lc_info -''' +""" -RETURN = r''' +RETURN = r""" arn: description: The Amazon Resource Name of the launch configuration. returned: when I(state=present) @@ -437,7 +437,7 @@ type: list sample: - sg-5e27db2f -''' +""" import traceback diff --git a/plugins/modules/autoscaling_launch_config_find.py b/plugins/modules/autoscaling_launch_config_find.py index 3194cc8131d..6b96d4677e8 100644 --- a/plugins/modules/autoscaling_launch_config_find.py +++ b/plugins/modules/autoscaling_launch_config_find.py @@ -4,7 +4,7 @@ # (c) 2015, Jose Armesto # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: autoscaling_launch_config_find version_added: 1.0.0 @@ -39,9 +39,9 @@ - amazon.aws.ec2 - amazon.aws.aws - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Search for the Launch Configurations that start with "app" @@ -49,9 +49,9 @@ name_regex: app.* sort_order: descending limit: 2 -''' +""" -RETURN = ''' +RETURN = r""" image_id: description: AMI id returned: when Launch Configuration was found @@ -128,7 +128,7 @@ type: bool sample: True ... -''' +""" import re try: diff --git a/plugins/modules/autoscaling_launch_config_info.py b/plugins/modules/autoscaling_launch_config_info.py index 37635dafae6..74040c2840b 100644 --- a/plugins/modules/autoscaling_launch_config_info.py +++ b/plugins/modules/autoscaling_launch_config_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: autoscaling_launch_config_info version_added: 1.0.0 @@ -48,9 +48,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Gather information about all launch configurations @@ -64,9 +64,9 @@ community.aws.autoscaling_launch_config_info: sort: created_time sort_order: descending -''' +""" -RETURN = r''' +RETURN = r""" block_device_mapping: description: Block device mapping for the instances of launch configuration. type: list @@ -146,7 +146,7 @@ description: User data available. type: str returned: always -''' +""" try: import botocore diff --git a/plugins/modules/autoscaling_lifecycle_hook.py b/plugins/modules/autoscaling_lifecycle_hook.py index 50e0ff93d01..d4dc927e77a 100644 --- a/plugins/modules/autoscaling_lifecycle_hook.py +++ b/plugins/modules/autoscaling_lifecycle_hook.py @@ -4,7 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: autoscaling_lifecycle_hook version_added: 1.0.0 @@ -74,9 +74,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create / Update lifecycle hook community.aws.autoscaling_lifecycle_hook: region: eu-central-1 @@ -93,9 +93,9 @@ state: absent autoscaling_group_name: example lifecycle_hook_name: example -''' +""" -RETURN = ''' +RETURN = r""" --- auto_scaling_group_name: description: The unique name of the auto scaling group. @@ -127,7 +127,7 @@ returned: success type: str sample: "autoscaling:EC2_INSTANCE_LAUNCHING" -''' +""" try: diff --git a/plugins/modules/autoscaling_policy.py b/plugins/modules/autoscaling_policy.py index 78a05dfb849..970bd66b19e 100644 --- a/plugins/modules/autoscaling_policy.py +++ b/plugins/modules/autoscaling_policy.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: autoscaling_policy short_description: Create or delete AWS scaling policies for Autoscaling groups version_added: 1.0.0 @@ -190,8 +190,8 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' -EXAMPLES = ''' +""" +EXAMPLES = r""" - name: Simple Scale Down policy community.aws.autoscaling_policy: state: present @@ -259,9 +259,9 @@ target_value: 98.0 asg_name: asg-test-1 register: result -''' +""" -RETURN = ''' +RETURN = r""" adjustment_type: description: Scaling policy adjustment type. returned: always @@ -347,7 +347,7 @@ returned: always type: int sample: 50 -''' +""" try: import botocore diff --git a/plugins/modules/autoscaling_scheduled_action.py b/plugins/modules/autoscaling_scheduled_action.py index 42a7fde804e..ac51a3f87b5 100644 --- a/plugins/modules/autoscaling_scheduled_action.py +++ b/plugins/modules/autoscaling_scheduled_action.py @@ -7,7 +7,7 @@ # Based off of https://github.com/mmochan/ansible-aws-ec2-asg-scheduled-actions/blob/master/library/ec2_asg_scheduled_action.py # (c) 2016, Mike Mochan <@mmochan> -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: autoscaling_scheduled_action version_added: 2.2.0 @@ -70,9 +70,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Create a scheduled action for a autoscaling group. - name: Create a minimal scheduled action for autoscaling group community.aws.autoscaling_scheduled_action: @@ -106,9 +106,9 @@ autoscaling_group_name: test_asg scheduled_action_name: test_scheduled_action state: absent -''' +""" -RETURN = r''' +RETURN = r""" scheduled_action_name: description: The name of the scheduled action. returned: when I(state=present) @@ -149,7 +149,7 @@ returned: when I(state=present) type: int sample: 1 -''' +""" try: import botocore @@ -158,6 +158,7 @@ try: from dateutil.parser import parse as timedate_parse + HAS_DATEUTIL = True except ImportError: HAS_DATEUTIL = False diff --git a/plugins/modules/aws_region_info.py b/plugins/modules/aws_region_info.py index 56df747dedc..d386b1fba0e 100644 --- a/plugins/modules/aws_region_info.py +++ b/plugins/modules/aws_region_info.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: aws_region_info short_description: Gather information about AWS regions version_added: 1.0.0 @@ -27,9 +27,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Gather information about all regions @@ -39,9 +39,9 @@ - community.aws.aws_region_info: filters: region-name: eu-west-1 -''' +""" -RETURN = ''' +RETURN = r""" regions: returned: on success description: > @@ -52,7 +52,7 @@ 'endpoint': 'ec2.us-west-1.amazonaws.com', 'region_name': 'us-west-1' }]" -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry diff --git a/plugins/modules/batch_compute_environment.py b/plugins/modules/batch_compute_environment.py index 1e9cbb35f36..b98c7c358df 100644 --- a/plugins/modules/batch_compute_environment.py +++ b/plugins/modules/batch_compute_environment.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Jon Meran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: batch_compute_environment version_added: 1.0.0 @@ -121,9 +121,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: My Batch Compute Environment community.aws.batch_compute_environment: compute_environment_name: computeEnvironmentName @@ -153,9 +153,9 @@ - name: show results ansible.builtin.debug: var: aws_batch_compute_environment_action -''' +""" -RETURN = r''' +RETURN = r""" --- output: description: "returns what action was taken, whether something was changed, invocation and response" @@ -220,7 +220,7 @@ statusReason: "ComputeEnvironment Healthy" type: MANAGED type: dict -''' +""" import re from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/batch_job_definition.py b/plugins/modules/batch_job_definition.py index 5a8c1fb6da9..2f231db67ce 100644 --- a/plugins/modules/batch_job_definition.py +++ b/plugins/modules/batch_job_definition.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Jon Meran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: batch_job_definition version_added: 1.0.0 @@ -180,9 +180,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" --- - name: My Batch Job Definition community.aws.batch_job_definition: @@ -205,9 +205,9 @@ - name: show results ansible.builtin.debug: var=job_definition_create_result -''' +""" -RETURN = r''' +RETURN = r""" --- output: description: "returns what action was taken, whether something was changed, invocation and response" @@ -221,7 +221,7 @@ status: INACTIVE type: container type: dict -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.batch import cc, set_api_params from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/batch_job_queue.py b/plugins/modules/batch_job_queue.py index 98ba7b8d2f1..fe4ae6c0210 100644 --- a/plugins/modules/batch_job_queue.py +++ b/plugins/modules/batch_job_queue.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Jon Meran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: batch_job_queue version_added: 1.0.0 @@ -64,9 +64,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: My Batch Job Queue community.aws.batch_job_queue: job_queue_name: jobQueueName @@ -84,9 +84,9 @@ - name: show results ansible.builtin.debug: var: batch_job_queue_action -''' +""" -RETURN = r''' +RETURN = r""" --- output: description: "returns what action was taken, whether something was changed, invocation and response" @@ -102,7 +102,7 @@ status: UPDATING status_reason: "JobQueue Healthy" type: dict -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.batch import set_api_params from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/cloudformation_exports_info.py b/plugins/modules/cloudformation_exports_info.py index 3f979a35bb2..cc89559d2e1 100644 --- a/plugins/modules/cloudformation_exports_info.py +++ b/plugins/modules/cloudformation_exports_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: cloudformation_exports_info short_description: Read a value from CloudFormation Exports version_added: 1.0.0 @@ -16,9 +16,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Get Exports community.aws.cloudformation_exports_info: profile: 'my_aws_profile' @@ -26,14 +26,14 @@ register: cf_exports - ansible.builtin.debug: msg: "{{ cf_exports }}" -''' +""" -RETURN = ''' +RETURN = r""" export_items: description: A dictionary of Exports items names and values. returned: Always type: dict -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry diff --git a/plugins/modules/cloudformation_stack_set.py b/plugins/modules/cloudformation_stack_set.py index edd18886990..6bb93b453da 100644 --- a/plugins/modules/cloudformation_stack_set.py +++ b/plugins/modules/cloudformation_stack_set.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: cloudformation_stack_set version_added: 1.0.0 @@ -172,9 +172,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Create a stack set with instances in two accounts community.aws.cloudformation_stack_set: name: my-stack @@ -211,9 +211,9 @@ accounts: [1234567890, 2345678901] regions: - us-east-1 -''' +""" -RETURN = r''' +RETURN = r""" operations_log: type: list description: Most recent events in CloudFormation's event log. This may be from a previous run in some cases. @@ -292,7 +292,7 @@ Type: "AWS::SNS::Topic" Properties: {} -''' # NOQA +""" # NOQA import datetime import itertools diff --git a/plugins/modules/cloudfront_distribution.py b/plugins/modules/cloudfront_distribution.py index dc1a6fad91d..41927e79284 100644 --- a/plugins/modules/cloudfront_distribution.py +++ b/plugins/modules/cloudfront_distribution.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- version_added: 1.0.0 @@ -595,9 +595,9 @@ default: 1800 type: int -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: create a basic distribution with defaults and tags community.aws.cloudfront_distribution: state: present @@ -687,9 +687,9 @@ community.aws.cloudfront_distribution: state: absent caller_reference: replaceable distribution -''' +""" -RETURN = r''' +RETURN = r""" active_trusted_signers: description: Key pair IDs that CloudFront is aware of for each trusted signer. returned: always @@ -1412,7 +1412,7 @@ returned: always type: str sample: abcd1234-1234-abcd-abcd-abcd12345678 -''' +""" from ansible.module_utils._text import to_text, to_native from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/cloudfront_distribution_info.py b/plugins/modules/cloudfront_distribution_info.py index ca145a1a246..657255c86fb 100644 --- a/plugins/modules/cloudfront_distribution_info.py +++ b/plugins/modules/cloudfront_distribution_info.py @@ -4,7 +4,7 @@ # This file is part of Ansible # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: cloudfront_distribution_info version_added: 1.0.0 @@ -144,9 +144,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Get a summary of distributions @@ -189,9 +189,9 @@ - name: Get all information about lists not requiring parameters (ie. list_origin_access_identities, list_distributions, list_streaming_distributions) community.aws.cloudfront_distribution_info: all_lists: true -''' +""" -RETURN = ''' +RETURN = r""" origin_access_identity: description: Describes the origin access identity information. Requires I(origin_access_identity_id) to be set. returned: only if I(origin_access_identity) is true @@ -240,7 +240,7 @@ as figuring out the DistributionId is usually the reason one uses this module in the first place. returned: always type: dict -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.cloudfront_facts import CloudFrontFactsServiceManager diff --git a/plugins/modules/cloudfront_invalidation.py b/plugins/modules/cloudfront_invalidation.py index ea2bee2f993..14d33ae533c 100644 --- a/plugins/modules/cloudfront_invalidation.py +++ b/plugins/modules/cloudfront_invalidation.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- version_added: 1.0.0 @@ -50,9 +50,9 @@ notes: - does not support check mode -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: create a batch of invalidations using a distribution_id for a reference community.aws.cloudfront_invalidation: @@ -72,9 +72,9 @@ - /testpathtwo/test5.js - /testpaththree/* -''' +""" -RETURN = r''' +RETURN = r""" invalidation: description: The invalidation's information. returned: always @@ -128,7 +128,7 @@ returned: always type: str sample: https://cloudfront.amazonaws.com/2017-03-25/distribution/E1ZID6KZJECZY7/invalidation/I2G9MOWJZFV622 -''' +""" import datetime diff --git a/plugins/modules/cloudfront_origin_access_identity.py b/plugins/modules/cloudfront_origin_access_identity.py index e637664a485..f68297923a0 100644 --- a/plugins/modules/cloudfront_origin_access_identity.py +++ b/plugins/modules/cloudfront_origin_access_identity.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- version_added: 1.0.0 @@ -52,9 +52,9 @@ notes: - Does not support check mode. -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: create an origin access identity community.aws.cloudfront_origin_access_identity: @@ -74,9 +74,9 @@ caller_reference: this is an example reference comment: this is a new comment -''' +""" -RETURN = ''' +RETURN = r""" cloud_front_origin_access_identity: description: The origin access identity's information. returned: always @@ -112,7 +112,7 @@ returned: when initially created type: str -''' +""" import datetime diff --git a/plugins/modules/cloudfront_response_headers_policy.py b/plugins/modules/cloudfront_response_headers_policy.py index 8d7f747d4cf..67e34c431c1 100644 --- a/plugins/modules/cloudfront_response_headers_policy.py +++ b/plugins/modules/cloudfront_response_headers_policy.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- version_added: 3.2.0 module: cloudfront_response_headers_policy @@ -55,9 +55,9 @@ default: {} type: dict -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Creationg a Cloudfront header policy using all predefined header features and a custom header for demonstration community.aws.cloudfront_response_headers_policy: name: my-header-policy @@ -111,9 +111,9 @@ community.aws.cloudfront_response_headers_policy: name: my-header-policy state: absent -''' +""" -RETURN = ''' +RETURN = r""" response_headers_policy: description: The policy's information returned: success @@ -139,7 +139,7 @@ type: str returned: always sample: my-header-policy -''' +""" try: from botocore.exceptions import ClientError, ParamValidationError, BotoCoreError diff --git a/plugins/modules/codebuild_project.py b/plugins/modules/codebuild_project.py index bc86b78c3f1..2773d1b3f1a 100644 --- a/plugins/modules/codebuild_project.py +++ b/plugins/modules/codebuild_project.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: codebuild_project version_added: 1.0.0 @@ -151,9 +151,9 @@ - amazon.aws.common.modules - amazon.aws.region.modules - amazon.aws.tags.modules -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - community.aws.codebuild_project: @@ -179,9 +179,9 @@ encryption_key: "arn:aws:kms:us-east-1:123123:alias/aws/s3" region: us-east-1 state: present -''' +""" -RETURN = r''' +RETURN = r""" project: description: Returns the dictionary describing the code project configuration. returned: success @@ -285,7 +285,7 @@ returned: always type: str sample: "2018-04-17T16:56:03.245000+02:00" -''' +""" try: import botocore diff --git a/plugins/modules/codecommit_repository.py b/plugins/modules/codecommit_repository.py index 89672558918..f1afdf4272d 100644 --- a/plugins/modules/codecommit_repository.py +++ b/plugins/modules/codecommit_repository.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Shuang Wang # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: codecommit_repository version_added: 1.0.0 @@ -39,9 +39,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -RETURN = ''' +RETURN = r""" repository_metadata: description: "Information about the repository." returned: always @@ -117,9 +117,9 @@ returned: always type: str sample: "0" -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Create a new repository - community.aws.codecommit_repository: name: repo @@ -129,7 +129,7 @@ - community.aws.codecommit_repository: name: repo state: absent -''' +""" try: import botocore diff --git a/plugins/modules/codepipeline.py b/plugins/modules/codepipeline.py index 63b394743b7..73f985db85f 100644 --- a/plugins/modules/codepipeline.py +++ b/plugins/modules/codepipeline.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: codepipeline version_added: 1.0.0 @@ -75,9 +75,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Example for creating a pipeline for continuous deploy of Github code to an ECS cluster (container) @@ -144,9 +144,9 @@ FileName: imagedefinitions.json region: us-east-1 state: present -''' +""" -RETURN = r''' +RETURN = r""" pipeline: description: Returns the dictionary describing the CodePipeline configuration. returned: success @@ -191,7 +191,7 @@ - This number is auto incremented when CodePipeline params are changed. returned: always type: int -''' +""" import copy diff --git a/plugins/modules/config_aggregation_authorization.py b/plugins/modules/config_aggregation_authorization.py index 2966b9ea0ce..df64887ab7c 100644 --- a/plugins/modules/config_aggregation_authorization.py +++ b/plugins/modules/config_aggregation_authorization.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: config_aggregation_authorization version_added: 1.0.0 @@ -36,9 +36,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Get current account ID community.aws.aws_caller_info: register: whoami @@ -46,9 +46,9 @@ state: present authorized_account_id: '{{ whoami.account }}' authorized_aws_region: us-east-1 -''' +""" -RETURN = '''#''' +RETURN = r"""#""" try: diff --git a/plugins/modules/config_aggregator.py b/plugins/modules/config_aggregator.py index ac8e1b1cb1a..a3c7c7ebc27 100644 --- a/plugins/modules/config_aggregator.py +++ b/plugins/modules/config_aggregator.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: config_aggregator version_added: 1.0.0 @@ -71,9 +71,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Create cross-account aggregator community.aws.config_aggregator: name: test_config_rule @@ -84,9 +84,9 @@ - 0123456789 - 9012345678 all_aws_regions: true -''' +""" -RETURN = r'''#''' +RETURN = r"""#""" try: diff --git a/plugins/modules/config_delivery_channel.py b/plugins/modules/config_delivery_channel.py index 17fbeb241aa..450b9900700 100644 --- a/plugins/modules/config_delivery_channel.py +++ b/plugins/modules/config_delivery_channel.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: config_delivery_channel version_added: 1.0.0 @@ -49,9 +49,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create Delivery Channel for AWS Config community.aws.config_delivery_channel: name: test_delivery_channel @@ -59,9 +59,9 @@ s3_bucket: 'test_aws_config_bucket' sns_topic_arn: 'arn:aws:sns:us-east-1:123456789012:aws_config_topic:1234ab56-cdef-7g89-01hi-2jk34l5m67no' delivery_frequency: 'Twelve_Hours' -''' +""" -RETURN = '''#''' +RETURN = r"""#""" try: diff --git a/plugins/modules/config_recorder.py b/plugins/modules/config_recorder.py index adfad41bb04..8788cd17071 100644 --- a/plugins/modules/config_recorder.py +++ b/plugins/modules/config_recorder.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: config_recorder version_added: 1.0.0 @@ -62,9 +62,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create Configuration Recorder for AWS Config community.aws.config_recorder: name: test_configuration_recorder @@ -73,9 +73,9 @@ recording_group: all_supported: true include_global_types: true -''' +""" -RETURN = '''#''' +RETURN = r"""#""" try: diff --git a/plugins/modules/config_rule.py b/plugins/modules/config_rule.py index 83a929312f0..8c7ea2fd234 100644 --- a/plugins/modules/config_rule.py +++ b/plugins/modules/config_rule.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: config_rule version_added: 1.0.0 @@ -86,9 +86,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create Config Rule for AWS Config community.aws.config_rule: name: test_config_rule @@ -101,9 +101,9 @@ owner: AWS identifier: 'S3_BUCKET_PUBLIC_WRITE_PROHIBITED' -''' +""" -RETURN = '''#''' +RETURN = r"""#""" try: diff --git a/plugins/modules/data_pipeline.py b/plugins/modules/data_pipeline.py index fc6a5bc964a..73919db2863 100644 --- a/plugins/modules/data_pipeline.py +++ b/plugins/modules/data_pipeline.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: data_pipeline version_added: 1.0.0 @@ -123,9 +123,9 @@ type: dict default: {} aliases: ['resource_tags'] -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Create pipeline @@ -175,9 +175,9 @@ region: us-west-2 state: absent -''' +""" -RETURN = r''' +RETURN = r""" changed: description: whether the data pipeline has been modified type: bool @@ -192,7 +192,7 @@ data_pipeline will be an empty dict. The msg describes the status of the operation. returned: always type: dict -''' +""" import hashlib import json diff --git a/plugins/modules/directconnect_confirm_connection.py b/plugins/modules/directconnect_confirm_connection.py index 8cc9099fd8f..5e262a50849 100644 --- a/plugins/modules/directconnect_confirm_connection.py +++ b/plugins/modules/directconnect_confirm_connection.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: directconnect_confirm_connection short_description: Confirms the creation of a hosted DirectConnect connection @@ -31,9 +31,9 @@ - The ID of the Direct Connect connection. - One of I(connection_id) or I(name) must be specified. type: str -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # confirm a Direct Connect by name - name: confirm the connection id @@ -44,16 +44,16 @@ - name: confirm the connection id community.aws.directconnect_confirm_connection: connection_id: dxcon-xxxxxxxx -''' +""" -RETURN = ''' +RETURN = r""" connection_state: description: The state of the connection. returned: always type: str sample: pending -''' +""" import traceback diff --git a/plugins/modules/directconnect_connection.py b/plugins/modules/directconnect_connection.py index 588a2202c65..6ed180abb90 100644 --- a/plugins/modules/directconnect_connection.py +++ b/plugins/modules/directconnect_connection.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: directconnect_connection version_added: 1.0.0 @@ -66,9 +66,9 @@ - By default this will not happen. This option must be explicitly set to C(true) to change I(bandwith) or I(location). type: bool default: false -''' +""" -EXAMPLES = """ +EXAMPLES = r""" # create a Direct Connect connection - community.aws.directconnect_connection: @@ -100,7 +100,7 @@ name: ansible-test-connection """ -RETURN = """ +RETURN = r""" connection: description: The attributes of the direct connect connection. type: complex diff --git a/plugins/modules/directconnect_gateway.py b/plugins/modules/directconnect_gateway.py index 8b27565534e..24e2eac4b7c 100644 --- a/plugins/modules/directconnect_gateway.py +++ b/plugins/modules/directconnect_gateway.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: directconnect_gateway author: - Gobin Sougrakpam (@gobins) @@ -52,9 +52,9 @@ - How long to wait for the association to be deleted. type: int default: 320 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create a new direct connect gateway attached to virtual private gateway community.aws.directconnect_gateway: state: present @@ -69,9 +69,9 @@ name: my-dx-gateway amazon_asn: 7224 register: created_dxgw -''' +""" -RETURN = ''' +RETURN = r""" result: description: - The attributes of the Direct Connect Gateway @@ -93,7 +93,7 @@ owner_account: description: The AWS account ID of the owner of the direct connect gateway. type: str -''' +""" import time diff --git a/plugins/modules/directconnect_link_aggregation_group.py b/plugins/modules/directconnect_link_aggregation_group.py index 7d49f38f433..2c2dcca7021 100644 --- a/plugins/modules/directconnect_link_aggregation_group.py +++ b/plugins/modules/directconnect_link_aggregation_group.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: directconnect_link_aggregation_group version_added: 1.0.0 @@ -79,9 +79,9 @@ - The duration in seconds to wait if I(wait=true). default: 120 type: int -''' +""" -EXAMPLES = """ +EXAMPLES = r""" # create a Direct Connect connection - community.aws.directconnect_link_aggregation_group: @@ -91,7 +91,7 @@ bandwidth: 1Gbps """ -RETURN = """ +RETURN = r""" changed: type: str description: Whether or not the LAG has changed. diff --git a/plugins/modules/directconnect_virtual_interface.py b/plugins/modules/directconnect_virtual_interface.py index d203c68fbf8..65e458aaffa 100644 --- a/plugins/modules/directconnect_virtual_interface.py +++ b/plugins/modules/directconnect_virtual_interface.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: directconnect_virtual_interface version_added: 1.0.0 @@ -87,9 +87,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -RETURN = r''' +RETURN = r""" address_family: description: The address family for the BGP peer. returned: always @@ -226,9 +226,9 @@ returned: always type: int sample: 100 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" --- - name: create an association between a LAG and connection community.aws.directconnect_virtual_interface: @@ -243,7 +243,7 @@ connection_id: dxcon-XXXXXXXX virtual_interface_id: dxv-XXXXXXXX -''' +""" import traceback diff --git a/plugins/modules/dms_endpoint.py b/plugins/modules/dms_endpoint.py index 3a01b31c3ce..0b1b9cabce1 100644 --- a/plugins/modules/dms_endpoint.py +++ b/plugins/modules/dms_endpoint.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: dms_endpoint version_added: 1.0.0 @@ -145,9 +145,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details - name: Endpoint Creation community.aws.dms_endpoint: @@ -162,9 +162,9 @@ databasename: 'testdb' sslmode: none wait: false -''' +""" -RETURN = ''' +RETURN = r""" endpoint: description: - A description of the DMS endpoint. @@ -323,7 +323,7 @@ - Additional settings for Redis endpoints. type: dict returned: when the I(endpoint_type) is C(redshift) -''' +""" try: import botocore diff --git a/plugins/modules/dms_replication_subnet_group.py b/plugins/modules/dms_replication_subnet_group.py index d622263e4ca..a6b503706fc 100644 --- a/plugins/modules/dms_replication_subnet_group.py +++ b/plugins/modules/dms_replication_subnet_group.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: dms_replication_subnet_group version_added: 1.0.0 @@ -45,17 +45,17 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - community.aws.dms_replication_subnet_group: state: present identifier: "dev-sngroup" description: "Development Subnet Group asdasdas" subnet_ids: ['subnet-id1','subnet-id2'] -''' +""" -RETURN = ''' # ''' +RETURN = r""" # """ try: import botocore diff --git a/plugins/modules/dynamodb_table.py b/plugins/modules/dynamodb_table.py index 9206513507f..29313b4eae7 100644 --- a/plugins/modules/dynamodb_table.py +++ b/plugins/modules/dynamodb_table.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: dynamodb_table version_added: 1.0.0 @@ -144,9 +144,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Create dynamo table with hash and range primary key community.aws.dynamodb_table: name: my-table @@ -195,9 +195,9 @@ name: my-table region: us-east-1 state: absent -''' +""" -RETURN = r''' +RETURN = r""" table: description: The returned table params from the describe API call. returned: success @@ -241,7 +241,7 @@ returned: success type: str sample: ACTIVE -''' +""" try: import botocore diff --git a/plugins/modules/dynamodb_ttl.py b/plugins/modules/dynamodb_ttl.py index 07b5bc2fcf2..a4bf6a27e82 100644 --- a/plugins/modules/dynamodb_ttl.py +++ b/plugins/modules/dynamodb_ttl.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: dynamodb_ttl version_added: 1.0.0 @@ -35,9 +35,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: enable TTL on my cowfacts table community.aws.dynamodb_ttl: state: enable @@ -49,9 +49,9 @@ state: disable table_name: cowfacts attribute_name: cow_deleted_date -''' +""" -RETURN = ''' +RETURN = r""" current_status: description: current or new TTL specification. type: dict @@ -59,7 +59,7 @@ sample: - { "AttributeName": "deploy_timestamp", "TimeToLiveStatus": "ENABLED" } - { "AttributeName": "deploy_timestamp", "Enabled": true } -''' +""" try: import botocore diff --git a/plugins/modules/ec2_ami_copy.py b/plugins/modules/ec2_ami_copy.py index f0442fa6dba..805f4ca252a 100644 --- a/plugins/modules/ec2_ami_copy.py +++ b/plugins/modules/ec2_ami_copy.py @@ -4,7 +4,7 @@ # This file is part of Ansible # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ec2_ami_copy version_added: 1.0.0 @@ -72,9 +72,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Basic AMI Copy community.aws.ec2_ami_copy: source_region: us-east-1 @@ -122,15 +122,15 @@ source_image_id: ami-xxxxxxx encrypted: true kms_key_id: arn:aws:kms:us-east-1:XXXXXXXXXXXX:key/746de6ea-50a4-4bcb-8fbc-e3b29f2d367b -''' +""" -RETURN = ''' +RETURN = r""" image_id: description: AMI ID of the copied AMI returned: always type: str sample: ami-e689729e -''' +""" try: from botocore.exceptions import ClientError, WaiterError, BotoCoreError diff --git a/plugins/modules/ec2_customer_gateway.py b/plugins/modules/ec2_customer_gateway.py index 368b4f23513..108276d891e 100644 --- a/plugins/modules/ec2_customer_gateway.py +++ b/plugins/modules/ec2_customer_gateway.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ec2_customer_gateway version_added: 1.0.0 @@ -51,9 +51,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create Customer Gateway community.aws.ec2_customer_gateway: bgp_asn: 12345 @@ -69,9 +69,9 @@ state: absent region: us-east-1 register: cgw -''' +""" -RETURN = ''' +RETURN = r""" gateway.customer_gateways: description: details about the gateway that was created. returned: success @@ -106,7 +106,7 @@ returned: when gateway exists and is available. sample: ipsec.1 type: str -''' +""" try: import botocore diff --git a/plugins/modules/ec2_customer_gateway_info.py b/plugins/modules/ec2_customer_gateway_info.py index 3ae054e14dd..e2e9f7907be 100644 --- a/plugins/modules/ec2_customer_gateway_info.py +++ b/plugins/modules/ec2_customer_gateway_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ec2_customer_gateway_info version_added: 1.0.0 @@ -30,9 +30,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Gather information about all customer gateways @@ -53,9 +53,9 @@ - 'cgw-48841a09' - 'cgw-fec021ce' register: cust_gw_info -''' +""" -RETURN = r''' +RETURN = r""" customer_gateways: description: List of one or more customer gateways. returned: always @@ -76,9 +76,10 @@ "type": "ipsec.1" } ] -''' +""" import json + try: from botocore.exceptions import ClientError, BotoCoreError except ImportError: diff --git a/plugins/modules/ec2_launch_template.py b/plugins/modules/ec2_launch_template.py index 07247a94f36..57558b83832 100644 --- a/plugins/modules/ec2_launch_template.py +++ b/plugins/modules/ec2_launch_template.py @@ -4,7 +4,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ec2_launch_template version_added: 1.0.0 @@ -377,9 +377,9 @@ - Requires botocore >= 1.23.30 choices: [enabled, disabled] default: 'disabled' -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create an ec2 launch template community.aws.ec2_launch_template: name: "my_template" @@ -403,9 +403,9 @@ state: absent # This module does not yet allow deletion of specific versions of launch templates -''' +""" -RETURN = ''' +RETURN = r""" latest_version: description: Latest available version of the launch template returned: when state=present @@ -414,7 +414,8 @@ description: The version that will be used if only the template name is specified. Often this is the same as the latest version, but not always. returned: when state=present type: int -''' +""" + import re from uuid import uuid4 diff --git a/plugins/modules/ec2_placement_group.py b/plugins/modules/ec2_placement_group.py index 6bd3993ed00..ce16e40bf05 100644 --- a/plugins/modules/ec2_placement_group.py +++ b/plugins/modules/ec2_placement_group.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ec2_placement_group version_added: 1.0.0 @@ -46,9 +46,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide # for details. @@ -75,10 +75,10 @@ name: my-cluster state: absent -''' +""" -RETURN = ''' +RETURN = r""" placement_group: description: Placement group attributes returned: when state != absent @@ -97,7 +97,7 @@ type: str sample: "cluster" -''' +""" try: import botocore diff --git a/plugins/modules/ec2_placement_group_info.py b/plugins/modules/ec2_placement_group_info.py index eb532f860ad..cdb9425c9f0 100644 --- a/plugins/modules/ec2_placement_group_info.py +++ b/plugins/modules/ec2_placement_group_info.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ec2_placement_group_info version_added: 1.0.0 @@ -26,9 +26,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details or the AWS region, # see the AWS Guide for details. @@ -47,10 +47,10 @@ msg: > {{ specific_ec2_placement_groups | json_query("[?name=='my-cluster']") }} -''' +""" -RETURN = r''' +RETURN = r""" placement_groups: description: Placement group attributes returned: always @@ -69,7 +69,7 @@ type: str sample: "cluster" -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule try: diff --git a/plugins/modules/ec2_snapshot_copy.py b/plugins/modules/ec2_snapshot_copy.py index 377bc901138..8d3ccc07854 100644 --- a/plugins/modules/ec2_snapshot_copy.py +++ b/plugins/modules/ec2_snapshot_copy.py @@ -4,7 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ec2_snapshot_copy version_added: 1.0.0 @@ -57,9 +57,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Basic Snapshot Copy community.aws.ec2_snapshot_copy: source_region: eu-central-1 @@ -97,15 +97,15 @@ source_snapshot_id: snap-xxxxxxx encrypted: true kms_key_id: arn:aws:kms:eu-central-1:XXXXXXXXXXXX:key/746de6ea-50a4-4bcb-8fbc-e3b29f2d367b -''' +""" -RETURN = ''' +RETURN = r""" snapshot_id: description: snapshot id of the newly created snapshot returned: when snapshot copy is successful type: str sample: "snap-e9095e8c" -''' +""" try: import botocore diff --git a/plugins/modules/ec2_transit_gateway.py b/plugins/modules/ec2_transit_gateway.py index 39375a8ff10..80e302db246 100644 --- a/plugins/modules/ec2_transit_gateway.py +++ b/plugins/modules/ec2_transit_gateway.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: ec2_transit_gateway short_description: Create and delete AWS Transit Gateways version_added: 1.0.0 @@ -76,9 +76,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create a new transit gateway using defaults community.aws.ec2_transit_gateway: state: present @@ -112,9 +112,9 @@ region: ap-southeast-2 transit_gateway_id: tgw-3a9aa123 register: deleted_tgw -''' +""" -RETURN = ''' +RETURN = r""" transit_gateway: description: The attributes of the transit gateway. type: complex @@ -208,7 +208,7 @@ returned: always type: str sample: tgw-3a9aa123 -''' +""" try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/ec2_transit_gateway_info.py b/plugins/modules/ec2_transit_gateway_info.py index 712f20c9f74..4badc521bd7 100644 --- a/plugins/modules/ec2_transit_gateway_info.py +++ b/plugins/modules/ec2_transit_gateway_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: ec2_transit_gateway_info short_description: Gather information about ec2 transit gateways in AWS version_added: 1.0.0 @@ -30,9 +30,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Gather info about all transit gateways @@ -54,9 +54,9 @@ transit_gateway_ids: - tgw-02c42332e6b7da829 - tgw-03c53443d5a8cb716 -''' +""" -RETURN = r''' +RETURN = r""" transit_gateways: description: > Transit gateways that match the provided filters. Each element consists of a dict with all the information @@ -159,7 +159,7 @@ returned: always type: str sample: "tgw-02c42332e6b7da829" -''' +""" try: import botocore diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment.py b/plugins/modules/ec2_transit_gateway_vpc_attachment.py index 7f4dbf6d47b..8368d06f9bf 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: ec2_transit_gateway_vpc_attachment short_description: Create and delete AWS Transit Gateway VPC attachments version_added: 4.0.0 @@ -100,9 +100,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Create a Transit Gateway attachment - community.aws.ec2_transit_gateway_vpc_attachment: state: present @@ -133,9 +133,9 @@ - community.aws.ec2_transit_gateway_vpc_attachment: state: absent id: 'tgw-attach-0c0c5fd0b0f01d1c9' -''' +""" -RETURN = ''' +RETURN = r""" transit_gateway_attachments: description: The attributes of the Transit Gateway attachments. type: list @@ -214,7 +214,7 @@ type: str returned: success example: '123456789012' -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py index a85ad434433..40f3d7eeafb 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: ec2_transit_gateway_vpc_attachment_info short_description: describes AWS Transit Gateway VPC attachments version_added: 4.0.0 @@ -42,9 +42,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Describe a specific Transit Gateway attachment. - community.aws.ec2_transit_gateway_vpc_attachment_info: id: 'tgw-attach-0123456789abcdef0' @@ -58,9 +58,9 @@ - community.aws.ec2_transit_gateway_vpc_attachment_info: filters: transit-gateway-id: tgw-0fedcba9876543210' -''' +""" -RETURN = ''' +RETURN = r""" transit_gateway_attachments: description: The attributes of the Transit Gateway attachments. type: list @@ -139,7 +139,7 @@ type: str returned: success example: '123456789012' -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py index 8ffa3da9a95..f29e96a888b 100644 --- a/plugins/modules/ec2_vpc_egress_igw.py +++ b/plugins/modules/ec2_vpc_egress_igw.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ec2_vpc_egress_igw version_added: 1.0.0 @@ -29,9 +29,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Ensure that the VPC has an Internet Gateway. @@ -41,9 +41,9 @@ state: present register: eigw -''' +""" -RETURN = ''' +RETURN = r""" gateway_id: description: The ID of the Egress Only Internet Gateway or Null. returned: always @@ -54,7 +54,7 @@ returned: always type: str sample: vpc-012345678 -''' +""" try: import botocore diff --git a/plugins/modules/ec2_vpc_nacl.py b/plugins/modules/ec2_vpc_nacl.py index 13690e49d64..073bc3ca671 100644 --- a/plugins/modules/ec2_vpc_nacl.py +++ b/plugins/modules/ec2_vpc_nacl.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: ec2_vpc_nacl short_description: create and delete Network ACLs version_added: 1.0.0 @@ -79,9 +79,9 @@ - amazon.aws.tags notes: - Support for I(purge_tags) was added in release 4.0.0. -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Complete example to create and delete a network ACL # that allows SSH, HTTP and ICMP in, and all traffic out. @@ -139,8 +139,8 @@ community.aws.ec2_vpc_nacl: nacl_id: acl-33b4ee5b state: absent -''' -RETURN = r''' +""" +RETURN = r""" task: description: The result of the create, or delete action. returned: success @@ -150,7 +150,7 @@ returned: success type: str sample: acl-123456789abcdef01 -''' +""" try: import botocore diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py index 56113a79e35..326b926ff9c 100644 --- a/plugins/modules/ec2_vpc_nacl_info.py +++ b/plugins/modules/ec2_vpc_nacl_info.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ec2_vpc_nacl_info version_added: 1.0.0 @@ -36,9 +36,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Gather information about all Network ACLs: @@ -54,9 +54,9 @@ filters: 'default': 'true' register: default_nacls -''' +""" -RETURN = r''' +RETURN = r""" nacls: description: Returns an array of complex objects as described below. returned: success @@ -99,7 +99,7 @@ type: list elements: list sample: [[100, 'all', 'allow', '0.0.0.0/0', null, null, null, null]] -''' +""" try: import botocore diff --git a/plugins/modules/ec2_vpc_peer.py b/plugins/modules/ec2_vpc_peer.py index 238db4fb761..d6580bfd068 100644 --- a/plugins/modules/ec2_vpc_peer.py +++ b/plugins/modules/ec2_vpc_peer.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: ec2_vpc_peer short_description: create, delete, accept, and reject VPC peering connections between two VPCs. version_added: 1.0.0 @@ -59,9 +59,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Complete example to create and accept a local peering connection. - name: Create local account VPC peering Connection community.aws.ec2_vpc_peer: @@ -210,8 +210,8 @@ profile: bot03_profile_for_cross_account state: reject -''' -RETURN = ''' +""" +RETURN = r""" peering_id: description: The id of the VPC peering connection created/deleted. returned: always @@ -350,7 +350,7 @@ returned: success type: str example: "pcx-0123456789abcdef0" -''' +""" try: import botocore diff --git a/plugins/modules/ec2_vpc_peering_info.py b/plugins/modules/ec2_vpc_peering_info.py index deec8b963b6..29ac8d4fa27 100644 --- a/plugins/modules/ec2_vpc_peering_info.py +++ b/plugins/modules/ec2_vpc_peering_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: ec2_vpc_peering_info short_description: Retrieves AWS VPC Peering details using AWS methods. version_added: 1.0.0 @@ -29,9 +29,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Simple example of listing all VPC Peers - name: List all vpc peers community.aws.ec2_vpc_peering_info: @@ -56,9 +56,9 @@ filters: status-code: ['pending-acceptance'] register: pending_vpc_peers -''' +""" -RETURN = r''' +RETURN = r""" vpc_peering_connections: description: Details of the matching VPC peering connections. returned: success @@ -197,7 +197,7 @@ description: The result of the describe. returned: success type: list -''' +""" try: import botocore diff --git a/plugins/modules/ec2_vpc_vgw.py b/plugins/modules/ec2_vpc_vgw.py index 41f2902113a..7ed4626d03d 100644 --- a/plugins/modules/ec2_vpc_vgw.py +++ b/plugins/modules/ec2_vpc_vgw.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: ec2_vpc_vgw short_description: Create and delete AWS VPN Virtual Gateways version_added: 1.0.0 @@ -57,9 +57,9 @@ - amazon.aws.aws - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create a new VGW attached to a specific VPC community.aws.ec2_vpc_vgw: state: present @@ -98,9 +98,9 @@ profile: personal vpn_gateway_id: vgw-3a9aa123 register: deleted_vgw -''' +""" -RETURN = ''' +RETURN = r""" vgw: description: A description of the VGW returned: success @@ -131,7 +131,7 @@ type: str returned: success example: vpc-123456789abcdef01 -''' +""" import time diff --git a/plugins/modules/ec2_vpc_vgw_info.py b/plugins/modules/ec2_vpc_vgw_info.py index c08aaab73ee..e3201352a2c 100644 --- a/plugins/modules/ec2_vpc_vgw_info.py +++ b/plugins/modules/ec2_vpc_vgw_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ec2_vpc_vgw_info version_added: 1.0.0 @@ -29,9 +29,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Gather information about all virtual gateways for an account or profile @@ -54,9 +54,9 @@ profile: production vpn_gateway_ids: vgw-c432f6a7 register: vgw_info -''' +""" -RETURN = r''' +RETURN = r""" virtual_gateways: description: The virtual gateways for the account. returned: always @@ -119,7 +119,7 @@ type: dict returned: success example: {"MyKey": "MyValue"} -''' +""" try: import botocore diff --git a/plugins/modules/ec2_vpc_vpn.py b/plugins/modules/ec2_vpc_vpn.py index da5ad603ba7..f60eb338077 100644 --- a/plugins/modules/ec2_vpc_vpn.py +++ b/plugins/modules/ec2_vpc_vpn.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ec2_vpc_vpn version_added: 1.0.0 @@ -133,7 +133,7 @@ required: false type: int default: 15 -''' +""" EXAMPLES = r""" # Note: None of these examples set aws_access_key, aws_secret_key, or region. diff --git a/plugins/modules/ec2_vpc_vpn_info.py b/plugins/modules/ec2_vpc_vpn_info.py index dbe9fa95c26..e30545bc2cd 100644 --- a/plugins/modules/ec2_vpc_vpn_info.py +++ b/plugins/modules/ec2_vpc_vpn_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ec2_vpc_vpn_info version_added: 1.0.0 @@ -32,9 +32,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Gather information about all vpn connections community.aws.ec2_vpc_vpn_info: @@ -50,9 +50,9 @@ filters: vpn-gateway-id: vgw-cbe66beb register: vpn_conn_info -''' +""" -RETURN = r''' +RETURN = r""" vpn_connections: description: List of one or more VPN Connections. returned: always @@ -156,9 +156,10 @@ returned: always type: str sample: vgw-cbe56bfb -''' +""" import json + try: from botocore.exceptions import ClientError, BotoCoreError except ImportError: diff --git a/plugins/modules/ec2_win_password.py b/plugins/modules/ec2_win_password.py index c1b13e09de5..4deadb97e38 100644 --- a/plugins/modules/ec2_win_password.py +++ b/plugins/modules/ec2_win_password.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ec2_win_password version_added: 1.0.0 @@ -53,9 +53,9 @@ requirements: - cryptography -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Example of getting a password - name: get the Administrator password community.aws.ec2_win_password: @@ -90,7 +90,7 @@ key_file: "~/aws-creds/my_test_key.pem" wait: true wait_timeout: 45 -''' +""" import datetime import time @@ -100,6 +100,7 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15 from cryptography.hazmat.primitives.serialization import load_pem_private_key + HAS_CRYPTOGRAPHY = True except ImportError: HAS_CRYPTOGRAPHY = False diff --git a/plugins/modules/ecs_attribute.py b/plugins/modules/ecs_attribute.py index c44a84e01a3..a30d470aec5 100644 --- a/plugins/modules/ecs_attribute.py +++ b/plugins/modules/ecs_attribute.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ecs_attribute version_added: 1.0.0 @@ -56,9 +56,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Set attributes @@ -80,9 +80,9 @@ - flavor: test - migrated delegate_to: localhost -''' +""" -RETURN = r''' +RETURN = r""" attributes: description: attributes type: complex @@ -106,7 +106,7 @@ description: value of the attribute returned: if present type: str -''' +""" try: import botocore diff --git a/plugins/modules/ecs_cluster.py b/plugins/modules/ecs_cluster.py index ad3c2f40a42..7e00360f156 100644 --- a/plugins/modules/ecs_cluster.py +++ b/plugins/modules/ecs_cluster.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ecs_cluster version_added: 1.0.0 @@ -80,9 +80,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Cluster creation @@ -118,8 +118,8 @@ repeat: 10 register: task_output -''' -RETURN = ''' +""" +RETURN = r""" activeServicesCount: description: how many services are active in this cluster returned: 0 if a new cluster @@ -161,7 +161,7 @@ returned: always type: str sample: ACTIVE -''' +""" import time diff --git a/plugins/modules/ecs_ecr.py b/plugins/modules/ecs_ecr.py index 1dfd2d4ee59..4239c4bb726 100644 --- a/plugins/modules/ecs_ecr.py +++ b/plugins/modules/ecs_ecr.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ecs_ecr version_added: 1.0.0 @@ -105,9 +105,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # If the repository does not exist, it is created. If it does exist, would not # affect any policies already on it. - name: ecr-repo @@ -181,9 +181,9 @@ encryption_configuration: encryption_type: KMS kms_key: custom-kms-key-alias -''' +""" -RETURN = ''' +RETURN = r""" state: type: str description: The asserted state of the repository (present, absent) @@ -211,7 +211,7 @@ repositoryArn: arn:aws:ecr:us-east-1:123456789012:repository/ecr-test-1484664090 repositoryName: ecr-test-1484664090 repositoryUri: 123456789012.dkr.ecr.us-east-1.amazonaws.com/ecr-test-1484664090 -''' +""" import json import traceback diff --git a/plugins/modules/ecs_service.py b/plugins/modules/ecs_service.py index cc531624a90..d3a240d3357 100644 --- a/plugins/modules/ecs_service.py +++ b/plugins/modules/ecs_service.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ecs_service version_added: 1.0.0 @@ -292,9 +292,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Basic provisioning example - community.aws.ecs_service: @@ -376,9 +376,9 @@ Firstname: jane lastName: doe propagate_tags: SERVICE -''' +""" -RETURN = r''' +RETURN = r""" service: description: Details of created service. returned: when creating a service @@ -670,7 +670,8 @@ returned: always type: str -''' +""" + import time DEPLOYMENT_CONTROLLER_TYPE_MAP = { diff --git a/plugins/modules/ecs_service_info.py b/plugins/modules/ecs_service_info.py index 04054056032..8b4b680ab22 100644 --- a/plugins/modules/ecs_service_info.py +++ b/plugins/modules/ecs_service_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ecs_service_info version_added: 1.0.0 @@ -44,9 +44,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Basic listing example @@ -60,9 +60,9 @@ - community.aws.ecs_service_info: cluster: test-cluster register: output -''' +""" -RETURN = r''' +RETURN = r""" services: description: When details is false, returns an array of service ARNs, otherwise an array of complex objects as described below. returned: success @@ -130,7 +130,7 @@ returned: when events is true type: list elements: dict -''' # NOQA +""" # NOQA try: import botocore diff --git a/plugins/modules/ecs_tag.py b/plugins/modules/ecs_tag.py index a6d8a37ba80..9d69df3257a 100644 --- a/plugins/modules/ecs_tag.py +++ b/plugins/modules/ecs_tag.py @@ -4,7 +4,7 @@ # Copyright: (c) 2019, Michael Pechner # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ecs_tag version_added: 1.0.0 @@ -56,9 +56,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Ensure tags are present on a resource community.aws.ecs_tag: cluster_name: mycluster @@ -92,9 +92,9 @@ Name: foo state: absent purge_tags: true -''' +""" -RETURN = r''' +RETURN = r""" tags: description: A dict containing the tags on the resource returned: always @@ -107,7 +107,7 @@ description: A dict of tags that were removed from the resource returned: If tags were removed type: dict -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list, compare_aws_tags diff --git a/plugins/modules/ecs_task.py b/plugins/modules/ecs_task.py index d977375daed..27e3f67bad4 100644 --- a/plugins/modules/ecs_task.py +++ b/plugins/modules/ecs_task.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ecs_task version_added: 1.0.0 @@ -101,9 +101,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Simple example of run task - name: Run task community.aws.ecs_task: @@ -175,8 +175,8 @@ cluster: console-sample-app-static-cluster task_definition: console-sample-app-static-taskdef task: "arn:aws:ecs:us-west-2:123456789012:task/3f8353d1-29a8-4689-bbf6-ad79937ffe8a" -''' -RETURN = r''' +""" +RETURN = r""" task: description: details about the task that was started returned: success @@ -240,7 +240,7 @@ description: The launch type on which to run your task. returned: always type: str -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names, ansible_dict_to_boto3_tag_list diff --git a/plugins/modules/ecs_taskdefinition.py b/plugins/modules/ecs_taskdefinition.py index 6fbb08919ad..5a5dbedf3e9 100644 --- a/plugins/modules/ecs_taskdefinition.py +++ b/plugins/modules/ecs_taskdefinition.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: ecs_taskdefinition version_added: 1.0.0 @@ -631,9 +631,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Create task definition community.aws.ecs_taskdefinition: containers: @@ -767,13 +767,13 @@ startPeriod: 15 timeout: 15 state: present -''' -RETURN = r''' +""" +RETURN = r""" taskdefinition: description: a reflection of the input parameters type: dict returned: always -''' +""" try: import botocore diff --git a/plugins/modules/ecs_taskdefinition_info.py b/plugins/modules/ecs_taskdefinition_info.py index cfe71026e14..aefcc0f2352 100644 --- a/plugins/modules/ecs_taskdefinition_info.py +++ b/plugins/modules/ecs_taskdefinition_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ecs_taskdefinition_info version_added: 1.0.0 @@ -29,16 +29,16 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - community.aws.ecs_taskdefinition_info: task_definition: test-td -''' +""" -RETURN = ''' +RETURN = r""" container_definitions: description: Returns a list of complex objects representing the containers returned: success @@ -346,7 +346,7 @@ description: A cluster query language expression to apply to the constraint. returned: when present type: str -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict diff --git a/plugins/modules/efs.py b/plugins/modules/efs.py index a70a9744353..a02815dea01 100644 --- a/plugins/modules/efs.py +++ b/plugins/modules/efs.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: efs version_added: 1.0.0 @@ -105,9 +105,9 @@ - amazon.aws.tags - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: EFS provisioning community.aws.efs: state: present @@ -151,9 +151,9 @@ community.aws.efs: state: absent name: myTestEFS -''' +""" -RETURN = r''' +RETURN = r""" creation_time: description: timestamp of creation date returned: always @@ -243,7 +243,7 @@ "key": "Value" } -''' +""" from time import sleep from time import time as timestamp diff --git a/plugins/modules/efs_info.py b/plugins/modules/efs_info.py index e4bce9b5e9b..395734083f0 100644 --- a/plugins/modules/efs_info.py +++ b/plugins/modules/efs_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: efs_info version_added: 1.0.0 @@ -41,9 +41,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Find all existing efs community.aws.efs_info: register: result @@ -64,9 +64,9 @@ - ansible.builtin.debug: msg: "{{ result['efs'] }}" -''' +""" -RETURN = r''' +RETURN = r""" creation_time: description: timestamp of creation date returned: always @@ -166,7 +166,7 @@ "key": "Value" } -''' +""" from collections import defaultdict diff --git a/plugins/modules/efs_tag.py b/plugins/modules/efs_tag.py index 09d13790a57..d97fcaed8ae 100644 --- a/plugins/modules/efs_tag.py +++ b/plugins/modules/efs_tag.py @@ -4,7 +4,7 @@ # Copyright: (c) 2021, Milan Zink # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: efs_tag version_added: 2.0.0 @@ -44,9 +44,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Ensure tags are present on a resource community.aws.efs_tag: resource: fs-123456ab @@ -76,9 +76,9 @@ state: absent tags: {} purge_tags: true -''' +""" -RETURN = r''' +RETURN = r""" tags: description: A dict containing the tags on the resource returned: always @@ -91,7 +91,7 @@ description: A dict of tags that were removed from the resource returned: If tags were removed type: dict -''' +""" try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/eks_cluster.py b/plugins/modules/eks_cluster.py index bc3199b6603..f29143a9afe 100644 --- a/plugins/modules/eks_cluster.py +++ b/plugins/modules/eks_cluster.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: eks_cluster version_added: 1.0.0 @@ -65,9 +65,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create an EKS cluster @@ -87,9 +87,9 @@ name: my_cluster wait: true state: absent -''' +""" -RETURN = r''' +RETURN = r""" arn: description: ARN of the EKS cluster returned: when state is present @@ -161,7 +161,7 @@ returned: when state is present type: str sample: '1.10' -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/eks_fargate_profile.py b/plugins/modules/eks_fargate_profile.py index db1f18f3375..49bfce40110 100644 --- a/plugins/modules/eks_fargate_profile.py +++ b/plugins/modules/eks_fargate_profile.py @@ -4,7 +4,7 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: eks_fargate_profile version_added: 4.0.0 @@ -71,9 +71,9 @@ - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create an EKS Fargate Profile @@ -96,9 +96,9 @@ cluster_name: test_cluster wait: true state: absent -''' +""" -RETURN = r''' +RETURN = r""" fargate_profile_name: description: Name of Fargate Profile. returned: when state is present @@ -162,7 +162,7 @@ sample: - CREATING - ACTIVE -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code diff --git a/plugins/modules/eks_nodegroup.py b/plugins/modules/eks_nodegroup.py index 39763dc2803..cc91533b479 100644 --- a/plugins/modules/eks_nodegroup.py +++ b/plugins/modules/eks_nodegroup.py @@ -4,7 +4,7 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: eks_nodegroup version_added: 5.3.0 @@ -170,9 +170,9 @@ - amazon.aws.aws - amazon.aws.ec2 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: create nodegroup @@ -205,9 +205,9 @@ cluster_name: test_cluster wait: yes state: absent -''' +""" -RETURN = r''' +RETURN = r""" nodegroup_name: description: The name associated with an Amazon EKS managed node group. returned: when state is present @@ -343,7 +343,7 @@ type: dict sample: foo: bar -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule, is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index 3100aea4cfa..5c9678a5124 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: elasticache version_added: 1.0.0 @@ -98,7 +98,7 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" EXAMPLES = r""" # Note: None of these examples set aws_access_key, aws_secret_key, or region. diff --git a/plugins/modules/elasticache_info.py b/plugins/modules/elasticache_info.py index 21c74a89078..c3a2615a2ac 100644 --- a/plugins/modules/elasticache_info.py +++ b/plugins/modules/elasticache_info.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: elasticache_info short_description: Retrieve information for AWS ElastiCache clusters version_added: 1.0.0 @@ -21,18 +21,18 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: obtain all ElastiCache information community.aws.elasticache_info: - name: obtain all information for a single ElastiCache cluster community.aws.elasticache_info: name: test_elasticache -''' +""" -RETURN = ''' +RETURN = r""" elasticache_clusters: description: List of ElastiCache clusters. returned: always @@ -400,7 +400,7 @@ sample: Application: web Environment: test -''' +""" from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/elasticache_parameter_group.py b/plugins/modules/elasticache_parameter_group.py index ea538f9e899..bce94cdae4e 100644 --- a/plugins/modules/elasticache_parameter_group.py +++ b/plugins/modules/elasticache_parameter_group.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: elasticache_parameter_group version_added: 1.0.0 @@ -45,9 +45,9 @@ description: - A user-specified dictionary of parameters to reset or modify for the cache parameter group. type: dict -''' +""" -EXAMPLES = """ +EXAMPLES = r""" # Note: None of these examples set aws_access_key, aws_secret_key, or region. # It is assumed that their matching environment variables are set. --- @@ -77,7 +77,7 @@ state: 'absent' """ -RETURN = """ +RETURN = r""" elasticache: description: cache parameter group information and response metadata returned: always diff --git a/plugins/modules/elasticache_snapshot.py b/plugins/modules/elasticache_snapshot.py index 6e3611cdc6b..e648496e6cf 100644 --- a/plugins/modules/elasticache_snapshot.py +++ b/plugins/modules/elasticache_snapshot.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: elasticache_snapshot version_added: 1.0.0 @@ -45,9 +45,9 @@ description: - The s3 bucket to which the snapshot is exported. type: str -''' +""" -EXAMPLES = """ +EXAMPLES = r""" # Note: None of these examples set aws_access_key, aws_secret_key, or region. # It is assumed that their matching environment variables are set. @@ -59,7 +59,7 @@ replication_id: '{{ replication }}' """ -RETURN = """ +RETURN = r""" response_metadata: description: response metadata about the snapshot returned: always diff --git a/plugins/modules/elasticache_subnet_group.py b/plugins/modules/elasticache_subnet_group.py index 3f66ace941e..6c8d66cb0ff 100644 --- a/plugins/modules/elasticache_subnet_group.py +++ b/plugins/modules/elasticache_subnet_group.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: elasticache_subnet_group version_added: 1.0.0 @@ -41,9 +41,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Add or change a subnet group community.aws.elasticache_subnet_group: state: present @@ -57,9 +57,9 @@ community.aws.elasticache_subnet_group: state: absent name: norwegian-blue -''' +""" -RETURN = r''' +RETURN = r""" cache_subnet_group: description: Description of the Elasticache Subnet Group. returned: always @@ -93,7 +93,7 @@ sample: - subnet-aaaaaaaa - subnet-bbbbbbbb -''' +""" try: import botocore diff --git a/plugins/modules/elasticbeanstalk_app.py b/plugins/modules/elasticbeanstalk_app.py index 54110715e5f..9b31c7f0dac 100644 --- a/plugins/modules/elasticbeanstalk_app.py +++ b/plugins/modules/elasticbeanstalk_app.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: elasticbeanstalk_app version_added: 1.0.0 @@ -44,9 +44,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Create or update an application - community.aws.elasticbeanstalk_app: app_name: Sample_App @@ -58,9 +58,9 @@ app_name: Sample_App state: absent -''' +""" -RETURN = ''' +RETURN = r""" app: description: Beanstalk application. returned: always @@ -81,7 +81,7 @@ returned: in check mode type: str sample: App is up-to-date -''' +""" try: import botocore diff --git a/plugins/modules/elb_classic_lb_info.py b/plugins/modules/elb_classic_lb_info.py index 9c3b8312ed8..4e9831037e1 100644 --- a/plugins/modules/elb_classic_lb_info.py +++ b/plugins/modules/elb_classic_lb_info.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: elb_classic_lb_info version_added: 1.0.0 @@ -25,9 +25,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Output format tries to match amazon.aws.ec2_elb_lb module input parameters @@ -58,9 +58,9 @@ msg: "{{ item.dns_name }}" loop: "{{ elb_info.elbs }}" -''' +""" -RETURN = r''' +RETURN = r""" elbs: description: a list of load balancers returned: always @@ -124,7 +124,7 @@ - subnet-XXXXXXXX tags: {} vpc_id: vpc-c248fda4 -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code diff --git a/plugins/modules/elb_instance.py b/plugins/modules/elb_instance.py index 7acff77a5e8..e59d434c0c8 100644 --- a/plugins/modules/elb_instance.py +++ b/plugins/modules/elb_instance.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: elb_instance version_added: 1.0.0 @@ -59,7 +59,7 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" EXAMPLES = r""" # basic pre_task and post_task example @@ -81,13 +81,13 @@ delegate_to: localhost """ -RETURN = ''' +RETURN = r""" updated_elbs: description: A list of ELB names that the instance has been added to or removed from. returned: always type: list elements: str -''' +""" try: import botocore diff --git a/plugins/modules/elb_network_lb.py b/plugins/modules/elb_network_lb.py index 6e927496cc6..51c302bc777 100644 --- a/plugins/modules/elb_network_lb.py +++ b/plugins/modules/elb_network_lb.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: elb_network_lb version_added: 1.0.0 @@ -131,9 +131,9 @@ notes: - Listeners are matched based on port. If a listener's port is changed then a new listener will be created. - Listener rules are matched based on priority. If a rule's priority is changed then a new rule will be created. -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create an ELB and attach a listener @@ -184,9 +184,9 @@ name: myelb state: absent -''' +""" -RETURN = r''' +RETURN = r""" load_balancer: description: A representation of the Network Load Balancer returned: when state is present @@ -325,7 +325,7 @@ returned: when state is present type: str sample: vpc-0011223344 -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, boto3_tag_list_to_ansible_dict, compare_aws_tags diff --git a/plugins/modules/elb_target.py b/plugins/modules/elb_target.py index 1cacc02e856..893a1e4dc3e 100644 --- a/plugins/modules/elb_target.py +++ b/plugins/modules/elb_target.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: elb_target version_added: 1.0.0 @@ -73,9 +73,9 @@ notes: - If you specified a port override when you registered a target, you must specify both the target ID and the port when you deregister it. -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Register an IP address target to a target group @@ -104,11 +104,11 @@ target_port: 8080 state: present -''' +""" -RETURN = ''' +RETURN = r""" -''' +""" from time import time, sleep diff --git a/plugins/modules/elb_target_group.py b/plugins/modules/elb_target_group.py index b6943d1a6fd..d03ef23f7cd 100644 --- a/plugins/modules/elb_target_group.py +++ b/plugins/modules/elb_target_group.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: elb_target_group version_added: 1.0.0 @@ -210,9 +210,9 @@ notes: - Once a target group has been created, only its health check can then be modified using subsequent calls -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create a target group with a default health check @@ -322,9 +322,9 @@ targets: - Id: arn:aws:lambda:eu-central-1:123456789012:function:my-lambda-function -''' +""" -RETURN = r''' +RETURN = r""" deregistration_delay_timeout_seconds: description: The amount time for Elastic Load Balancing to wait before changing the state of a deregistering target from draining to unused. returned: when state present @@ -435,7 +435,7 @@ returned: when state present type: str sample: vpc-0123456 -''' +""" import time diff --git a/plugins/modules/elb_target_group_info.py b/plugins/modules/elb_target_group_info.py index c7cae3ecac7..0982feffed8 100644 --- a/plugins/modules/elb_target_group_info.py +++ b/plugins/modules/elb_target_group_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: elb_target_group_info version_added: 1.0.0 @@ -42,9 +42,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Gather information about all target groups @@ -60,9 +60,9 @@ - tg1 - tg2 -''' +""" -RETURN = r''' +RETURN = r""" target_groups: description: a list of target groups returned: always @@ -202,7 +202,7 @@ returned: always type: str sample: vpc-0123456 -''' +""" try: import botocore diff --git a/plugins/modules/elb_target_info.py b/plugins/modules/elb_target_info.py index e619e53b7e9..57742b94919 100644 --- a/plugins/modules/elb_target_info.py +++ b/plugins/modules/elb_target_info.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Yaakov Kuperman # GNU General Public License v3.0+ # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: elb_target_info version_added: 1.0.0 @@ -30,9 +30,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = """ +EXAMPLES = r""" # practical use case - dynamically de-registering and re-registering nodes - name: Get EC2 Metadata @@ -127,7 +127,7 @@ """ -RETURN = """ +RETURN = r""" instance_target_groups: description: a list of target groups to which the instance is registered to returned: always diff --git a/plugins/modules/glue_connection.py b/plugins/modules/glue_connection.py index b84f91aa808..b3c0233f910 100644 --- a/plugins/modules/glue_connection.py +++ b/plugins/modules/glue_connection.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: glue_connection version_added: 1.0.0 @@ -73,9 +73,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Create an AWS Glue connection @@ -104,9 +104,9 @@ - community.aws.glue_connection: name: my-glue-connection state: absent -''' +""" -RETURN = r''' +RETURN = r""" connection_properties: description: - (deprecated) A dict of key-value pairs (converted to lowercase) used as parameters for this connection. @@ -155,11 +155,12 @@ returned: when state is present type: dict sample: {'JDBC_CONNECTION_URL':'jdbc:mysql://mydb:3306/databasename','USERNAME':'x','PASSWORD':'y'} -''' +""" # Non-ansible imports import copy import time + try: import botocore except ImportError: diff --git a/plugins/modules/glue_crawler.py b/plugins/modules/glue_crawler.py index ca115512a92..0b6769f025f 100644 --- a/plugins/modules/glue_crawler.py +++ b/plugins/modules/glue_crawler.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: glue_crawler version_added: 4.1.0 @@ -79,9 +79,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Create an AWS Glue crawler @@ -107,9 +107,9 @@ - community.aws.glue_crawler: name: my-glue-crawler state: absent -''' +""" -RETURN = r''' +RETURN = r""" creation_time: description: The time and date that this crawler definition was created. returned: when state is present @@ -196,7 +196,7 @@ description: List of catalog targets. returned: when state is present type: list -''' +""" try: import botocore diff --git a/plugins/modules/glue_job.py b/plugins/modules/glue_job.py index 8486d45bd1e..b14efd13d81 100644 --- a/plugins/modules/glue_job.py +++ b/plugins/modules/glue_job.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Rob White (@wimnat) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: glue_job version_added: 1.0.0 @@ -105,9 +105,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Create an AWS Glue job @@ -124,9 +124,9 @@ - community.aws.glue_job: name: my-glue-job state: absent -''' +""" -RETURN = r''' +RETURN = r""" allocated_capacity: description: The number of AWS Glue data processing units (DPUs) allocated to runs of this job. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power @@ -221,10 +221,11 @@ returned: when state is present type: int sample: 300 -''' +""" # Non-ansible imports import copy + try: import botocore except ImportError: diff --git a/plugins/modules/iam_access_key.py b/plugins/modules/iam_access_key.py index 5d017b2f993..a128eecdc01 100644 --- a/plugins/modules/iam_access_key.py +++ b/plugins/modules/iam_access_key.py @@ -4,7 +4,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: iam_access_key version_added: 2.1.0 @@ -55,9 +55,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create a new access key @@ -70,9 +70,9 @@ user_name: example_user id: AKIA1EXAMPLE1EXAMPLE state: absent -''' +""" -RETURN = r''' +RETURN = r""" access_key: description: A dictionary containing all the access key information. returned: When the key exists. @@ -115,7 +115,7 @@ returned: When a key was deleted during the rotation of access keys type: str sample: AKIA1EXAMPLE1EXAMPLE -''' +""" try: import botocore diff --git a/plugins/modules/iam_access_key_info.py b/plugins/modules/iam_access_key_info.py index 12f1ddbb8e5..ea0a37b52ea 100644 --- a/plugins/modules/iam_access_key_info.py +++ b/plugins/modules/iam_access_key_info.py @@ -4,7 +4,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: iam_access_key_info version_added: 2.1.0 @@ -25,17 +25,17 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Fetch Access keys for a user community.aws.iam_access_key_info: user_name: example_user -''' +""" -RETURN = r''' +RETURN = r""" access_key: description: A dictionary containing all the access key information. returned: When the key exists. @@ -65,7 +65,7 @@ returned: success type: str sample: Inactive -''' +""" try: import botocore diff --git a/plugins/modules/iam_group.py b/plugins/modules/iam_group.py index 0e425f78564..7ea4c6dde6e 100644 --- a/plugins/modules/iam_group.py +++ b/plugins/modules/iam_group.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: iam_group version_added: 1.0.0 @@ -59,9 +59,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create a group @@ -105,8 +105,8 @@ name: testgroup1 state: absent -''' -RETURN = r''' +""" +RETURN = r""" iam_group: description: dictionary containing all the group information including group membership returned: success @@ -162,7 +162,7 @@ description: the path to the user type: str sample: / -''' +""" try: import botocore diff --git a/plugins/modules/iam_managed_policy.py b/plugins/modules/iam_managed_policy.py index c0954f72669..d7fd27df2f0 100644 --- a/plugins/modules/iam_managed_policy.py +++ b/plugins/modules/iam_managed_policy.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: iam_managed_policy version_added: 1.0.0 @@ -48,9 +48,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Create a policy - name: Create IAM Managed Policy community.aws.iam_managed_policy: @@ -100,9 +100,9 @@ community.aws.iam_managed_policy: policy_name: "ManagedPolicy" state: absent -''' +""" -RETURN = r''' +RETURN = r""" policy: description: Returns the policy json structure, when state == absent this will return the value of the removed policy. returned: success @@ -119,7 +119,7 @@ "policy_name": "AdministratorAccess", "update_date": "2017-03-01T15:42:55.981000+00:00" }' -''' +""" import json diff --git a/plugins/modules/iam_mfa_device_info.py b/plugins/modules/iam_mfa_device_info.py index 0d551b2c247..3740896e660 100644 --- a/plugins/modules/iam_mfa_device_info.py +++ b/plugins/modules/iam_mfa_device_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: iam_mfa_device_info version_added: 1.0.0 @@ -21,9 +21,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -RETURN = """ +RETURN = r""" mfa_devices: description: The MFA devices registered for the given user returned: always @@ -37,7 +37,7 @@ user_name: example """ -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # more details: https://docs.aws.amazon.com/IAM/latest/APIReference/API_ListMFADevices.html @@ -52,7 +52,7 @@ role_arn: "arn:aws:iam::123456789012:role/someRole" role_session_name: "someRoleSession" register: assumed_role -''' +""" try: import botocore diff --git a/plugins/modules/iam_password_policy.py b/plugins/modules/iam_password_policy.py index 6b67975ba53..627c4438eb9 100644 --- a/plugins/modules/iam_password_policy.py +++ b/plugins/modules/iam_password_policy.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, Aaron Smith # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: iam_password_policy version_added: 1.0.0 @@ -76,9 +76,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Password policy for AWS account community.aws.iam_password_policy: state: present @@ -91,9 +91,9 @@ pw_max_age: 60 pw_reuse_prevent: 5 pw_expire: false -''' +""" -RETURN = ''' # ''' +RETURN = r""" # """ try: import botocore diff --git a/plugins/modules/iam_role.py b/plugins/modules/iam_role.py index b9a3c4c5e0e..96b749b33e5 100644 --- a/plugins/modules/iam_role.py +++ b/plugins/modules/iam_role.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: iam_role version_added: 1.0.0 @@ -94,9 +94,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create a role with description and tags @@ -126,8 +126,8 @@ assume_role_policy_document: "{{ lookup('file', 'policy.json') }}" state: absent -''' -RETURN = r''' +""" +RETURN = r""" iam_role: description: dictionary containing the IAM Role data returned: success @@ -213,7 +213,7 @@ type: dict returned: always sample: '{"Env": "Prod"}' -''' +""" import json diff --git a/plugins/modules/iam_role_info.py b/plugins/modules/iam_role_info.py index 6e660381ebd..0bb2fa201cf 100644 --- a/plugins/modules/iam_role_info.py +++ b/plugins/modules/iam_role_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: iam_role_info version_added: 1.0.0 @@ -31,9 +31,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: find all existing IAM roles community.aws.iam_role_info: register: result @@ -45,9 +45,9 @@ - name: describe all roles matching a path prefix community.aws.iam_role_info: path_prefix: /application/path -''' +""" -RETURN = ''' +RETURN = r""" iam_roles: description: List of IAM roles returned: always @@ -151,7 +151,7 @@ type: dict returned: always sample: '{"Env": "Prod"}' -''' +""" try: import botocore diff --git a/plugins/modules/iam_saml_federation.py b/plugins/modules/iam_saml_federation.py index 8e144edcdad..aff5e80b5be 100644 --- a/plugins/modules/iam_saml_federation.py +++ b/plugins/modules/iam_saml_federation.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: iam_saml_federation version_added: 1.0.0 @@ -35,9 +35,9 @@ author: - Tony (@axc450) - Aidan Rowe (@aidan-) -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # It is assumed that their matching environment variables are set. # Creates a new iam saml identity provider if not present @@ -59,9 +59,9 @@ community.aws.iam_saml_federation: name: example3 state: absent -''' +""" -RETURN = ''' +RETURN = r""" saml_provider: description: Details of the SAML Identity Provider that was created/modified. type: complex @@ -86,7 +86,7 @@ type: str returned: present sample: "2017-02-08T04:36:28+00:00" -''' +""" try: import botocore.exceptions diff --git a/plugins/modules/iam_server_certificate.py b/plugins/modules/iam_server_certificate.py index 5c14d762b1d..212eb16be0b 100644 --- a/plugins/modules/iam_server_certificate.py +++ b/plugins/modules/iam_server_certificate.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: iam_server_certificate version_added: 1.0.0 @@ -65,9 +65,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Basic server certificate upload from local file community.aws.iam_server_certificate: name: very_ssl @@ -90,7 +90,7 @@ name: very_ssl new_name: new_very_ssl state: present -''' +""" try: import botocore diff --git a/plugins/modules/iam_server_certificate_info.py b/plugins/modules/iam_server_certificate_info.py index 7a49225106a..ea2d9f5e234 100644 --- a/plugins/modules/iam_server_certificate_info.py +++ b/plugins/modules/iam_server_certificate_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: iam_server_certificate_info version_added: 1.0.0 @@ -22,9 +22,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Retrieve server certificate community.aws.iam_server_certificate_info: name: production-cert @@ -35,9 +35,9 @@ name: production-cert register: server_cert failed_when: "{{ server_cert.results | length == 0 }}" -''' +""" -RETURN = ''' +RETURN = r""" server_certificate_id: description: The 21 character certificate id returned: success @@ -73,7 +73,7 @@ returned: success type: str sample: "2015-04-25T00:36:40+00:00" -''' +""" try: diff --git a/plugins/modules/inspector_target.py b/plugins/modules/inspector_target.py index c8701e11ac5..fd206b39a1d 100644 --- a/plugins/modules/inspector_target.py +++ b/plugins/modules/inspector_target.py @@ -4,7 +4,7 @@ # Copyright (c) 2018 Dennis Conrad for Sainsbury's # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: inspector_target version_added: 1.0.0 @@ -40,9 +40,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create my_target Assessment Target community.aws.inspector_target: name: my_target @@ -60,9 +60,9 @@ community.aws.inspector_target: name: my_target state: absent -''' +""" -RETURN = ''' +RETURN = r""" arn: description: The ARN that specifies the Amazon Inspector assessment target. returned: success @@ -95,7 +95,7 @@ returned: success type: str sample: "2018-01-29T13:48:51.958000+00:00" -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry diff --git a/plugins/modules/kinesis_stream.py b/plugins/modules/kinesis_stream.py index 4c9718b9f5a..c9f62d6c044 100644 --- a/plugins/modules/kinesis_stream.py +++ b/plugins/modules/kinesis_stream.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: kinesis_stream version_added: 1.0.0 @@ -75,9 +75,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Basic creation example: @@ -146,9 +146,9 @@ wait: true wait_timeout: 600 register: test_stream -''' +""" -RETURN = ''' +RETURN = r""" stream_name: description: The name of the Kinesis Stream. returned: when state == present. @@ -177,7 +177,7 @@ "Name": "Splunk", "Env": "development" } -''' +""" import time diff --git a/plugins/modules/lightsail.py b/plugins/modules/lightsail.py index e0887113db5..f0e081b3d09 100644 --- a/plugins/modules/lightsail.py +++ b/plugins/modules/lightsail.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: lightsail version_added: 1.0.0 @@ -70,10 +70,10 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create a new Lightsail instance community.aws.lightsail: state: present @@ -92,9 +92,9 @@ region: us-east-1 name: my_instance -''' +""" -RETURN = ''' +RETURN = r""" changed: description: if a snapshot has been modified/created returned: always @@ -146,7 +146,7 @@ name: running support_code: "123456789012/i-0997c97831ee21e33" username: "ubuntu" -''' +""" import time diff --git a/plugins/modules/lightsail_static_ip.py b/plugins/modules/lightsail_static_ip.py index ed658ca5abc..aee0b8e9b23 100644 --- a/plugins/modules/lightsail_static_ip.py +++ b/plugins/modules/lightsail_static_ip.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: lightsail_static_ip version_added: 4.1.0 @@ -28,10 +28,10 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Provision a Lightsail static IP community.aws.lightsail_static_ip: state: present @@ -42,9 +42,9 @@ community.aws.lightsail_static_ip: state: absent name: my_static_ip -''' +""" -RETURN = ''' +RETURN = r""" static_ip: description: static_ipinstance data returned: always @@ -60,7 +60,7 @@ name: "static_ip" resource_type: StaticIp support_code: "123456789012/192.0.2.5" -''' +""" try: import botocore diff --git a/plugins/modules/networkfirewall.py b/plugins/modules/networkfirewall.py index 8de51b59486..3bf2b407772 100644 --- a/plugins/modules/networkfirewall.py +++ b/plugins/modules/networkfirewall.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: networkfirewall short_description: manage AWS Network Firewall firewalls version_added: 4.0.0 @@ -106,9 +106,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Create an AWS Network Firewall - community.aws.networkfirewall: name: 'ExampleFirewall' @@ -140,9 +140,9 @@ - community.aws.networkfirewall: state: absent name: 'ExampleFirewall' -''' +""" -RETURN = ''' +RETURN = r""" firewall: description: The full details of the firewall returned: success @@ -267,7 +267,7 @@ } } } -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule diff --git a/plugins/modules/networkfirewall_info.py b/plugins/modules/networkfirewall_info.py index a436e9b6245..13aaf3751f2 100644 --- a/plugins/modules/networkfirewall_info.py +++ b/plugins/modules/networkfirewall_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: networkfirewall_info short_description: describe AWS Network Firewall firewalls version_added: 4.0.0 @@ -37,9 +37,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Describe all firewalls in an account - community.aws.networkfirewall_info: {} @@ -51,9 +51,9 @@ # Describe a firewall by name - community.aws.networkfirewall_info: name: ExampleFirewall -''' +""" -RETURN = ''' +RETURN = r""" firewall_list: description: A list of ARNs of the matching firewalls. type: list @@ -182,7 +182,7 @@ } } } -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule diff --git a/plugins/modules/networkfirewall_policy.py b/plugins/modules/networkfirewall_policy.py index 8ddb926e6d2..9ef2eefde45 100644 --- a/plugins/modules/networkfirewall_policy.py +++ b/plugins/modules/networkfirewall_policy.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: networkfirewall_policy short_description: manage AWS Network Firewall policies version_added: 4.0.0 @@ -145,9 +145,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Create an AWS Network Firewall Policy with default rule order - community.aws.networkfirewall_policy: stateful_rule_order: 'default' @@ -176,9 +176,9 @@ - community.aws.networkfirewall_policy: state: absent name: 'ExampleDropPolicy' -''' +""" -RETURN = ''' +RETURN = r""" policy: description: The details of the policy type: dict @@ -334,7 +334,7 @@ type: dict returned: success example: {'tagName': 'Some Value'} -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule diff --git a/plugins/modules/networkfirewall_policy_info.py b/plugins/modules/networkfirewall_policy_info.py index 1e5f1035e9c..cd5fce92ded 100644 --- a/plugins/modules/networkfirewall_policy_info.py +++ b/plugins/modules/networkfirewall_policy_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: networkfirewall_policy_info short_description: describe AWS Network Firewall policies version_added: 4.0.0 @@ -29,9 +29,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Describe all Firewall policies in an account - community.aws.networkfirewall_policy_info: {} @@ -43,9 +43,9 @@ # Describe a Firewall policy by name - community.aws.networkfirewall_policy_info: name: ExamplePolicy -''' +""" -RETURN = ''' +RETURN = r""" policy_list: description: A list of ARNs of the matching policies. type: list @@ -210,7 +210,7 @@ type: dict returned: success example: {'tagName': 'Some Value'} -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule diff --git a/plugins/modules/networkfirewall_rule_group.py b/plugins/modules/networkfirewall_rule_group.py index b1502b5f124..c358e6d884c 100644 --- a/plugins/modules/networkfirewall_rule_group.py +++ b/plugins/modules/networkfirewall_rule_group.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: networkfirewall_rule_group short_description: create, delete and modify AWS Network Firewall rule groups version_added: 4.0.0 @@ -269,9 +269,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Create a rule group - name: Create a minimal AWS Network Firewall Rule Group community.aws.networkfirewall_rule_group: @@ -395,9 +395,9 @@ type: 'stateful' state: absent -''' +""" -RETURN = ''' +RETURN = r""" rule_group: description: Details of the rules in the rule group type: dict @@ -706,7 +706,7 @@ type: str returned: success example: 'STATEFUL' -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule diff --git a/plugins/modules/networkfirewall_rule_group_info.py b/plugins/modules/networkfirewall_rule_group_info.py index ddd570a1621..76756985c4f 100644 --- a/plugins/modules/networkfirewall_rule_group_info.py +++ b/plugins/modules/networkfirewall_rule_group_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: networkfirewall_rule_group_info short_description: describe AWS Network Firewall rule groups version_added: 4.0.0 @@ -46,9 +46,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Describe all Rule Groups in an account (excludes managed groups) - community.aws.networkfirewall_rule_group_info: {} @@ -67,9 +67,9 @@ name: ExampleRuleGroup type: stateful -''' +""" -RETURN = ''' +RETURN = r""" rule_list: description: A list of ARNs of the matching rule groups. type: list @@ -385,7 +385,7 @@ type: str returned: success example: 'STATEFUL' -''' +""" from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule diff --git a/plugins/modules/opensearch.py b/plugins/modules/opensearch.py index ea7d9bd7048..38efda729b3 100644 --- a/plugins/modules/opensearch.py +++ b/plugins/modules/opensearch.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = """ +DOCUMENTATION = r""" --- module: opensearch short_description: Creates OpenSearch or ElasticSearch domain @@ -393,7 +393,7 @@ - amazon.aws.tags """ -EXAMPLES = """ +EXAMPLES = r""" - name: Create OpenSearch domain for dev environment, no zone awareness, no dedicated masters community.aws.opensearch: diff --git a/plugins/modules/opensearch_info.py b/plugins/modules/opensearch_info.py index ad86a2a3fd7..9ef631c82ef 100644 --- a/plugins/modules/opensearch_info.py +++ b/plugins/modules/opensearch_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = """ +DOCUMENTATION = r""" --- module: opensearch_info short_description: obtain information about one or more OpenSearch or ElasticSearch domain @@ -33,7 +33,7 @@ - amazon.aws.boto3 """ -EXAMPLES = ''' +EXAMPLES = r""" - name: Get information about an OpenSearch domain instance community.aws.opensearch_info: domain-name: my-search-cluster @@ -47,9 +47,9 @@ tags: Applications: search Environment: Development -''' +""" -RETURN = ''' +RETURN = r""" instances: description: List of OpenSearch domain instances returned: always @@ -438,7 +438,7 @@ description: The name of the OpenSearch domain. returned: always type: str -''' +""" try: diff --git a/plugins/modules/redshift.py b/plugins/modules/redshift.py index 8b730fce444..7102b063e01 100644 --- a/plugins/modules/redshift.py +++ b/plugins/modules/redshift.py @@ -4,7 +4,7 @@ # Copyright 2014 Jens Carl, Hothead Games Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- author: - "Jens Carl (@j-carl), Hothead Games Inc." @@ -170,9 +170,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Basic cluster provisioning example community.aws.redshift: command: create @@ -187,9 +187,9 @@ identifier: new_cluster skip_final_cluster_snapshot: true wait: true -''' +""" -RETURN = r''' +RETURN = r""" cluster: description: dictionary containing all the cluster information returned: success @@ -253,7 +253,7 @@ description: aws tags for cluster. returned: success type: dict -''' +""" try: import botocore diff --git a/plugins/modules/redshift_cross_region_snapshots.py b/plugins/modules/redshift_cross_region_snapshots.py index 7477e7bf2df..f6753ba1973 100644 --- a/plugins/modules/redshift_cross_region_snapshots.py +++ b/plugins/modules/redshift_cross_region_snapshots.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, JR Kerkstra # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: redshift_cross_region_snapshots version_added: 1.0.0 @@ -55,9 +55,9 @@ - amazon.aws.aws - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: configure cross-region snapshot on cluster `johniscool` community.aws.redshift_cross_region_snapshots: cluster_name: johniscool @@ -81,9 +81,9 @@ state: absent region: us-east-1 destination_region: us-west-2 -''' +""" -RETURN = ''' # ''' +RETURN = r""" # """ from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/redshift_info.py b/plugins/modules/redshift_info.py index 63c7339ca13..a1098584403 100644 --- a/plugins/modules/redshift_info.py +++ b/plugins/modules/redshift_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: redshift_info version_added: 1.0.0 @@ -31,9 +31,9 @@ - amazon.aws.aws - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do net set authentication details, see the AWS guide for details. - name: Find all clusters @@ -62,9 +62,9 @@ stack: db register: redshift_user failed_when: "{{ redshift_user.results | length == 0 }}" -''' +""" -RETURN = ''' +RETURN = r""" # For more information see U(http://boto3.readthedocs.io/en/latest/reference/services/redshift.html#Redshift.Client.describe_clusters) --- cluster_identifier: @@ -270,7 +270,7 @@ returned: success type: list sample: [] -''' +""" import re diff --git a/plugins/modules/redshift_subnet_group.py b/plugins/modules/redshift_subnet_group.py index 03b7e6d4abf..969179f6a3a 100644 --- a/plugins/modules/redshift_subnet_group.py +++ b/plugins/modules/redshift_subnet_group.py @@ -4,7 +4,7 @@ # Copyright 2014 Jens Carl, Hothead Games Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: redshift_subnet_group version_added: 1.0.0 @@ -42,9 +42,9 @@ - amazon.aws.boto3 author: - "Jens Carl (@j-carl), Hothead Games Inc." -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Create a Redshift subnet group community.aws.redshift_subnet_group: state: present @@ -58,9 +58,9 @@ community.aws.redshift_subnet_group: state: absent group_name: redshift-subnet -''' +""" -RETURN = r''' +RETURN = r""" cluster_subnet_group: description: A dictionary containing information about the Redshift subnet group. returned: success @@ -89,7 +89,7 @@ sample: - subnet-aaaaaaaa - subnet-bbbbbbbb -''' +""" try: import botocore diff --git a/plugins/modules/s3_bucket_info.py b/plugins/modules/s3_bucket_info.py index 69f888fbd6b..996779f8de8 100644 --- a/plugins/modules/s3_bucket_info.py +++ b/plugins/modules/s3_bucket_info.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: s3_bucket_info version_added: 1.0.0 @@ -113,9 +113,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Note: Only AWS S3 is currently supported @@ -153,9 +153,9 @@ - name: List buckets ansible.builtin.debug: msg: "{{ result['buckets'] }}" -''' +""" -RETURN = ''' +RETURN = r""" bucket_list: description: "List of buckets" returned: always @@ -395,7 +395,7 @@ returned: always type: str sample: https -''' +""" try: import botocore diff --git a/plugins/modules/s3_bucket_notification.py b/plugins/modules/s3_bucket_notification.py index 412a6e76a37..67b1c7abfe1 100644 --- a/plugins/modules/s3_bucket_notification.py +++ b/plugins/modules/s3_bucket_notification.py @@ -5,7 +5,7 @@ # (c) 2019, XLAB d.o.o # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: s3_bucket_notification version_added: 1.0.0 @@ -103,9 +103,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" --- # Examples adding notification target configs to a S3 bucket - name: Setup bucket event notification to a Lambda function @@ -134,9 +134,9 @@ state: absent event_name: on_file_add_or_remove bucket_name: test-bucket -''' +""" -RETURN = r''' +RETURN = r""" notification_configuration: description: dictionary of currently applied notifications returned: success @@ -154,7 +154,7 @@ description: - List of current SNS notification configurations applied to the bucket. type: list -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict diff --git a/plugins/modules/s3_cors.py b/plugins/modules/s3_cors.py index ee0cf3cd10e..d4d141ee9a9 100644 --- a/plugins/modules/s3_cors.py +++ b/plugins/modules/s3_cors.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: s3_cors version_added: 1.0.0 @@ -36,9 +36,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Create a simple cors for s3 bucket @@ -62,9 +62,9 @@ - community.aws.s3_cors: name: mys3bucket state: absent -''' +""" -RETURN = r''' +RETURN = r""" changed: description: check to see if a change was made to the rules returned: always @@ -93,7 +93,7 @@ "max_age_seconds": 30000 } ] -''' +""" try: from botocore.exceptions import ClientError, BotoCoreError diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index bee07282cd0..8be29730045 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: s3_lifecycle version_added: 1.0.0 @@ -151,9 +151,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Configure a lifecycle rule on a bucket to expire (delete) items with a prefix of /logs/ after 30 days @@ -217,7 +217,7 @@ storage_class: standard_ia - transition_days: 90 storage_class: glacier -''' +""" from copy import deepcopy import datetime @@ -225,6 +225,7 @@ try: from dateutil import parser as date_parser + HAS_DATEUTIL = True except ImportError: HAS_DATEUTIL = False diff --git a/plugins/modules/s3_logging.py b/plugins/modules/s3_logging.py index dfba34a110c..ca4d4d1910d 100644 --- a/plugins/modules/s3_logging.py +++ b/plugins/modules/s3_logging.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: s3_logging version_added: 1.0.0 @@ -38,9 +38,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Enable logging of s3 bucket mywebsite.com to s3 bucket mylogs @@ -55,7 +55,7 @@ name: mywebsite.com state: absent -''' +""" try: import botocore diff --git a/plugins/modules/s3_metrics_configuration.py b/plugins/modules/s3_metrics_configuration.py index cd17ab7a9cd..fbf3319fa42 100644 --- a/plugins/modules/s3_metrics_configuration.py +++ b/plugins/modules/s3_metrics_configuration.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: s3_metrics_configuration version_added: 1.3.0 @@ -50,9 +50,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Create a metrics configuration that enables metrics for an entire bucket @@ -92,7 +92,7 @@ id: EntireBucket state: absent -''' +""" try: from botocore.exceptions import ClientError, BotoCoreError diff --git a/plugins/modules/s3_sync.py b/plugins/modules/s3_sync.py index 9b840468010..d3cc56f75ff 100644 --- a/plugins/modules/s3_sync.py +++ b/plugins/modules/s3_sync.py @@ -4,7 +4,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: s3_sync version_added: 1.0.0 @@ -119,9 +119,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: basic upload community.aws.s3_sync: bucket: tedder @@ -152,9 +152,9 @@ storage_class: "GLACIER" include: "*" exclude: "*.txt,.*" -''' +""" -RETURN = ''' +RETURN = r""" filelist_initial: description: file listing (dicts) from initial globbing returned: always @@ -227,7 +227,7 @@ "whytime": "1477931637 / 1477931489" }] -''' +""" import datetime import fnmatch @@ -237,6 +237,7 @@ try: from dateutil import tz + HAS_DATEUTIL = True except ImportError: HAS_DATEUTIL = False diff --git a/plugins/modules/s3_website.py b/plugins/modules/s3_website.py index ec1a8716638..5619db7537a 100644 --- a/plugins/modules/s3_website.py +++ b/plugins/modules/s3_website.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: s3_website version_added: 1.0.0 @@ -46,9 +46,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Configure an s3 bucket to redirect all requests to example.com @@ -69,9 +69,9 @@ error_key: errors/404.htm state: present -''' +""" -RETURN = ''' +RETURN = r""" index_document: description: index document type: complex @@ -155,7 +155,7 @@ returned: when routing rule present type: str sample: documents/ -''' +""" import time diff --git a/plugins/modules/secretsmanager_secret.py b/plugins/modules/secretsmanager_secret.py index c86760cd176..3128cf73e44 100644 --- a/plugins/modules/secretsmanager_secret.py +++ b/plugins/modules/secretsmanager_secret.py @@ -4,7 +4,7 @@ # Copyright: (c) 2018, REY Remi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: secretsmanager_secret version_added: 1.0.0 @@ -112,9 +112,9 @@ - amazon.aws.tags notes: - Support for I(purge_tags) was added in release 4.0.0. -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Add string to AWS Secrets Manager community.aws.secretsmanager_secret: name: 'test_secret_string' @@ -144,9 +144,9 @@ secret_type: 'string' secret: "{{ lookup('community.general.random_string', length=16, special=false) }}" overwrite: false -''' +""" -RETURN = r''' +RETURN = r""" secret: description: The secret information returned: always @@ -210,7 +210,7 @@ returned: when the secret has tags example: {'MyTagName': 'Some Value'} version_added: 4.0.0 -''' +""" from ansible.module_utils._text import to_bytes from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/ses_identity.py b/plugins/modules/ses_identity.py index 54b258a3f7c..62b09c9bf80 100644 --- a/plugins/modules/ses_identity.py +++ b/plugins/modules/ses_identity.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ses_identity version_added: 1.0.0 @@ -89,9 +89,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: Ensure example@example.com email identity exists @@ -145,9 +145,9 @@ state: present delivery_notifications: topic: "{{ topic_info.sns_arn }}" -''' +""" -RETURN = ''' +RETURN = r""" identity: description: The identity being modified. returned: success @@ -215,7 +215,7 @@ headers_in_delivery_notifications_enabled: description: Whether or not headers are included in messages delivered to the delivery topic. type: bool -''' +""" from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/ses_identity_policy.py b/plugins/modules/ses_identity_policy.py index 68f21505c51..964d0abb47b 100644 --- a/plugins/modules/ses_identity_policy.py +++ b/plugins/modules/ses_identity_policy.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ses_identity_policy version_added: 1.0.0 @@ -42,9 +42,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: add sending authorization policy to domain identity @@ -73,15 +73,15 @@ identity: example.com policy_name: ExamplePolicy state: absent -''' +""" -RETURN = ''' +RETURN = r""" policies: description: A list of all policies present on the identity after the operation. returned: success type: list sample: [ExamplePolicy] -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies, AWSRetry diff --git a/plugins/modules/ses_rule_set.py b/plugins/modules/ses_rule_set.py index 309282dd760..45b53f63d99 100644 --- a/plugins/modules/ses_rule_set.py +++ b/plugins/modules/ses_rule_set.py @@ -4,7 +4,7 @@ # Copyright (c) 2017, Ben Tomasik # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ses_rule_set version_added: 1.0.0 @@ -47,9 +47,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = """ +EXAMPLES = r""" # Note: None of these examples set aws_access_key, aws_secret_key, or region. # It is assumed that their matching environment variables are set. --- @@ -82,7 +82,7 @@ force: true """ -RETURN = """ +RETURN = r""" active: description: if the SES rule set is active returned: success if I(state) is C(present) diff --git a/plugins/modules/sns.py b/plugins/modules/sns.py index 652dcd220bf..68aee38d117 100644 --- a/plugins/modules/sns.py +++ b/plugins/modules/sns.py @@ -4,7 +4,7 @@ # Copyright: (c) 2014, Michael J. Schultz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: sns short_description: Send Amazon Simple Notification Service messages version_added: 1.0.0 @@ -78,9 +78,9 @@ - amazon.aws.ec2 - amazon.aws.aws - amazon.aws.boto3 -''' +""" -EXAMPLES = """ +EXAMPLES = r""" - name: Send default notification message via SNS community.aws.sns: msg: '{{ inventory_hostname }} has completed the play.' @@ -110,7 +110,7 @@ delegate_to: localhost """ -RETURN = """ +RETURN = r""" msg: description: Human-readable diagnostic information returned: always diff --git a/plugins/modules/sns_topic.py b/plugins/modules/sns_topic.py index 04356e515a4..8cc45dfebe6 100644 --- a/plugins/modules/sns_topic.py +++ b/plugins/modules/sns_topic.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: sns_topic short_description: Manages AWS SNS topics and subscriptions version_added: 1.0.0 @@ -160,7 +160,7 @@ - amazon.aws.region.modules - amazon.aws.tags.modules - amazon.aws.boto3 -''' +""" EXAMPLES = r""" @@ -213,7 +213,7 @@ state: absent """ -RETURN = r''' +RETURN = r""" sns_arn: description: The ARN of the topic you are modifying type: str @@ -329,7 +329,7 @@ returned: always type: bool sample: false -''' +""" import json diff --git a/plugins/modules/sns_topic_info.py b/plugins/modules/sns_topic_info.py index 09e65280dab..da17ca74de2 100644 --- a/plugins/modules/sns_topic_info.py +++ b/plugins/modules/sns_topic_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: sns_topic_info short_description: sns_topic_info module version_added: 3.2.0 @@ -21,9 +21,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: list all the topics community.aws.sns_topic_info: register: sns_topic_list @@ -32,9 +32,9 @@ community.aws.sns_topic_info: topic_arn: "{{ sns_arn }}" register: sns_topic_info -''' +""" -RETURN = r''' +RETURN = r""" result: description: - The result contaning the details of one or all AWS SNS topics. @@ -129,7 +129,7 @@ description: The type of topic. type: str sample: "standard" -''' +""" try: diff --git a/plugins/modules/sqs_queue.py b/plugins/modules/sqs_queue.py index 68738b35d7f..1186eaaa9bf 100644 --- a/plugins/modules/sqs_queue.py +++ b/plugins/modules/sqs_queue.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" --- module: sqs_queue version_added: 1.0.0 @@ -106,9 +106,9 @@ - amazon.aws.ec2 - amazon.aws.boto3 - amazon.aws.tags -''' +""" -RETURN = r''' +RETURN = r""" content_based_deduplication: description: Enables content-based deduplication. Used for FIFOs only. type: bool @@ -184,9 +184,9 @@ type: dict returned: always sample: '{"Env": "prod"}' -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: Create SQS queue with redrive policy community.aws.sqs_queue: name: my-queue @@ -256,7 +256,7 @@ name: my-queue region: ap-southeast-2 state: absent -''' +""" import json diff --git a/plugins/modules/ssm_parameter.py b/plugins/modules/ssm_parameter.py index facd5a0acd6..690415e6d92 100644 --- a/plugins/modules/ssm_parameter.py +++ b/plugins/modules/ssm_parameter.py @@ -4,7 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: ssm_parameter version_added: 1.0.0 @@ -93,9 +93,9 @@ notes: - Support for I(tags) and I(purge_tags) was added in release 5.3.0. -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create or update key/value pair in AWS SSM parameter store community.aws.ssm_parameter: name: "Hello" @@ -163,9 +163,9 @@ community.aws.ssm_parameter: name: "Hello" tags: {} -''' +""" -RETURN = ''' +RETURN = r""" parameter_metadata: type: dict description: @@ -240,7 +240,7 @@ returned: when the parameter has tags example: {'MyTagName': 'Some Value'} version_added: 5.3.0 -''' +""" import time diff --git a/plugins/modules/stepfunctions_state_machine.py b/plugins/modules/stepfunctions_state_machine.py index 082686264ce..5eaaf65813f 100644 --- a/plugins/modules/stepfunctions_state_machine.py +++ b/plugins/modules/stepfunctions_state_machine.py @@ -4,7 +4,7 @@ # Copyright (c) 2019, Tom De Keyser (@tdekeyser) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: stepfunctions_state_machine version_added: 1.0.0 @@ -48,9 +48,9 @@ - amazon.aws.tags author: - Tom De Keyser (@tdekeyser) -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Create a new AWS Step Functions state machine - name: Setup HelloWorld state machine community.aws.stepfunctions_state_machine: @@ -74,14 +74,14 @@ community.aws.stepfunctions_state_machine: name: HelloWorldStateMachine state: absent -''' +""" -RETURN = ''' +RETURN = r""" state_machine_arn: description: ARN of the AWS Step Functions state machine type: str returned: always -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_tag_list, diff --git a/plugins/modules/stepfunctions_state_machine_execution.py b/plugins/modules/stepfunctions_state_machine_execution.py index 334fd7190f4..7b8f14bb4c6 100644 --- a/plugins/modules/stepfunctions_state_machine_execution.py +++ b/plugins/modules/stepfunctions_state_machine_execution.py @@ -4,7 +4,7 @@ # Copyright (c) 2019, Prasad Katti (@prasadkatti) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: stepfunctions_state_machine_execution version_added: 1.0.0 @@ -51,9 +51,9 @@ author: - Prasad Katti (@prasadkatti) -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Start an execution of a state machine community.aws.stepfunctions_state_machine_execution: name: an_execution_name @@ -66,9 +66,9 @@ execution_arn: "arn:aws:states:us-west-2:123456789012:execution:HelloWorldStateMachineCopy:a1e8e2b5-5dfe-d40e-d9e3-6201061047c8" cause: "cause of task failure" error: "error code of the failure" -''' +""" -RETURN = ''' +RETURN = r""" execution_arn: description: ARN of the AWS Step Functions state machine execution. type: str @@ -84,7 +84,7 @@ type: str returned: if action == stop sample: "2019-11-02T22:39:49.071000-07:00" -''' +""" try: diff --git a/plugins/modules/storagegateway_info.py b/plugins/modules/storagegateway_info.py index 356dccb1a14..3167f58adec 100644 --- a/plugins/modules/storagegateway_info.py +++ b/plugins/modules/storagegateway_info.py @@ -6,7 +6,7 @@ # This module is sponsored by E.T.A.I. (www.etai.fr) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: storagegateway_info version_added: 1.0.0 @@ -46,9 +46,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -RETURN = ''' +RETURN = r""" gateways: description: list of gateway objects returned: always @@ -159,9 +159,9 @@ returned: always type: str sample: "present" -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. - name: "Get AWS storage gateway information" @@ -170,7 +170,7 @@ - name: "Get AWS storage gateway information for region eu-west-3" community.aws.aws_sgw_info: region: eu-west-3 -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict diff --git a/plugins/modules/sts_assume_role.py b/plugins/modules/sts_assume_role.py index cd50aeda72a..f1471a28d3b 100644 --- a/plugins/modules/sts_assume_role.py +++ b/plugins/modules/sts_assume_role.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: sts_assume_role version_added: 1.0.0 @@ -54,9 +54,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -RETURN = ''' +RETURN = r""" sts_creds: description: The temporary security credentials, which include an access key ID, a secret access key, and a security (or session) token returned: always @@ -77,9 +77,9 @@ description: True if obtaining the credentials succeeds type: bool returned: always -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # Assume an existing role (more details: https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html) @@ -98,7 +98,7 @@ tags: MyNewTag: value -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict diff --git a/plugins/modules/sts_session_token.py b/plugins/modules/sts_session_token.py index 1fa363020fc..4e5fa71deaa 100644 --- a/plugins/modules/sts_session_token.py +++ b/plugins/modules/sts_session_token.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: sts_session_token version_added: 1.0.0 @@ -33,9 +33,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -RETURN = """ +RETURN = r""" sts_creds: description: The Credentials object returned by the AWS Security Token Service returned: always @@ -52,7 +52,7 @@ """ -EXAMPLES = ''' +EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. # (more details: https://docs.aws.amazon.com/STS/latest/APIReference/API_GetSessionToken.html) @@ -71,7 +71,7 @@ tags: MyNewTag: value -''' +""" try: import botocore diff --git a/plugins/modules/waf_condition.py b/plugins/modules/waf_condition.py index 1ba8ef13e2b..a80ed81f809 100644 --- a/plugins/modules/waf_condition.py +++ b/plugins/modules/waf_condition.py @@ -5,7 +5,7 @@ # Copyright (c) 2015 Mike Mochan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: waf_condition short_description: Create and delete WAF Conditions version_added: 1.0.0 @@ -135,9 +135,9 @@ - absent default: present type: str -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: create WAF byte condition community.aws.waf_condition: name: my_byte_condition @@ -203,9 +203,9 @@ transformation: url_decode type: xss -''' +""" -RETURN = r''' +RETURN = r""" condition: description: Condition returned by operation. returned: always @@ -395,7 +395,7 @@ description: transformation applied to the text before matching. type: str sample: URL_DECODE -''' +""" try: import botocore diff --git a/plugins/modules/waf_info.py b/plugins/modules/waf_info.py index 4a0a38f92d1..daccaa9c4fb 100644 --- a/plugins/modules/waf_info.py +++ b/plugins/modules/waf_info.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" module: waf_info short_description: Retrieve information for WAF ACLs, Rules, Conditions and Filters version_added: 1.0.0 @@ -30,9 +30,9 @@ - amazon.aws.aws - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: obtain all WAF information community.aws.waf_info: @@ -44,9 +44,9 @@ community.aws.waf_info: name: test_waf waf_regional: true -''' +""" -RETURN = ''' +RETURN = r""" wafs: description: The WAFs that match the passed arguments. returned: success @@ -112,7 +112,7 @@ "type": "ByteMatch" } ] -''' +""" from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.waf import list_web_acls, get_web_acl diff --git a/plugins/modules/waf_rule.py b/plugins/modules/waf_rule.py index cd8612f7b33..b22684db9c3 100644 --- a/plugins/modules/waf_rule.py +++ b/plugins/modules/waf_rule.py @@ -5,7 +5,7 @@ # Copyright (c) 2015 Mike Mochan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: waf_rule short_description: Create and delete WAF Rules version_added: 1.0.0 @@ -69,9 +69,9 @@ default: false required: false type: bool -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: create WAF rule community.aws.waf_rule: name: my_waf_rule @@ -90,9 +90,9 @@ community.aws.waf_rule: name: "my_waf_rule" state: absent -''' +""" -RETURN = r''' +RETURN = r""" rule: description: WAF rule contents returned: always @@ -133,7 +133,7 @@ returned: always type: str sample: 15de0cbc-9204-4e1f-90e6-69b2f415c261 -''' +""" import re diff --git a/plugins/modules/waf_web_acl.py b/plugins/modules/waf_web_acl.py index a7254786190..4ee957a8693 100644 --- a/plugins/modules/waf_web_acl.py +++ b/plugins/modules/waf_web_acl.py @@ -4,7 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = r''' +DOCUMENTATION = r""" module: waf_web_acl short_description: Create and delete WAF Web ACLs version_added: 1.0.0 @@ -83,9 +83,9 @@ default: false required: false type: bool -''' +""" -EXAMPLES = r''' +EXAMPLES = r""" - name: create web ACL community.aws.waf_web_acl: name: my_web_acl @@ -101,9 +101,9 @@ community.aws.waf_web_acl: name: my_web_acl state: absent -''' +""" -RETURN = r''' +RETURN = r""" web_acl: description: contents of the Web ACL. returned: always @@ -156,7 +156,7 @@ returned: always type: str sample: 10fff965-4b6b-46e2-9d78-24f6d2e2d21c -''' +""" try: import botocore diff --git a/plugins/modules/wafv2_ip_set.py b/plugins/modules/wafv2_ip_set.py index 13a58a27355..30355db2b29 100644 --- a/plugins/modules/wafv2_ip_set.py +++ b/plugins/modules/wafv2_ip_set.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_ip_set version_added: 1.5.0 @@ -67,9 +67,9 @@ - amazon.aws.boto3 - amazon.aws.tags -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: test ip set wafv2_ip_set: name: test02 @@ -83,9 +83,9 @@ tags: A: B C: D -''' +""" -RETURN = """ +RETURN = r""" addresses: description: Current addresses of the ip set sample: diff --git a/plugins/modules/wafv2_ip_set_info.py b/plugins/modules/wafv2_ip_set_info.py index 58d1920cc07..de7b3e660e7 100644 --- a/plugins/modules/wafv2_ip_set_info.py +++ b/plugins/modules/wafv2_ip_set_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_ip_set_info version_added: 1.5.0 @@ -31,16 +31,16 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: test ip set wafv2_ip_set_info: name: test02 scope: REGIONAL -''' +""" -RETURN = """ +RETURN = r""" addresses: description: Current addresses of the ip set sample: diff --git a/plugins/modules/wafv2_resources.py b/plugins/modules/wafv2_resources.py index 5c69151ca35..3f7cef03bbd 100644 --- a/plugins/modules/wafv2_resources.py +++ b/plugins/modules/wafv2_resources.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_resources version_added: 1.5.0 @@ -40,18 +40,18 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: add test alb to waf string03 community.aws.wafv2_resources: name: string03 scope: REGIONAL state: present arn: "arn:aws:elasticloadbalancing:eu-central-1:111111111:loadbalancer/app/test03/dd83ea041ba6f933" -''' +""" -RETURN = """ +RETURN = r""" resource_arns: description: Current resources where the wafv2 is applied on sample: diff --git a/plugins/modules/wafv2_resources_info.py b/plugins/modules/wafv2_resources_info.py index e2874b1ef0e..326bf72c6bf 100644 --- a/plugins/modules/wafv2_resources_info.py +++ b/plugins/modules/wafv2_resources_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_resources_info version_added: 1.5.0 @@ -31,16 +31,16 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: get web acl community.aws.wafv2_resources_info: name: string03 scope: REGIONAL -''' +""" -RETURN = """ +RETURN = r""" resource_arns: description: Current resources where the wafv2 is applied on sample: diff --git a/plugins/modules/wafv2_rule_group.py b/plugins/modules/wafv2_rule_group.py index 098afbf43f3..df0156ff0d1 100644 --- a/plugins/modules/wafv2_rule_group.py +++ b/plugins/modules/wafv2_rule_group.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_rule_group version_added: 1.5.0 @@ -71,9 +71,9 @@ - amazon.aws.tags - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: change description community.aws.wafv2_rule_group: name: test02 @@ -149,9 +149,9 @@ A: B C: D register: out -''' +""" -RETURN = """ +RETURN = r""" arn: description: Rule group arn sample: arn:aws:wafv2:eu-central-1:11111111:regional/rulegroup/test02/6e90c01a-e4eb-43e5-b6aa-b1604cedf7d7 diff --git a/plugins/modules/wafv2_rule_group_info.py b/plugins/modules/wafv2_rule_group_info.py index eb407ed7743..1469d284b92 100644 --- a/plugins/modules/wafv2_rule_group_info.py +++ b/plugins/modules/wafv2_rule_group_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_rule_group_info version_added: 1.5.0 @@ -31,16 +31,16 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: rule group info community.aws.wafv2_rule_group_info: name: test02 scope: REGIONAL -''' +""" -RETURN = """ +RETURN = r""" arn: description: Rule group arn sample: arn:aws:wafv2:eu-central-1:11111111:regional/rulegroup/test02/6e90c01a-e4eb-43e5-b6aa-b1604cedf7d7 diff --git a/plugins/modules/wafv2_web_acl.py b/plugins/modules/wafv2_web_acl.py index 449cc4433cf..cc5de362afa 100644 --- a/plugins/modules/wafv2_web_acl.py +++ b/plugins/modules/wafv2_web_acl.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_web_acl version_added: 1.5.0 @@ -106,9 +106,9 @@ - amazon.aws.tags - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: Create test web acl community.aws.wafv2_web_acl: name: test05 @@ -249,9 +249,9 @@ region: us-east-1 state: present -''' +""" -RETURN = """ +RETURN = r""" arn: description: web acl arn sample: arn:aws:wafv2:eu-central-1:123456789012:regional/webacl/test05/318c1ab9-fa74-4b3b-a974-f92e25106f61 diff --git a/plugins/modules/wafv2_web_acl_info.py b/plugins/modules/wafv2_web_acl_info.py index 832b7b358fa..3198929a135 100644 --- a/plugins/modules/wafv2_web_acl_info.py +++ b/plugins/modules/wafv2_web_acl_info.py @@ -4,7 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -DOCUMENTATION = ''' +DOCUMENTATION = r""" --- module: wafv2_web_acl_info version_added: 1.5.0 @@ -31,17 +31,17 @@ - amazon.aws.ec2 - amazon.aws.boto3 -''' +""" -EXAMPLES = ''' +EXAMPLES = r""" - name: get web acl community.aws.wafv2_web_acl_info: name: test05 scope: REGIONAL register: out -''' +""" -RETURN = """ +RETURN = r""" arn: description: web acl arn sample: arn:aws:wafv2:eu-central-1:11111111:regional/webacl/test05/318c1ab9-fa74-4b3b-a974-f92e25106f61 From 248f1fc19621b1dcef5b0e5be337fe9eda36db4b Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 6 Mar 2023 16:32:37 +0100 Subject: [PATCH 3/7] docs fragments --- .../modules/accessanalyzer_validate_policy_info.py | 4 ++-- plugins/modules/acm_certificate.py | 6 +++--- plugins/modules/acm_certificate_info.py | 4 ++-- plugins/modules/api_gateway.py | 9 ++++----- plugins/modules/api_gateway_domain.py | 8 ++++---- plugins/modules/application_autoscaling_policy.py | 4 ++-- .../modules/autoscaling_complete_lifecycle_action.py | 4 ++-- plugins/modules/autoscaling_instance_refresh.py | 4 ++-- plugins/modules/autoscaling_instance_refresh_info.py | 4 ++-- plugins/modules/autoscaling_launch_config.py | 4 ++-- plugins/modules/autoscaling_launch_config_find.py | 4 ++-- plugins/modules/autoscaling_launch_config_info.py | 4 ++-- plugins/modules/autoscaling_lifecycle_hook.py | 4 ++-- plugins/modules/autoscaling_policy.py | 5 +++-- plugins/modules/autoscaling_scheduled_action.py | 6 +++--- plugins/modules/aws_region_info.py | 4 ++-- plugins/modules/batch_compute_environment.py | 4 ++-- plugins/modules/batch_job_definition.py | 4 ++-- plugins/modules/batch_job_queue.py | 4 ++-- plugins/modules/cloudformation_exports_info.py | 6 +++--- plugins/modules/cloudformation_stack_set.py | 6 +++--- plugins/modules/cloudfront_distribution.py | 11 +++++------ plugins/modules/cloudfront_distribution_info.py | 4 ++-- plugins/modules/cloudfront_invalidation.py | 8 ++++---- plugins/modules/cloudfront_origin_access_identity.py | 8 ++++---- plugins/modules/cloudfront_response_headers_policy.py | 8 ++++---- plugins/modules/codecommit_repository.py | 4 ++-- plugins/modules/codepipeline.py | 4 ++-- plugins/modules/config_aggregation_authorization.py | 4 ++-- plugins/modules/config_aggregator.py | 4 ++-- plugins/modules/config_delivery_channel.py | 4 ++-- plugins/modules/config_recorder.py | 4 ++-- plugins/modules/config_rule.py | 4 ++-- plugins/modules/data_pipeline.py | 8 ++++---- plugins/modules/directconnect_confirm_connection.py | 8 ++++---- plugins/modules/directconnect_connection.py | 8 ++++---- plugins/modules/directconnect_gateway.py | 8 ++++---- .../modules/directconnect_link_aggregation_group.py | 8 ++++---- plugins/modules/directconnect_virtual_interface.py | 4 ++-- plugins/modules/dms_endpoint.py | 4 ++-- plugins/modules/dms_replication_subnet_group.py | 7 +++---- plugins/modules/dynamodb_table.py | 6 +++--- plugins/modules/dynamodb_ttl.py | 4 ++-- plugins/modules/ec2_ami_copy.py | 4 ++-- plugins/modules/ec2_customer_gateway.py | 7 +++---- plugins/modules/ec2_customer_gateway_info.py | 7 +++---- plugins/modules/ec2_launch_template.py | 8 ++++---- plugins/modules/ec2_placement_group.py | 6 +++--- plugins/modules/ec2_placement_group_info.py | 7 +++---- plugins/modules/ec2_snapshot_copy.py | 4 ++-- plugins/modules/ec2_transit_gateway.py | 4 ++-- plugins/modules/ec2_transit_gateway_info.py | 7 +++---- plugins/modules/ec2_transit_gateway_vpc_attachment.py | 6 +++--- .../ec2_transit_gateway_vpc_attachment_info.py | 4 ++-- plugins/modules/ec2_vpc_egress_igw.py | 7 +++---- plugins/modules/ec2_vpc_nacl.py | 8 ++++---- plugins/modules/ec2_vpc_nacl_info.py | 6 +++--- plugins/modules/ec2_vpc_peer.py | 6 +++--- plugins/modules/ec2_vpc_peering_info.py | 7 +++---- plugins/modules/ec2_vpc_vgw.py | 6 +++--- plugins/modules/ec2_vpc_vgw_info.py | 4 ++-- plugins/modules/ec2_vpc_vpn.py | 10 +++++----- plugins/modules/ec2_vpc_vpn_info.py | 7 +++---- plugins/modules/ec2_win_password.py | 10 +++++----- plugins/modules/ecs_attribute.py | 7 +++---- plugins/modules/ecs_cluster.py | 7 +++---- plugins/modules/ecs_ecr.py | 9 ++++----- plugins/modules/ecs_service.py | 4 ++-- plugins/modules/ecs_service_info.py | 7 +++---- plugins/modules/ecs_tag.py | 7 +++---- plugins/modules/ecs_task.py | 6 +++--- plugins/modules/ecs_taskdefinition.py | 7 ++++--- plugins/modules/ecs_taskdefinition_info.py | 7 +++---- plugins/modules/efs.py | 5 ++--- plugins/modules/efs_info.py | 5 ++--- plugins/modules/efs_tag.py | 7 +++---- plugins/modules/eks_cluster.py | 5 ++--- plugins/modules/eks_fargate_profile.py | 7 +++---- plugins/modules/eks_nodegroup.py | 5 ++--- plugins/modules/elasticache.py | 7 +++---- plugins/modules/elasticache_info.py | 4 ++-- plugins/modules/elasticache_parameter_group.py | 9 +++++---- plugins/modules/elasticache_snapshot.py | 8 ++++---- plugins/modules/elasticache_subnet_group.py | 4 ++-- plugins/modules/elasticbeanstalk_app.py | 4 ++-- plugins/modules/elb_classic_lb_info.py | 6 +++--- plugins/modules/elb_instance.py | 6 +++--- plugins/modules/elb_network_lb.py | 10 +++++----- plugins/modules/elb_target.py | 9 +++++---- plugins/modules/elb_target_group.py | 11 ++++++----- plugins/modules/elb_target_group_info.py | 5 ++--- plugins/modules/elb_target_info.py | 8 ++++---- plugins/modules/glue_connection.py | 4 ++-- plugins/modules/glue_crawler.py | 6 +++--- plugins/modules/glue_job.py | 6 +++--- plugins/modules/iam_access_key.py | 6 +++--- plugins/modules/iam_access_key_info.py | 6 +++--- plugins/modules/iam_group.py | 6 +++--- plugins/modules/iam_managed_policy.py | 6 +++--- plugins/modules/iam_mfa_device_info.py | 6 +++--- plugins/modules/iam_password_policy.py | 7 +++---- plugins/modules/iam_role.py | 6 +++--- plugins/modules/iam_role_info.py | 7 +++---- plugins/modules/iam_saml_federation.py | 9 +++++---- plugins/modules/iam_server_certificate.py | 4 ++-- plugins/modules/iam_server_certificate_info.py | 7 +++---- plugins/modules/inspector_target.py | 4 ++-- plugins/modules/kinesis_stream.py | 7 +++---- plugins/modules/lightsail.py | 8 +++----- plugins/modules/lightsail_static_ip.py | 4 ++-- plugins/modules/msk_cluster.py | 10 +++++----- plugins/modules/msk_config.py | 4 ++-- plugins/modules/networkfirewall.py | 6 +++--- plugins/modules/networkfirewall_info.py | 4 ++-- plugins/modules/networkfirewall_policy.py | 5 ++--- plugins/modules/networkfirewall_policy_info.py | 4 ++-- plugins/modules/networkfirewall_rule_group.py | 7 +++---- plugins/modules/networkfirewall_rule_group_info.py | 4 ++-- plugins/modules/opensearch.py | 6 +++--- plugins/modules/opensearch_info.py | 4 ++-- plugins/modules/redshift.py | 6 +++--- plugins/modules/redshift_cross_region_snapshots.py | 7 +++---- plugins/modules/redshift_info.py | 7 +++---- plugins/modules/redshift_subnet_group.py | 6 +++--- plugins/modules/s3_bucket_info.py | 4 ++-- plugins/modules/s3_bucket_notification.py | 4 ++-- plugins/modules/s3_cors.py | 4 ++-- plugins/modules/s3_lifecycle.py | 7 +++---- plugins/modules/s3_logging.py | 7 +++---- plugins/modules/s3_metrics_configuration.py | 7 +++---- plugins/modules/s3_sync.py | 4 ++-- plugins/modules/s3_website.py | 7 +++---- plugins/modules/secretsmanager_secret.py | 10 +++++----- plugins/modules/ses_identity.py | 4 ++-- plugins/modules/ses_identity_policy.py | 4 ++-- plugins/modules/ses_rule_set.py | 4 ++-- plugins/modules/sns.py | 6 +++--- plugins/modules/sns_topic_info.py | 4 ++-- plugins/modules/sqs_queue.py | 6 +++--- plugins/modules/ssm_parameter.py | 11 +++++------ plugins/modules/stepfunctions_state_machine.py | 11 ++++++----- .../modules/stepfunctions_state_machine_execution.py | 10 +++++----- plugins/modules/storagegateway_info.py | 4 ++-- plugins/modules/sts_assume_role.py | 6 +++--- plugins/modules/sts_session_token.py | 6 +++--- plugins/modules/waf_condition.py | 9 +++++---- plugins/modules/waf_info.py | 4 ++-- plugins/modules/waf_rule.py | 9 +++++---- plugins/modules/waf_web_acl.py | 9 +++++---- plugins/modules/wafv2_ip_set.py | 7 +++---- plugins/modules/wafv2_ip_set_info.py | 7 +++---- plugins/modules/wafv2_resources.py | 7 +++---- plugins/modules/wafv2_resources_info.py | 7 +++---- plugins/modules/wafv2_rule_group.py | 9 ++++----- plugins/modules/wafv2_rule_group_info.py | 5 ++--- plugins/modules/wafv2_web_acl.py | 5 ++--- plugins/modules/wafv2_web_acl_info.py | 5 ++--- 157 files changed, 460 insertions(+), 497 deletions(-) diff --git a/plugins/modules/accessanalyzer_validate_policy_info.py b/plugins/modules/accessanalyzer_validate_policy_info.py index 8bba658150a..3e118843515 100644 --- a/plugins/modules/accessanalyzer_validate_policy_info.py +++ b/plugins/modules/accessanalyzer_validate_policy_info.py @@ -61,8 +61,8 @@ author: - Mark Chappell (@tremble) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/acm_certificate.py b/plugins/modules/acm_certificate.py index fe6978939b4..ccd0eae7c9f 100644 --- a/plugins/modules/acm_certificate.py +++ b/plugins/modules/acm_certificate.py @@ -158,10 +158,10 @@ author: - Matthew Davis (@matt-telstra) on behalf of Telstra Corporation Limited extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/acm_certificate_info.py b/plugins/modules/acm_certificate_info.py index 6b5b428ffe6..961229006cc 100644 --- a/plugins/modules/acm_certificate_info.py +++ b/plugins/modules/acm_certificate_info.py @@ -41,8 +41,8 @@ author: - Will Thames (@willthames) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/api_gateway.py b/plugins/modules/api_gateway.py index 6f45d3104a0..837b0deb0bd 100644 --- a/plugins/modules/api_gateway.py +++ b/plugins/modules/api_gateway.py @@ -100,16 +100,15 @@ default: EDGE author: - 'Michael De La Rue (@mikedlr)' -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - notes: - A future version of this module will probably use tags or another ID so that an API can be created only once. - As an early work around an intermediate version will probably do the same using a tag embedded in the API name. +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/api_gateway_domain.py b/plugins/modules/api_gateway_domain.py index 63a8b4e428e..0647aba5bfb 100644 --- a/plugins/modules/api_gateway_domain.py +++ b/plugins/modules/api_gateway_domain.py @@ -55,14 +55,14 @@ default: present choices: [ 'present', 'absent' ] type: str -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 notes: - Does not create a DNS entry on Route53, for that use the M(community.aws.route53) module. - Only supports TLS certificates from AWS ACM that can just be referenced by the ARN, while the AWS API still offers (deprecated) options to add own Certificates. +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/application_autoscaling_policy.py b/plugins/modules/application_autoscaling_policy.py index e44925e827d..89458e15f18 100644 --- a/plugins/modules/application_autoscaling_policy.py +++ b/plugins/modules/application_autoscaling_policy.py @@ -102,8 +102,8 @@ required: false type: bool extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_complete_lifecycle_action.py b/plugins/modules/autoscaling_complete_lifecycle_action.py index 98dd48c1c18..2b752c9a4b8 100644 --- a/plugins/modules/autoscaling_complete_lifecycle_action.py +++ b/plugins/modules/autoscaling_complete_lifecycle_action.py @@ -36,8 +36,8 @@ type: str required: true extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_instance_refresh.py b/plugins/modules/autoscaling_instance_refresh.py index 5c44352f13f..ce0b9fc3f4a 100644 --- a/plugins/modules/autoscaling_instance_refresh.py +++ b/plugins/modules/autoscaling_instance_refresh.py @@ -59,8 +59,8 @@ type: int type: dict extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_instance_refresh_info.py b/plugins/modules/autoscaling_instance_refresh_info.py index bf2e58f48d7..a56b63a3dce 100644 --- a/plugins/modules/autoscaling_instance_refresh_info.py +++ b/plugins/modules/autoscaling_instance_refresh_info.py @@ -37,8 +37,8 @@ type: int required: false extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_launch_config.py b/plugins/modules/autoscaling_launch_config.py index c7b145aad06..01c41c05332 100644 --- a/plugins/modules/autoscaling_launch_config.py +++ b/plugins/modules/autoscaling_launch_config.py @@ -180,8 +180,8 @@ type: str choices: ['default', 'dedicated'] extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_launch_config_find.py b/plugins/modules/autoscaling_launch_config_find.py index 6b96d4677e8..4d417be998b 100644 --- a/plugins/modules/autoscaling_launch_config_find.py +++ b/plugins/modules/autoscaling_launch_config_find.py @@ -36,8 +36,8 @@ - Corresponds to Python slice notation like list[:limit]. type: int extends_documentation_fragment: - - amazon.aws.ec2 - - amazon.aws.aws + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_launch_config_info.py b/plugins/modules/autoscaling_launch_config_info.py index 74040c2840b..d28b794eaf8 100644 --- a/plugins/modules/autoscaling_launch_config_info.py +++ b/plugins/modules/autoscaling_launch_config_info.py @@ -45,8 +45,8 @@ - Corresponds to Python slice notation. type: int extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_lifecycle_hook.py b/plugins/modules/autoscaling_lifecycle_hook.py index d4dc927e77a..7ac53c94b30 100644 --- a/plugins/modules/autoscaling_lifecycle_hook.py +++ b/plugins/modules/autoscaling_lifecycle_hook.py @@ -71,8 +71,8 @@ default: ABANDON type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/autoscaling_policy.py b/plugins/modules/autoscaling_policy.py index 970bd66b19e..c5ceff4a10c 100644 --- a/plugins/modules/autoscaling_policy.py +++ b/plugins/modules/autoscaling_policy.py @@ -187,10 +187,11 @@ description: - The estimated time, in seconds, until a newly launched instance can contribute to the CloudWatch metrics. extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ + EXAMPLES = r""" - name: Simple Scale Down policy community.aws.autoscaling_policy: diff --git a/plugins/modules/autoscaling_scheduled_action.py b/plugins/modules/autoscaling_scheduled_action.py index ac51a3f87b5..f38e03c0ec1 100644 --- a/plugins/modules/autoscaling_scheduled_action.py +++ b/plugins/modules/autoscaling_scheduled_action.py @@ -67,9 +67,9 @@ choices: ['present', 'absent'] author: Mark Woolley(@marknet15) extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/aws_region_info.py b/plugins/modules/aws_region_info.py index d386b1fba0e..1a5861b2c52 100644 --- a/plugins/modules/aws_region_info.py +++ b/plugins/modules/aws_region_info.py @@ -24,8 +24,8 @@ default: {} type: dict extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/batch_compute_environment.py b/plugins/modules/batch_compute_environment.py index b98c7c358df..2024a5d7a65 100644 --- a/plugins/modules/batch_compute_environment.py +++ b/plugins/modules/batch_compute_environment.py @@ -118,8 +118,8 @@ - The Amazon Resource Name (ARN) of the Amazon EC2 Spot Fleet IAM role applied to a SPOT compute environment. type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/batch_job_definition.py b/plugins/modules/batch_job_definition.py index 2f231db67ce..849f92ae344 100644 --- a/plugins/modules/batch_job_definition.py +++ b/plugins/modules/batch_job_definition.py @@ -177,8 +177,8 @@ many times. type: int extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/batch_job_queue.py b/plugins/modules/batch_job_queue.py index fe4ae6c0210..4303dbfe7eb 100644 --- a/plugins/modules/batch_job_queue.py +++ b/plugins/modules/batch_job_queue.py @@ -61,8 +61,8 @@ type: str description: The name of the compute environment. extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/cloudformation_exports_info.py b/plugins/modules/cloudformation_exports_info.py index cc89559d2e1..c74528de4a0 100644 --- a/plugins/modules/cloudformation_exports_info.py +++ b/plugins/modules/cloudformation_exports_info.py @@ -13,9 +13,9 @@ author: - "Michael Moyle (@mmoyle)" extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/cloudformation_stack_set.py b/plugins/modules/cloudformation_stack_set.py index 6bb93b453da..3dc120ab59d 100644 --- a/plugins/modules/cloudformation_stack_set.py +++ b/plugins/modules/cloudformation_stack_set.py @@ -169,9 +169,9 @@ author: "Ryan Scott Brown (@ryansb)" extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/cloudfront_distribution.py b/plugins/modules/cloudfront_distribution.py index 41927e79284..19efd3949d7 100644 --- a/plugins/modules/cloudfront_distribution.py +++ b/plugins/modules/cloudfront_distribution.py @@ -19,12 +19,6 @@ - Willem van Ketwich (@wilvk) - Will Thames (@willthames) -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - - amazon.aws.tags - options: state: @@ -595,6 +589,11 @@ default: 1800 type: int +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/cloudfront_distribution_info.py b/plugins/modules/cloudfront_distribution_info.py index 657255c86fb..a14d14f166b 100644 --- a/plugins/modules/cloudfront_distribution_info.py +++ b/plugins/modules/cloudfront_distribution_info.py @@ -141,8 +141,8 @@ type: bool extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/cloudfront_invalidation.py b/plugins/modules/cloudfront_invalidation.py index 14d33ae533c..e1db3d7fb65 100644 --- a/plugins/modules/cloudfront_invalidation.py +++ b/plugins/modules/cloudfront_invalidation.py @@ -16,10 +16,6 @@ author: Willem van Ketwich (@wilvk) -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 options: @@ -50,6 +46,10 @@ notes: - does not support check mode +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/cloudfront_origin_access_identity.py b/plugins/modules/cloudfront_origin_access_identity.py index f68297923a0..4d5e2f46b92 100644 --- a/plugins/modules/cloudfront_origin_access_identity.py +++ b/plugins/modules/cloudfront_origin_access_identity.py @@ -19,10 +19,6 @@ author: Willem van Ketwich (@wilvk) -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 options: @@ -52,6 +48,10 @@ notes: - Does not support check mode. +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/cloudfront_response_headers_policy.py b/plugins/modules/cloudfront_response_headers_policy.py index 67e34c431c1..3eeb53bef82 100644 --- a/plugins/modules/cloudfront_response_headers_policy.py +++ b/plugins/modules/cloudfront_response_headers_policy.py @@ -17,10 +17,6 @@ author: Stefan Horning (@stefanhorning) -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 options: @@ -55,6 +51,10 @@ default: {} type: dict +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/codecommit_repository.py b/plugins/modules/codecommit_repository.py index f1afdf4272d..f4ff21326ff 100644 --- a/plugins/modules/codecommit_repository.py +++ b/plugins/modules/codecommit_repository.py @@ -36,8 +36,8 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/codepipeline.py b/plugins/modules/codepipeline.py index 73f985db85f..c0733639b15 100644 --- a/plugins/modules/codepipeline.py +++ b/plugins/modules/codepipeline.py @@ -72,8 +72,8 @@ choices: ['present', 'absent'] type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/config_aggregation_authorization.py b/plugins/modules/config_aggregation_authorization.py index df64887ab7c..741141b6d5a 100644 --- a/plugins/modules/config_aggregation_authorization.py +++ b/plugins/modules/config_aggregation_authorization.py @@ -33,8 +33,8 @@ type: str required: true extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/config_aggregator.py b/plugins/modules/config_aggregator.py index a3c7c7ebc27..fac8f049a03 100644 --- a/plugins/modules/config_aggregator.py +++ b/plugins/modules/config_aggregator.py @@ -68,8 +68,8 @@ type: dict required: true extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/config_delivery_channel.py b/plugins/modules/config_delivery_channel.py index 450b9900700..87ff5d93d99 100644 --- a/plugins/modules/config_delivery_channel.py +++ b/plugins/modules/config_delivery_channel.py @@ -46,8 +46,8 @@ choices: ['One_Hour', 'Three_Hours', 'Six_Hours', 'Twelve_Hours', 'TwentyFour_Hours'] type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/config_recorder.py b/plugins/modules/config_recorder.py index 8788cd17071..75fb8c5bb0b 100644 --- a/plugins/modules/config_recorder.py +++ b/plugins/modules/config_recorder.py @@ -59,8 +59,8 @@ - Before you can set this option, you must set I(all_supported=false). type: dict extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/config_rule.py b/plugins/modules/config_rule.py index 8c7ea2fd234..12e0c77bb6d 100644 --- a/plugins/modules/config_rule.py +++ b/plugins/modules/config_rule.py @@ -83,8 +83,8 @@ choices: ['One_Hour', 'Three_Hours', 'Six_Hours', 'Twelve_Hours', 'TwentyFour_Hours'] type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/data_pipeline.py b/plugins/modules/data_pipeline.py index 73919db2863..82452d9129d 100644 --- a/plugins/modules/data_pipeline.py +++ b/plugins/modules/data_pipeline.py @@ -12,10 +12,6 @@ - Raghu Udiyar (@raags) - Sloane Hertel (@s-hertel) short_description: Create and manage AWS Datapipelines -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 description: - Create and manage AWS Datapipelines. Creation is not idempotent in AWS, so the C(uniqueId) is created by hashing the options (minus objects) given to the datapipeline. @@ -123,6 +119,10 @@ type: dict default: {} aliases: ['resource_tags'] +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/directconnect_confirm_connection.py b/plugins/modules/directconnect_confirm_connection.py index 5e262a50849..de1a816e684 100644 --- a/plugins/modules/directconnect_confirm_connection.py +++ b/plugins/modules/directconnect_confirm_connection.py @@ -16,10 +16,6 @@ The usage did not change. author: - "Matt Traynham (@mtraynham)" -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 options: name: description: @@ -31,6 +27,10 @@ - The ID of the Direct Connect connection. - One of I(connection_id) or I(name) must be specified. type: str +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/directconnect_connection.py b/plugins/modules/directconnect_connection.py index 6ed180abb90..6c980fbb459 100644 --- a/plugins/modules/directconnect_connection.py +++ b/plugins/modules/directconnect_connection.py @@ -17,10 +17,6 @@ The usage did not change. author: - "Sloane Hertel (@s-hertel)" -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 options: state: description: @@ -66,6 +62,10 @@ - By default this will not happen. This option must be explicitly set to C(true) to change I(bandwith) or I(location). type: bool default: false +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/directconnect_gateway.py b/plugins/modules/directconnect_gateway.py index 24e2eac4b7c..53fb47c9603 100644 --- a/plugins/modules/directconnect_gateway.py +++ b/plugins/modules/directconnect_gateway.py @@ -17,10 +17,6 @@ - Detaches Virtual Gateways to Direct Connect Gateway. - Prior to release 5.0.0 this module was called C(community.aws.aws_direct_connect_gateway). The usage did not change. -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 options: state: description: @@ -52,6 +48,10 @@ - How long to wait for the association to be deleted. type: int default: 320 +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/directconnect_link_aggregation_group.py b/plugins/modules/directconnect_link_aggregation_group.py index 2c2dcca7021..29d0445556a 100644 --- a/plugins/modules/directconnect_link_aggregation_group.py +++ b/plugins/modules/directconnect_link_aggregation_group.py @@ -15,10 +15,6 @@ The usage did not change. author: - "Sloane Hertel (@s-hertel)" -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 options: state: description: @@ -79,6 +75,10 @@ - The duration in seconds to wait if I(wait=true). default: 120 type: int +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/directconnect_virtual_interface.py b/plugins/modules/directconnect_virtual_interface.py index 65e458aaffa..4c13112a179 100644 --- a/plugins/modules/directconnect_virtual_interface.py +++ b/plugins/modules/directconnect_virtual_interface.py @@ -84,8 +84,8 @@ - The virtual interface ID. type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/dms_endpoint.py b/plugins/modules/dms_endpoint.py index 0b1b9cabce1..499c7a2ed11 100644 --- a/plugins/modules/dms_endpoint.py +++ b/plugins/modules/dms_endpoint.py @@ -141,8 +141,8 @@ author: - "Rui Moreira (@ruimoreira)" extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - amazon.aws.tags """ diff --git a/plugins/modules/dms_replication_subnet_group.py b/plugins/modules/dms_replication_subnet_group.py index a6b503706fc..c1ca2efe6f8 100644 --- a/plugins/modules/dms_replication_subnet_group.py +++ b/plugins/modules/dms_replication_subnet_group.py @@ -41,10 +41,9 @@ author: - "Rui Moreira (@ruimoreira)" extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/dynamodb_table.py b/plugins/modules/dynamodb_table.py index 29313b4eae7..3a307242715 100644 --- a/plugins/modules/dynamodb_table.py +++ b/plugins/modules/dynamodb_table.py @@ -140,10 +140,10 @@ default: True type: bool extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/dynamodb_ttl.py b/plugins/modules/dynamodb_ttl.py index a4bf6a27e82..5c5d78d1c15 100644 --- a/plugins/modules/dynamodb_ttl.py +++ b/plugins/modules/dynamodb_ttl.py @@ -32,8 +32,8 @@ author: Ted Timmons (@tedder) extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 +- amazon.aws.common.modules +- amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ec2_ami_copy.py b/plugins/modules/ec2_ami_copy.py index 805f4ca252a..1aad6181896 100644 --- a/plugins/modules/ec2_ami_copy.py +++ b/plugins/modules/ec2_ami_copy.py @@ -69,8 +69,8 @@ - Amir Moulavi (@amir343) - Tim C (@defunctio) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ec2_customer_gateway.py b/plugins/modules/ec2_customer_gateway.py index 108276d891e..e240ef635ae 100644 --- a/plugins/modules/ec2_customer_gateway.py +++ b/plugins/modules/ec2_customer_gateway.py @@ -47,10 +47,9 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_customer_gateway_info.py b/plugins/modules/ec2_customer_gateway_info.py index e2e9f7907be..9833b665ed5 100644 --- a/plugins/modules/ec2_customer_gateway_info.py +++ b/plugins/modules/ec2_customer_gateway_info.py @@ -26,10 +26,9 @@ elements: str default: [] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_launch_template.py b/plugins/modules/ec2_launch_template.py index 57558b83832..b632d8c64d3 100644 --- a/plugins/modules/ec2_launch_template.py +++ b/plugins/modules/ec2_launch_template.py @@ -15,10 +15,6 @@ - The M(amazon.aws.ec2_instance) and M(community.aws.autoscaling_group) modules can, instead of specifying all parameters on those tasks, be passed a Launch Template which contains settings like instance size, disk type, subnet, and more. -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 author: - Ryan Scott Brown (@ryansb) options: @@ -377,6 +373,10 @@ - Requires botocore >= 1.23.30 choices: [enabled, disabled] default: 'disabled' +extends_documentation_fragment: +- amazon.aws.common.modules +- amazon.aws.region.modules +- amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_placement_group.py b/plugins/modules/ec2_placement_group.py index ce16e40bf05..58ccf314e5a 100644 --- a/plugins/modules/ec2_placement_group.py +++ b/plugins/modules/ec2_placement_group.py @@ -43,9 +43,9 @@ choices: [ 'cluster', 'spread', 'partition' ] type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_placement_group_info.py b/plugins/modules/ec2_placement_group_info.py index cdb9425c9f0..78979bf7079 100644 --- a/plugins/modules/ec2_placement_group_info.py +++ b/plugins/modules/ec2_placement_group_info.py @@ -22,10 +22,9 @@ required: false default: [] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_snapshot_copy.py b/plugins/modules/ec2_snapshot_copy.py index 8d3ccc07854..af1a6828546 100644 --- a/plugins/modules/ec2_snapshot_copy.py +++ b/plugins/modules/ec2_snapshot_copy.py @@ -54,8 +54,8 @@ author: - Deepak Kothandan (@Deepakkothandan) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ec2_transit_gateway.py b/plugins/modules/ec2_transit_gateway.py index 80e302db246..5aa076c9968 100644 --- a/plugins/modules/ec2_transit_gateway.py +++ b/plugins/modules/ec2_transit_gateway.py @@ -72,8 +72,8 @@ author: - "Bob Boldin (@BobBoldin)" extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - amazon.aws.tags """ diff --git a/plugins/modules/ec2_transit_gateway_info.py b/plugins/modules/ec2_transit_gateway_info.py index 4badc521bd7..1a29f6fbb66 100644 --- a/plugins/modules/ec2_transit_gateway_info.py +++ b/plugins/modules/ec2_transit_gateway_info.py @@ -26,10 +26,9 @@ type: dict default: {} extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment.py b/plugins/modules/ec2_transit_gateway_vpc_attachment.py index 8368d06f9bf..c811eb93e90 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment.py @@ -96,10 +96,10 @@ author: - "Mark Chappell (@tremble)" extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py index 40f3d7eeafb..c2178995777 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py @@ -39,8 +39,8 @@ default: false author: "Mark Chappell (@tremble)" extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py index f29e96a888b..d233cfafd8f 100644 --- a/plugins/modules/ec2_vpc_egress_igw.py +++ b/plugins/modules/ec2_vpc_egress_igw.py @@ -25,10 +25,9 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_vpc_nacl.py b/plugins/modules/ec2_vpc_nacl.py index 073bc3ca671..727f889d8fa 100644 --- a/plugins/modules/ec2_vpc_nacl.py +++ b/plugins/modules/ec2_vpc_nacl.py @@ -72,13 +72,13 @@ choices: ['present', 'absent'] default: present author: Mike Mochan (@mmochan) +notes: + - Support for I(purge_tags) was added in release 4.0.0. extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - amazon.aws.tags -notes: - - Support for I(purge_tags) was added in release 4.0.0. """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py index 326b926ff9c..64d212e9a3e 100644 --- a/plugins/modules/ec2_vpc_nacl_info.py +++ b/plugins/modules/ec2_vpc_nacl_info.py @@ -33,9 +33,9 @@ - By default, the module will return all Network ACLs. extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_vpc_peer.py b/plugins/modules/ec2_vpc_peer.py index d6580bfd068..977ba33040d 100644 --- a/plugins/modules/ec2_vpc_peer.py +++ b/plugins/modules/ec2_vpc_peer.py @@ -55,10 +55,10 @@ author: - Mike Mochan (@mmochan) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_vpc_peering_info.py b/plugins/modules/ec2_vpc_peering_info.py index 29ac8d4fa27..8fb82384936 100644 --- a/plugins/modules/ec2_vpc_peering_info.py +++ b/plugins/modules/ec2_vpc_peering_info.py @@ -25,10 +25,9 @@ default: {} author: Karen Cheng (@Etherdaemon) extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_vpc_vgw.py b/plugins/modules/ec2_vpc_vgw.py index 7ed4626d03d..83a157daa27 100644 --- a/plugins/modules/ec2_vpc_vgw.py +++ b/plugins/modules/ec2_vpc_vgw.py @@ -53,10 +53,10 @@ author: - Nick Aslanidis (@naslanidis) extends_documentation_fragment: - - amazon.aws.ec2 - - amazon.aws.aws - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_vpc_vgw_info.py b/plugins/modules/ec2_vpc_vgw_info.py index e3201352a2c..2f88f804b4c 100644 --- a/plugins/modules/ec2_vpc_vgw_info.py +++ b/plugins/modules/ec2_vpc_vgw_info.py @@ -26,8 +26,8 @@ author: - "Nick Aslanidis (@naslanidis)" extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ec2_vpc_vpn.py b/plugins/modules/ec2_vpc_vpn.py index f60eb338077..24c85e87995 100644 --- a/plugins/modules/ec2_vpc_vpn.py +++ b/plugins/modules/ec2_vpc_vpn.py @@ -12,11 +12,6 @@ description: - This module creates, modifies, and deletes VPN connections. Idempotence is achieved by using the filters option or specifying the VPN connection identifier. -extends_documentation_fragment: - - amazon.aws.ec2 - - amazon.aws.aws - - amazon.aws.boto3 - - amazon.aws.tags author: - "Sloane Hertel (@s-hertel)" options: @@ -133,6 +128,11 @@ required: false type: int default: 15 +extends_documentation_fragment: + - amazon.aws.region.modules + - amazon.aws.common.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_vpc_vpn_info.py b/plugins/modules/ec2_vpc_vpn_info.py index e30545bc2cd..216638c2f70 100644 --- a/plugins/modules/ec2_vpc_vpn_info.py +++ b/plugins/modules/ec2_vpc_vpn_info.py @@ -28,10 +28,9 @@ elements: str default: [] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ec2_win_password.py b/plugins/modules/ec2_win_password.py index 4deadb97e38..8d093fbc574 100644 --- a/plugins/modules/ec2_win_password.py +++ b/plugins/modules/ec2_win_password.py @@ -46,13 +46,13 @@ default: 120 type: int -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - requirements: - cryptography + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ecs_attribute.py b/plugins/modules/ecs_attribute.py index a30d470aec5..b8926858a4a 100644 --- a/plugins/modules/ecs_attribute.py +++ b/plugins/modules/ecs_attribute.py @@ -52,10 +52,9 @@ required: true type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ecs_cluster.py b/plugins/modules/ecs_cluster.py index 7e00360f156..ec336edca4f 100644 --- a/plugins/modules/ecs_cluster.py +++ b/plugins/modules/ecs_cluster.py @@ -76,10 +76,9 @@ type: bool default: false extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ecs_ecr.py b/plugins/modules/ecs_ecr.py index 4239c4bb726..0e25ced6992 100644 --- a/plugins/modules/ecs_ecr.py +++ b/plugins/modules/ecs_ecr.py @@ -99,12 +99,11 @@ type: dict version_added: 5.2.0 author: - - David M. Lee (@leedm777) + - David M. Lee (@leedm777) extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ecs_service.py b/plugins/modules/ecs_service.py index d3a240d3357..2965b1d6415 100644 --- a/plugins/modules/ecs_service.py +++ b/plugins/modules/ecs_service.py @@ -289,8 +289,8 @@ required: false version_added: 4.1.0 extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ecs_service_info.py b/plugins/modules/ecs_service_info.py index 8b4b680ab22..28e9587ed36 100644 --- a/plugins/modules/ecs_service_info.py +++ b/plugins/modules/ecs_service_info.py @@ -40,10 +40,9 @@ elements: str aliases: ['name'] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ecs_tag.py b/plugins/modules/ecs_tag.py index 9d69df3257a..a217e6319ed 100644 --- a/plugins/modules/ecs_tag.py +++ b/plugins/modules/ecs_tag.py @@ -52,10 +52,9 @@ type: bool default: false extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ecs_task.py b/plugins/modules/ecs_task.py index 27e3f67bad4..885b4bc4d61 100644 --- a/plugins/modules/ecs_task.py +++ b/plugins/modules/ecs_task.py @@ -97,10 +97,9 @@ default: false version_added: 4.1.0 extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - """ EXAMPLES = r""" @@ -176,6 +175,7 @@ task_definition: console-sample-app-static-taskdef task: "arn:aws:ecs:us-west-2:123456789012:task/3f8353d1-29a8-4689-bbf6-ad79937ffe8a" """ + RETURN = r""" task: description: details about the task that was started diff --git a/plugins/modules/ecs_taskdefinition.py b/plugins/modules/ecs_taskdefinition.py index 5a5dbedf3e9..79d19799147 100644 --- a/plugins/modules/ecs_taskdefinition.py +++ b/plugins/modules/ecs_taskdefinition.py @@ -628,9 +628,9 @@ description: A cluster query language expression to apply to the constraint. type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" @@ -768,6 +768,7 @@ timeout: 15 state: present """ + RETURN = r""" taskdefinition: description: a reflection of the input parameters diff --git a/plugins/modules/ecs_taskdefinition_info.py b/plugins/modules/ecs_taskdefinition_info.py index aefcc0f2352..7a7c5c0549c 100644 --- a/plugins/modules/ecs_taskdefinition_info.py +++ b/plugins/modules/ecs_taskdefinition_info.py @@ -25,10 +25,9 @@ required: true type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/efs.py b/plugins/modules/efs.py index a02815dea01..72a9d92c80a 100644 --- a/plugins/modules/efs.py +++ b/plugins/modules/efs.py @@ -100,11 +100,10 @@ version_added: 2.1.0 extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags - amazon.aws.boto3 - """ EXAMPLES = r""" diff --git a/plugins/modules/efs_info.py b/plugins/modules/efs_info.py index 395734083f0..7c79c0adfae 100644 --- a/plugins/modules/efs_info.py +++ b/plugins/modules/efs_info.py @@ -37,10 +37,9 @@ elements: str default: [] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 +- amazon.aws.common.modules +- amazon.aws.region.modules - amazon.aws.boto3 - """ EXAMPLES = r""" diff --git a/plugins/modules/efs_tag.py b/plugins/modules/efs_tag.py index d97fcaed8ae..f577ba1888b 100644 --- a/plugins/modules/efs_tag.py +++ b/plugins/modules/efs_tag.py @@ -40,10 +40,9 @@ type: bool default: false extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/eks_cluster.py b/plugins/modules/eks_cluster.py index f29143a9afe..af8ba54f3aa 100644 --- a/plugins/modules/eks_cluster.py +++ b/plugins/modules/eks_cluster.py @@ -61,10 +61,9 @@ default: 1200 type: int extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - """ EXAMPLES = r""" diff --git a/plugins/modules/eks_fargate_profile.py b/plugins/modules/eks_fargate_profile.py index 49bfce40110..632d3db54c3 100644 --- a/plugins/modules/eks_fargate_profile.py +++ b/plugins/modules/eks_fargate_profile.py @@ -66,11 +66,10 @@ default: 1200 type: int extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags - + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/eks_nodegroup.py b/plugins/modules/eks_nodegroup.py index cc91533b479..ba8c06f9957 100644 --- a/plugins/modules/eks_nodegroup.py +++ b/plugins/modules/eks_nodegroup.py @@ -167,9 +167,8 @@ default: 1200 type: int extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - + - amazon.aws.common.modules + - amazon.aws.region.modules """ EXAMPLES = r""" diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index 5c9678a5124..e920c88d0fe 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -94,10 +94,9 @@ - Defaults to C(false). type: bool extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elasticache_info.py b/plugins/modules/elasticache_info.py index c3a2615a2ac..183cf39cfe6 100644 --- a/plugins/modules/elasticache_info.py +++ b/plugins/modules/elasticache_info.py @@ -18,8 +18,8 @@ author: - Will Thames (@willthames) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/elasticache_parameter_group.py b/plugins/modules/elasticache_parameter_group.py index bce94cdae4e..9aec0267e20 100644 --- a/plugins/modules/elasticache_parameter_group.py +++ b/plugins/modules/elasticache_parameter_group.py @@ -13,10 +13,6 @@ - Manage cache security groups in Amazon ElastiCache. - Returns information about the specified cache cluster. author: "Sloane Hertel (@s-hertel)" -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 options: group_family: @@ -45,6 +41,11 @@ description: - A user-specified dictionary of parameters to reset or modify for the cache parameter group. type: dict + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elasticache_snapshot.py b/plugins/modules/elasticache_snapshot.py index e648496e6cf..929b4b7d53c 100644 --- a/plugins/modules/elasticache_snapshot.py +++ b/plugins/modules/elasticache_snapshot.py @@ -13,10 +13,6 @@ - Manage cache snapshots in Amazon ElastiCache. - Returns information about the specified snapshot. author: "Sloane Hertel (@s-hertel)" -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 options: name: description: @@ -45,6 +41,10 @@ description: - The s3 bucket to which the snapshot is exported. type: str +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elasticache_subnet_group.py b/plugins/modules/elasticache_subnet_group.py index 6c8d66cb0ff..af9944421c7 100644 --- a/plugins/modules/elasticache_subnet_group.py +++ b/plugins/modules/elasticache_subnet_group.py @@ -38,8 +38,8 @@ author: - "Tim Mahoney (@timmahoney)" extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/elasticbeanstalk_app.py b/plugins/modules/elasticbeanstalk_app.py index 9b31c7f0dac..0348e6899a2 100644 --- a/plugins/modules/elasticbeanstalk_app.py +++ b/plugins/modules/elasticbeanstalk_app.py @@ -41,8 +41,8 @@ - Harpreet Singh (@hsingh) - Stephen Granger (@viper233) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/elb_classic_lb_info.py b/plugins/modules/elb_classic_lb_info.py index 4e9831037e1..f2aca86b0e4 100644 --- a/plugins/modules/elb_classic_lb_info.py +++ b/plugins/modules/elb_classic_lb_info.py @@ -22,9 +22,9 @@ elements: str default: [] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elb_instance.py b/plugins/modules/elb_instance.py index e59d434c0c8..91bc0d51fc9 100644 --- a/plugins/modules/elb_instance.py +++ b/plugins/modules/elb_instance.py @@ -56,9 +56,9 @@ - The ec2_elbs fact previously set by this module was deprecated in release 2.1.0 and since release 4.0.0 is no longer set. extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elb_network_lb.py b/plugins/modules/elb_network_lb.py index 51c302bc777..749af1a651f 100644 --- a/plugins/modules/elb_network_lb.py +++ b/plugins/modules/elb_network_lb.py @@ -123,14 +123,14 @@ - Sets the type of IP addresses used by the subnets of the specified Application Load Balancer. choices: [ 'ipv4', 'dualstack' ] type: str -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - - amazon.aws.tags notes: - Listeners are matched based on port. If a listener's port is changed then a new listener will be created. - Listener rules are matched based on priority. If a rule's priority is changed then a new rule will be created. +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elb_target.py b/plugins/modules/elb_target.py index 893a1e4dc3e..a9ab83d460e 100644 --- a/plugins/modules/elb_target.py +++ b/plugins/modules/elb_target.py @@ -66,13 +66,14 @@ required: true choices: [ 'present', 'absent' ] type: str -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 notes: - If you specified a port override when you registered a target, you must specify both the target ID and the port when you deregister it. + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elb_target_group.py b/plugins/modules/elb_target_group.py index d03ef23f7cd..f53aa6940c3 100644 --- a/plugins/modules/elb_target_group.py +++ b/plugins/modules/elb_target_group.py @@ -202,14 +202,15 @@ - The time to wait for the target group. default: 200 type: int -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - - amazon.aws.tags notes: - Once a target group has been created, only its health check can then be modified using subsequent calls + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/elb_target_group_info.py b/plugins/modules/elb_target_group_info.py index 0982feffed8..9ae9737b372 100644 --- a/plugins/modules/elb_target_group_info.py +++ b/plugins/modules/elb_target_group_info.py @@ -38,10 +38,9 @@ type: bool extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 +- amazon.aws.common.modules +- amazon.aws.region.modules - amazon.aws.boto3 - """ EXAMPLES = r""" diff --git a/plugins/modules/elb_target_info.py b/plugins/modules/elb_target_info.py index 57742b94919..1d6668a305a 100644 --- a/plugins/modules/elb_target_info.py +++ b/plugins/modules/elb_target_info.py @@ -25,11 +25,11 @@ - Whether or not to get target groups not used by any load balancers. type: bool default: true -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/glue_connection.py b/plugins/modules/glue_connection.py index b3c0233f910..843f46dfcdc 100644 --- a/plugins/modules/glue_connection.py +++ b/plugins/modules/glue_connection.py @@ -70,8 +70,8 @@ - Required when I(connection_type=NETWORK). type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/glue_crawler.py b/plugins/modules/glue_crawler.py index 0b6769f025f..6ac5c3dff7a 100644 --- a/plugins/modules/glue_crawler.py +++ b/plugins/modules/glue_crawler.py @@ -75,10 +75,10 @@ - Required when I(state=present). type: dict extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/glue_job.py b/plugins/modules/glue_job.py index b14efd13d81..50ef6eb57b0 100644 --- a/plugins/modules/glue_job.py +++ b/plugins/modules/glue_job.py @@ -101,10 +101,10 @@ notes: - Support for I(tags) and I(purge_tags) was added in release 2.2.0. extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_access_key.py b/plugins/modules/iam_access_key.py index a128eecdc01..c59d62c1089 100644 --- a/plugins/modules/iam_access_key.py +++ b/plugins/modules/iam_access_key.py @@ -52,9 +52,9 @@ default: false extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_access_key_info.py b/plugins/modules/iam_access_key_info.py index ea0a37b52ea..b1bdf5096be 100644 --- a/plugins/modules/iam_access_key_info.py +++ b/plugins/modules/iam_access_key_info.py @@ -22,9 +22,9 @@ aliases: ['username'] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_group.py b/plugins/modules/iam_group.py index 7ea4c6dde6e..d48fde8ec21 100644 --- a/plugins/modules/iam_group.py +++ b/plugins/modules/iam_group.py @@ -56,9 +56,9 @@ default: false type: bool extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_managed_policy.py b/plugins/modules/iam_managed_policy.py index d7fd27df2f0..e33d1ef379c 100644 --- a/plugins/modules/iam_managed_policy.py +++ b/plugins/modules/iam_managed_policy.py @@ -45,9 +45,9 @@ author: "Dan Kozlowski (@dkhenry)" extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_mfa_device_info.py b/plugins/modules/iam_mfa_device_info.py index 3740896e660..6526af34c48 100644 --- a/plugins/modules/iam_mfa_device_info.py +++ b/plugins/modules/iam_mfa_device_info.py @@ -18,9 +18,9 @@ - The name of the user whose MFA devices will be listed type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ RETURN = r""" diff --git a/plugins/modules/iam_password_policy.py b/plugins/modules/iam_password_policy.py index 627c4438eb9..dbe39fb64f8 100644 --- a/plugins/modules/iam_password_policy.py +++ b/plugins/modules/iam_password_policy.py @@ -72,10 +72,9 @@ type: bool aliases: [password_expire, expire] extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_role.py b/plugins/modules/iam_role.py index 96b749b33e5..6f909b47d59 100644 --- a/plugins/modules/iam_role.py +++ b/plugins/modules/iam_role.py @@ -90,10 +90,10 @@ default: True type: bool extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_role_info.py b/plugins/modules/iam_role_info.py index 0bb2fa201cf..ca0dd750688 100644 --- a/plugins/modules/iam_role_info.py +++ b/plugins/modules/iam_role_info.py @@ -27,10 +27,9 @@ - Mutually exclusive with I(name). type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_saml_federation.py b/plugins/modules/iam_saml_federation.py index aff5e80b5be..c47223c7eb8 100644 --- a/plugins/modules/iam_saml_federation.py +++ b/plugins/modules/iam_saml_federation.py @@ -27,14 +27,15 @@ default: present choices: [ "present", "absent" ] type: str -extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 author: - Tony (@axc450) - Aidan Rowe (@aidan-) + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/iam_server_certificate.py b/plugins/modules/iam_server_certificate.py index 212eb16be0b..7a04a2d4633 100644 --- a/plugins/modules/iam_server_certificate.py +++ b/plugins/modules/iam_server_certificate.py @@ -62,8 +62,8 @@ author: - Jonathan I. Davila (@defionscode) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/iam_server_certificate_info.py b/plugins/modules/iam_server_certificate_info.py index ea2d9f5e234..04b0e40afdd 100644 --- a/plugins/modules/iam_server_certificate_info.py +++ b/plugins/modules/iam_server_certificate_info.py @@ -18,10 +18,9 @@ - The name of the server certificate you are retrieving attributes for. type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/inspector_target.py b/plugins/modules/inspector_target.py index fd206b39a1d..77daa941aa0 100644 --- a/plugins/modules/inspector_target.py +++ b/plugins/modules/inspector_target.py @@ -37,8 +37,8 @@ - Required if I(state=present). type: dict extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/kinesis_stream.py b/plugins/modules/kinesis_stream.py index c9f62d6c044..0dafa54829e 100644 --- a/plugins/modules/kinesis_stream.py +++ b/plugins/modules/kinesis_stream.py @@ -71,10 +71,9 @@ - The GUID or alias for the KMS key. type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/lightsail.py b/plugins/modules/lightsail.py index f0e081b3d09..354475f8c98 100644 --- a/plugins/modules/lightsail.py +++ b/plugins/modules/lightsail.py @@ -66,10 +66,9 @@ type: int extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ @@ -91,7 +90,6 @@ state: absent region: us-east-1 name: my_instance - """ RETURN = r""" diff --git a/plugins/modules/lightsail_static_ip.py b/plugins/modules/lightsail_static_ip.py index aee0b8e9b23..3cd71a6ba63 100644 --- a/plugins/modules/lightsail_static_ip.py +++ b/plugins/modules/lightsail_static_ip.py @@ -25,8 +25,8 @@ required: true type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/msk_cluster.py b/plugins/modules/msk_cluster.py index 1c8db45981b..c092dc52599 100644 --- a/plugins/modules/msk_cluster.py +++ b/plugins/modules/msk_cluster.py @@ -196,16 +196,16 @@ description: How many seconds to wait. Cluster creation can take up to 20-30 minutes. type: int default: 3600 -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - - amazon.aws.tags notes: - All operations are time consuming, for example create takes 20-30 minutes, update kafka version -- more than one hour, update configuration -- 10-15 minutes; - Cluster's brokers get evenly distributed over a number of availability zones that's equal to the number of subnets. +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 + - amazon.aws.tags """ EXAMPLES = r""" diff --git a/plugins/modules/msk_config.py b/plugins/modules/msk_config.py index 80a0900c1cd..30f5adbf60b 100644 --- a/plugins/modules/msk_config.py +++ b/plugins/modules/msk_config.py @@ -41,8 +41,8 @@ type: list elements: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/networkfirewall.py b/plugins/modules/networkfirewall.py index 3bf2b407772..996c5b1d882 100644 --- a/plugins/modules/networkfirewall.py +++ b/plugins/modules/networkfirewall.py @@ -102,10 +102,10 @@ author: - Mark Chappell (@tremble) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/networkfirewall_info.py b/plugins/modules/networkfirewall_info.py index 13aaf3751f2..0f198ae9a16 100644 --- a/plugins/modules/networkfirewall_info.py +++ b/plugins/modules/networkfirewall_info.py @@ -34,8 +34,8 @@ author: Mark Chappell (@tremble) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/networkfirewall_policy.py b/plugins/modules/networkfirewall_policy.py index 9ef2eefde45..0c08c5f1bfb 100644 --- a/plugins/modules/networkfirewall_policy.py +++ b/plugins/modules/networkfirewall_policy.py @@ -137,12 +137,11 @@ type: int required: false - author: - Mark Chappell (@tremble) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - amazon.aws.tags """ diff --git a/plugins/modules/networkfirewall_policy_info.py b/plugins/modules/networkfirewall_policy_info.py index cd5fce92ded..2417cb26dae 100644 --- a/plugins/modules/networkfirewall_policy_info.py +++ b/plugins/modules/networkfirewall_policy_info.py @@ -26,8 +26,8 @@ author: Mark Chappell (@tremble) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/networkfirewall_rule_group.py b/plugins/modules/networkfirewall_rule_group.py index c358e6d884c..2b3eb34da95 100644 --- a/plugins/modules/networkfirewall_rule_group.py +++ b/plugins/modules/networkfirewall_rule_group.py @@ -261,14 +261,13 @@ type: int required: false - author: - Mark Chappell (@tremble) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/networkfirewall_rule_group_info.py b/plugins/modules/networkfirewall_rule_group_info.py index 76756985c4f..35ae13a2254 100644 --- a/plugins/modules/networkfirewall_rule_group_info.py +++ b/plugins/modules/networkfirewall_rule_group_info.py @@ -43,8 +43,8 @@ author: Mark Chappell (@tremble) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/opensearch.py b/plugins/modules/opensearch.py index 38efda729b3..374f3405beb 100644 --- a/plugins/modules/opensearch.py +++ b/plugins/modules/opensearch.py @@ -387,10 +387,10 @@ requirements: - botocore >= 1.21.38 extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/opensearch_info.py b/plugins/modules/opensearch_info.py index 9ef631c82ef..f9fb1f22d80 100644 --- a/plugins/modules/opensearch_info.py +++ b/plugins/modules/opensearch_info.py @@ -28,8 +28,8 @@ requirements: - botocore >= 1.21.38 extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/redshift.py b/plugins/modules/redshift.py index 7102b063e01..ffaf1fa71ed 100644 --- a/plugins/modules/redshift.py +++ b/plugins/modules/redshift.py @@ -166,10 +166,10 @@ notes: - Support for I(tags) and I(purge_tags) was added in release 1.3.0. extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/redshift_cross_region_snapshots.py b/plugins/modules/redshift_cross_region_snapshots.py index f6753ba1973..b62fa7b69d2 100644 --- a/plugins/modules/redshift_cross_region_snapshots.py +++ b/plugins/modules/redshift_cross_region_snapshots.py @@ -51,10 +51,9 @@ aliases: [ "retention_period" ] type: int extends_documentation_fragment: -- amazon.aws.ec2 -- amazon.aws.aws -- amazon.aws.boto3 - + - amazon.aws.region.modules + - amazon.aws.common.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/redshift_info.py b/plugins/modules/redshift_info.py index a1098584403..9cdcf16f208 100644 --- a/plugins/modules/redshift_info.py +++ b/plugins/modules/redshift_info.py @@ -27,10 +27,9 @@ required: false type: dict extends_documentation_fragment: -- amazon.aws.ec2 -- amazon.aws.aws -- amazon.aws.boto3 - + - amazon.aws.region.modules + - amazon.aws.common.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/redshift_subnet_group.py b/plugins/modules/redshift_subnet_group.py index 969179f6a3a..43ff95de534 100644 --- a/plugins/modules/redshift_subnet_group.py +++ b/plugins/modules/redshift_subnet_group.py @@ -37,9 +37,9 @@ type: list elements: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 author: - "Jens Carl (@j-carl), Hothead Games Inc." """ diff --git a/plugins/modules/s3_bucket_info.py b/plugins/modules/s3_bucket_info.py index 996779f8de8..3ed7e98504c 100644 --- a/plugins/modules/s3_bucket_info.py +++ b/plugins/modules/s3_bucket_info.py @@ -110,8 +110,8 @@ default: False version_added: 1.4.0 extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/s3_bucket_notification.py b/plugins/modules/s3_bucket_notification.py index 67b1c7abfe1..7940fcddf05 100644 --- a/plugins/modules/s3_bucket_notification.py +++ b/plugins/modules/s3_bucket_notification.py @@ -100,8 +100,8 @@ type: str default: '' extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/s3_cors.py b/plugins/modules/s3_cors.py index d4d141ee9a9..0c52dee9a19 100644 --- a/plugins/modules/s3_cors.py +++ b/plugins/modules/s3_cors.py @@ -33,8 +33,8 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index 8be29730045..cf4a3f3bba0 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -147,10 +147,9 @@ type: bool default: false extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/s3_logging.py b/plugins/modules/s3_logging.py index ca4d4d1910d..8ef0dba89e3 100644 --- a/plugins/modules/s3_logging.py +++ b/plugins/modules/s3_logging.py @@ -34,10 +34,9 @@ default: "" type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/s3_metrics_configuration.py b/plugins/modules/s3_metrics_configuration.py index fbf3319fa42..ca9d0cc8744 100644 --- a/plugins/modules/s3_metrics_configuration.py +++ b/plugins/modules/s3_metrics_configuration.py @@ -46,10 +46,9 @@ choices: ['present', 'absent'] type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/s3_sync.py b/plugins/modules/s3_sync.py index d3cc56f75ff..73062ffc5e1 100644 --- a/plugins/modules/s3_sync.py +++ b/plugins/modules/s3_sync.py @@ -115,8 +115,8 @@ author: Ted Timmons (@tedder) extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 +- amazon.aws.common.modules +- amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/s3_website.py b/plugins/modules/s3_website.py index 5619db7537a..9e04427fcff 100644 --- a/plugins/modules/s3_website.py +++ b/plugins/modules/s3_website.py @@ -42,10 +42,9 @@ type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/secretsmanager_secret.py b/plugins/modules/secretsmanager_secret.py index 3128cf73e44..e8e9685be8f 100644 --- a/plugins/modules/secretsmanager_secret.py +++ b/plugins/modules/secretsmanager_secret.py @@ -105,13 +105,13 @@ - Specifies the number of days between automatic scheduled rotations of the secret. default: 30 type: int -extends_documentation_fragment: - - amazon.aws.ec2 - - amazon.aws.aws - - amazon.aws.boto3 - - amazon.aws.tags notes: - Support for I(purge_tags) was added in release 4.0.0. +extends_documentation_fragment: + - amazon.aws.region.modules + - amazon.aws.common.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/ses_identity.py b/plugins/modules/ses_identity.py index 62b09c9bf80..85dbae4a858 100644 --- a/plugins/modules/ses_identity.py +++ b/plugins/modules/ses_identity.py @@ -86,8 +86,8 @@ type: 'bool' default: True extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ses_identity_policy.py b/plugins/modules/ses_identity_policy.py index 964d0abb47b..7b6c2d9e853 100644 --- a/plugins/modules/ses_identity_policy.py +++ b/plugins/modules/ses_identity_policy.py @@ -39,8 +39,8 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/ses_rule_set.py b/plugins/modules/ses_rule_set.py index 45b53f63d99..5534e42506f 100644 --- a/plugins/modules/ses_rule_set.py +++ b/plugins/modules/ses_rule_set.py @@ -44,8 +44,8 @@ required: False default: False extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/sns.py b/plugins/modules/sns.py index 68aee38d117..79d27dfbc05 100644 --- a/plugins/modules/sns.py +++ b/plugins/modules/sns.py @@ -75,9 +75,9 @@ choices: ['json', 'string'] type: str extends_documentation_fragment: -- amazon.aws.ec2 -- amazon.aws.aws -- amazon.aws.boto3 + - amazon.aws.region.modules + - amazon.aws.common.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/sns_topic_info.py b/plugins/modules/sns_topic_info.py index da17ca74de2..cce6bc2a251 100644 --- a/plugins/modules/sns_topic_info.py +++ b/plugins/modules/sns_topic_info.py @@ -18,8 +18,8 @@ required: false type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 +- amazon.aws.common.modules +- amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/sqs_queue.py b/plugins/modules/sqs_queue.py index 1186eaaa9bf..8a23eb90066 100644 --- a/plugins/modules/sqs_queue.py +++ b/plugins/modules/sqs_queue.py @@ -102,10 +102,10 @@ - Enables content-based deduplication. Used for FIFOs only. - Defaults to C(false). extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags + - amazon.aws.boto3 """ RETURN = r""" diff --git a/plugins/modules/ssm_parameter.py b/plugins/modules/ssm_parameter.py index 690415e6d92..7c6cdfd4519 100644 --- a/plugins/modules/ssm_parameter.py +++ b/plugins/modules/ssm_parameter.py @@ -84,15 +84,14 @@ - "Bill Wang (@ozbillwang) " - "Michael De La Rue (@mikedlr)" -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - - amazon.aws.tags - notes: - Support for I(tags) and I(purge_tags) was added in release 5.3.0. +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/stepfunctions_state_machine.py b/plugins/modules/stepfunctions_state_machine.py index 5eaaf65813f..c0fc81a7f3a 100644 --- a/plugins/modules/stepfunctions_state_machine.py +++ b/plugins/modules/stepfunctions_state_machine.py @@ -41,13 +41,14 @@ choices: [ present, absent ] type: str -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - - amazon.aws.tags author: - Tom De Keyser (@tdekeyser) + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/stepfunctions_state_machine_execution.py b/plugins/modules/stepfunctions_state_machine_execution.py index 7b8f14bb4c6..7d34e214daa 100644 --- a/plugins/modules/stepfunctions_state_machine_execution.py +++ b/plugins/modules/stepfunctions_state_machine_execution.py @@ -44,13 +44,13 @@ type: str default: '' -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 - author: - Prasad Katti (@prasadkatti) + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/storagegateway_info.py b/plugins/modules/storagegateway_info.py index 3167f58adec..91b50c7a480 100644 --- a/plugins/modules/storagegateway_info.py +++ b/plugins/modules/storagegateway_info.py @@ -43,8 +43,8 @@ required: false default: true extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/sts_assume_role.py b/plugins/modules/sts_assume_role.py index f1471a28d3b..4afab7d6fae 100644 --- a/plugins/modules/sts_assume_role.py +++ b/plugins/modules/sts_assume_role.py @@ -51,9 +51,9 @@ notes: - In order to use the assumed role in a following playbook task you must pass the access_key, access_secret and access_token. extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ RETURN = r""" diff --git a/plugins/modules/sts_session_token.py b/plugins/modules/sts_session_token.py index 4e5fa71deaa..de17ce39403 100644 --- a/plugins/modules/sts_session_token.py +++ b/plugins/modules/sts_session_token.py @@ -30,9 +30,9 @@ notes: - In order to use the session token in a following playbook task you must pass the I(access_key), I(access_secret) and I(access_token). extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ RETURN = r""" diff --git a/plugins/modules/waf_condition.py b/plugins/modules/waf_condition.py index a80ed81f809..15bc0580036 100644 --- a/plugins/modules/waf_condition.py +++ b/plugins/modules/waf_condition.py @@ -18,10 +18,6 @@ author: - Will Thames (@willthames) - Mike Mochan (@mmochan) -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 options: name: @@ -135,6 +131,11 @@ - absent default: present type: str + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/waf_info.py b/plugins/modules/waf_info.py index daccaa9c4fb..efe4f04bace 100644 --- a/plugins/modules/waf_info.py +++ b/plugins/modules/waf_info.py @@ -27,8 +27,8 @@ - Mike Mochan (@mmochan) - Will Thames (@willthames) extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 """ diff --git a/plugins/modules/waf_rule.py b/plugins/modules/waf_rule.py index b22684db9c3..816d64a2414 100644 --- a/plugins/modules/waf_rule.py +++ b/plugins/modules/waf_rule.py @@ -18,10 +18,6 @@ author: - Mike Mochan (@mmochan) - Will Thames (@willthames) -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 options: name: @@ -69,6 +65,11 @@ default: false required: false type: bool + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/waf_web_acl.py b/plugins/modules/waf_web_acl.py index 4ee957a8693..fe2e41887cd 100644 --- a/plugins/modules/waf_web_acl.py +++ b/plugins/modules/waf_web_acl.py @@ -17,10 +17,6 @@ author: - Mike Mochan (@mmochan) - Will Thames (@willthames) -extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 options: name: @@ -83,6 +79,11 @@ default: false required: false type: bool + +extends_documentation_fragment: + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_ip_set.py b/plugins/modules/wafv2_ip_set.py index 30355db2b29..24739d09bfe 100644 --- a/plugins/modules/wafv2_ip_set.py +++ b/plugins/modules/wafv2_ip_set.py @@ -62,11 +62,10 @@ - Support for I(purge_tags) was added in release 4.0.0. extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 - - amazon.aws.boto3 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags - + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_ip_set_info.py b/plugins/modules/wafv2_ip_set_info.py index de7b3e660e7..b4898d7f96a 100644 --- a/plugins/modules/wafv2_ip_set_info.py +++ b/plugins/modules/wafv2_ip_set_info.py @@ -27,10 +27,9 @@ type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_resources.py b/plugins/modules/wafv2_resources.py index 3f7cef03bbd..ac551dc6016 100644 --- a/plugins/modules/wafv2_resources.py +++ b/plugins/modules/wafv2_resources.py @@ -36,10 +36,9 @@ required: true extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_resources_info.py b/plugins/modules/wafv2_resources_info.py index 326bf72c6bf..a844d5c78f3 100644 --- a/plugins/modules/wafv2_resources_info.py +++ b/plugins/modules/wafv2_resources_info.py @@ -27,10 +27,9 @@ type: str extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_rule_group.py b/plugins/modules/wafv2_rule_group.py index df0156ff0d1..789a468bc63 100644 --- a/plugins/modules/wafv2_rule_group.py +++ b/plugins/modules/wafv2_rule_group.py @@ -66,11 +66,10 @@ type: bool extends_documentation_fragment: -- amazon.aws.aws -- amazon.aws.ec2 -- amazon.aws.tags -- amazon.aws.boto3 - + - amazon.aws.common.modules + - amazon.aws.region.modules + - amazon.aws.tags + - amazon.aws.boto3 """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_rule_group_info.py b/plugins/modules/wafv2_rule_group_info.py index 1469d284b92..1c7f6ea64bf 100644 --- a/plugins/modules/wafv2_rule_group_info.py +++ b/plugins/modules/wafv2_rule_group_info.py @@ -27,10 +27,9 @@ type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_web_acl.py b/plugins/modules/wafv2_web_acl.py index cc5de362afa..a62860d602e 100644 --- a/plugins/modules/wafv2_web_acl.py +++ b/plugins/modules/wafv2_web_acl.py @@ -101,11 +101,10 @@ - Support for the I(purge_tags) parameter was added in release 4.0.0. extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.tags - amazon.aws.boto3 - """ EXAMPLES = r""" diff --git a/plugins/modules/wafv2_web_acl_info.py b/plugins/modules/wafv2_web_acl_info.py index 3198929a135..423ba52543d 100644 --- a/plugins/modules/wafv2_web_acl_info.py +++ b/plugins/modules/wafv2_web_acl_info.py @@ -27,10 +27,9 @@ type: str extends_documentation_fragment: - - amazon.aws.aws - - amazon.aws.ec2 + - amazon.aws.common.modules + - amazon.aws.region.modules - amazon.aws.boto3 - """ EXAMPLES = r""" From f3cb408f345c78951bf2362857e79fb7ad84831b Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 6 Mar 2023 16:33:20 +0100 Subject: [PATCH 4/7] Minor docs lint --- .../modules/autoscaling_instance_refresh_info.py | 3 ++- plugins/modules/autoscaling_scheduled_action.py | 3 ++- plugins/modules/cloudformation_stack_set.py | 7 ++++--- plugins/modules/cloudfront_invalidation.py | 7 +++---- .../modules/cloudfront_origin_access_identity.py | 9 ++++----- .../modules/cloudfront_response_headers_policy.py | 9 ++++----- plugins/modules/codecommit_repository.py | 3 ++- plugins/modules/dynamodb_ttl.py | 3 ++- plugins/modules/ec2_customer_gateway.py | 15 ++++++++------- plugins/modules/ec2_customer_gateway_info.py | 5 +++-- plugins/modules/ec2_placement_group.py | 11 ++++++----- plugins/modules/ec2_placement_group_info.py | 5 +++-- plugins/modules/ec2_transit_gateway_info.py | 5 +++-- .../ec2_transit_gateway_vpc_attachment_info.py | 3 ++- plugins/modules/ec2_vpc_egress_igw.py | 5 +++-- plugins/modules/ec2_vpc_nacl.py | 3 ++- plugins/modules/ec2_vpc_nacl_info.py | 5 +++-- plugins/modules/ec2_vpc_peering_info.py | 3 ++- plugins/modules/ec2_vpc_vpn_info.py | 5 +++-- plugins/modules/ec2_win_password.py | 7 ++++--- plugins/modules/ecs_attribute.py | 5 +++-- plugins/modules/ecs_cluster.py | 9 +++++---- plugins/modules/ecs_tag.py | 6 ++---- plugins/modules/efs_info.py | 6 +++--- plugins/modules/efs_tag.py | 4 ++-- plugins/modules/elasticache.py | 3 ++- plugins/modules/elasticache_parameter_group.py | 3 ++- plugins/modules/elasticache_snapshot.py | 3 ++- plugins/modules/elasticache_subnet_group.py | 2 +- plugins/modules/elb_classic_lb_info.py | 2 +- plugins/modules/elb_instance.py | 7 ++++--- plugins/modules/elb_target.py | 5 +++-- plugins/modules/elb_target_group_info.py | 5 +++-- plugins/modules/elb_target_info.py | 4 ++-- plugins/modules/iam_access_key.py | 3 ++- plugins/modules/iam_access_key_info.py | 3 ++- plugins/modules/iam_group.py | 4 ++-- plugins/modules/iam_managed_policy.py | 5 +++-- plugins/modules/iam_mfa_device_info.py | 5 +++-- plugins/modules/iam_password_policy.py | 4 ++-- plugins/modules/iam_server_certificate_info.py | 3 ++- plugins/modules/kinesis_stream.py | 11 ++++++----- plugins/modules/lightsail.py | 8 ++++---- plugins/modules/networkfirewall_info.py | 3 ++- plugins/modules/networkfirewall_policy_info.py | 3 ++- .../modules/networkfirewall_rule_group_info.py | 3 ++- plugins/modules/opensearch.py | 3 ++- plugins/modules/opensearch_info.py | 3 ++- .../modules/redshift_cross_region_snapshots.py | 3 ++- plugins/modules/redshift_info.py | 3 ++- plugins/modules/s3_lifecycle.py | 5 +++-- plugins/modules/s3_logging.py | 5 +++-- plugins/modules/s3_metrics_configuration.py | 11 ++++++----- plugins/modules/s3_sync.py | 8 ++++---- plugins/modules/s3_website.py | 5 +++-- plugins/modules/sts_assume_role.py | 6 +++--- plugins/modules/sts_session_token.py | 5 +++-- 57 files changed, 165 insertions(+), 127 deletions(-) diff --git a/plugins/modules/autoscaling_instance_refresh_info.py b/plugins/modules/autoscaling_instance_refresh_info.py index a56b63a3dce..f514d98b140 100644 --- a/plugins/modules/autoscaling_instance_refresh_info.py +++ b/plugins/modules/autoscaling_instance_refresh_info.py @@ -14,7 +14,8 @@ - You can determine the status of a request by looking at the I(status) parameter. - Prior to release 5.0.0 this module was called C(community.aws.ec2_asg_instance_refresh_info). The usage did not change. -author: "Dan Khersonsky (@danquixote)" +author: + - "Dan Khersonsky (@danquixote)" options: name: description: diff --git a/plugins/modules/autoscaling_scheduled_action.py b/plugins/modules/autoscaling_scheduled_action.py index f38e03c0ec1..577254b95bb 100644 --- a/plugins/modules/autoscaling_scheduled_action.py +++ b/plugins/modules/autoscaling_scheduled_action.py @@ -65,7 +65,8 @@ required: false default: present choices: ['present', 'absent'] -author: Mark Woolley(@marknet15) +author: + - Mark Woolley(@marknet15) extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/cloudformation_stack_set.py b/plugins/modules/cloudformation_stack_set.py index 3dc120ab59d..d3841bc2b78 100644 --- a/plugins/modules/cloudformation_stack_set.py +++ b/plugins/modules/cloudformation_stack_set.py @@ -10,9 +10,9 @@ version_added: 1.0.0 short_description: Manage groups of CloudFormation stacks description: - - Launches/updates/deletes AWS CloudFormation Stack Sets. + - Launches/updates/deletes AWS CloudFormation Stack Sets. notes: - - To make an individual stack, you want the M(amazon.aws.cloudformation) module. + - To make an individual stack, you want the M(amazon.aws.cloudformation) module. options: name: description: @@ -167,7 +167,8 @@ - Note that this setting lets you specify the maximum for operations. For large deployments, under certain circumstances the actual count may be lower. -author: "Ryan Scott Brown (@ryansb)" +author: + - "Ryan Scott Brown (@ryansb)" extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/cloudfront_invalidation.py b/plugins/modules/cloudfront_invalidation.py index e1db3d7fb65..67b32eb7718 100644 --- a/plugins/modules/cloudfront_invalidation.py +++ b/plugins/modules/cloudfront_invalidation.py @@ -12,11 +12,10 @@ short_description: create invalidations for AWS CloudFront distributions description: - - Allows for invalidation of a batch of paths for a CloudFront distribution. - -author: Willem van Ketwich (@wilvk) - + - Allows for invalidation of a batch of paths for a CloudFront distribution. +author: + - Willem van Ketwich (@wilvk) options: distribution_id: diff --git a/plugins/modules/cloudfront_origin_access_identity.py b/plugins/modules/cloudfront_origin_access_identity.py index 4d5e2f46b92..4c13fc9f30f 100644 --- a/plugins/modules/cloudfront_origin_access_identity.py +++ b/plugins/modules/cloudfront_origin_access_identity.py @@ -14,12 +14,11 @@ CloudFront distribution description: - - Allows for easy creation, updating and deletion of origin access - identities. - -author: Willem van Ketwich (@wilvk) - + - Allows for easy creation, updating and deletion of origin access + identities. +author: + - Willem van Ketwich (@wilvk) options: state: diff --git a/plugins/modules/cloudfront_response_headers_policy.py b/plugins/modules/cloudfront_response_headers_policy.py index 3eeb53bef82..10482fcafdf 100644 --- a/plugins/modules/cloudfront_response_headers_policy.py +++ b/plugins/modules/cloudfront_response_headers_policy.py @@ -12,12 +12,11 @@ short_description: Create, update and delete response headers policies to be used in a Cloudfront distribution description: - - Create, update and delete response headers policies to be used in a Cloudfront distribution for inserting custom headers - - See docs at U(https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/cloudfront.html#CloudFront.Client.create_response_headers_policy) - -author: Stefan Horning (@stefanhorning) - + - Create, update and delete response headers policies to be used in a Cloudfront distribution for inserting custom headers + - See docs at U(https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/cloudfront.html#CloudFront.Client.create_response_headers_policy) +author: + - Stefan Horning (@stefanhorning) options: state: diff --git a/plugins/modules/codecommit_repository.py b/plugins/modules/codecommit_repository.py index f4ff21326ff..64e0a3cd66e 100644 --- a/plugins/modules/codecommit_repository.py +++ b/plugins/modules/codecommit_repository.py @@ -14,7 +14,8 @@ - See U(https://aws.amazon.com/codecommit/) for more information about CodeCommit. - Prior to release 5.0.0 this module was called C(community.aws.aws_codecommit). The usage did not change. -author: Shuang Wang (@ptux) +author: + - Shuang Wang (@ptux) options: name: description: diff --git a/plugins/modules/dynamodb_ttl.py b/plugins/modules/dynamodb_ttl.py index 5c5d78d1c15..bd1c7789903 100644 --- a/plugins/modules/dynamodb_ttl.py +++ b/plugins/modules/dynamodb_ttl.py @@ -30,7 +30,8 @@ required: true type: str -author: Ted Timmons (@tedder) +author: +- Ted Timmons (@tedder) extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/ec2_customer_gateway.py b/plugins/modules/ec2_customer_gateway.py index e240ef635ae..3ae519d1f30 100644 --- a/plugins/modules/ec2_customer_gateway.py +++ b/plugins/modules/ec2_customer_gateway.py @@ -10,14 +10,15 @@ version_added: 1.0.0 short_description: Manage an AWS customer gateway description: - - Manage an AWS customer gateway. -author: Michael Baydoun (@MichaelBaydoun) + - Manage an AWS customer gateway. +author: + - Michael Baydoun (@MichaelBaydoun) notes: - - You cannot create more than one customer gateway with the same IP address. If you run an identical request more than one time, the - first request creates the customer gateway, and subsequent requests return information about the existing customer gateway. The subsequent - requests do not create new customer gateway resources. - - Return values contain customer_gateway and customer_gateways keys which are identical dicts. You should use - customer_gateway. See U(https://github.com/ansible/ansible-modules-extras/issues/2773) for details. + - You cannot create more than one customer gateway with the same IP address. If you run an identical request more than one time, the + first request creates the customer gateway, and subsequent requests return information about the existing customer gateway. The subsequent + requests do not create new customer gateway resources. + - Return values contain customer_gateway and customer_gateways keys which are identical dicts. You should use + customer_gateway. See U(https://github.com/ansible/ansible-modules-extras/issues/2773) for details. options: bgp_asn: description: diff --git a/plugins/modules/ec2_customer_gateway_info.py b/plugins/modules/ec2_customer_gateway_info.py index 9833b665ed5..6bd422abafc 100644 --- a/plugins/modules/ec2_customer_gateway_info.py +++ b/plugins/modules/ec2_customer_gateway_info.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Gather information about customer gateways in AWS description: - - Gather information about customer gateways in AWS. -author: Madhura Naniwadekar (@Madhura-CSI) + - Gather information about customer gateways in AWS. +author: + - Madhura Naniwadekar (@Madhura-CSI) options: filters: description: diff --git a/plugins/modules/ec2_placement_group.py b/plugins/modules/ec2_placement_group.py index 58ccf314e5a..7ee6925f9f3 100644 --- a/plugins/modules/ec2_placement_group.py +++ b/plugins/modules/ec2_placement_group.py @@ -10,11 +10,12 @@ version_added: 1.0.0 short_description: Create or delete an EC2 Placement Group description: - - Create an EC2 Placement Group; if the placement group already exists, - nothing is done. Or, delete an existing placement group. If the placement - group is absent, do nothing. See also - U(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html) -author: "Brad Macpherson (@iiibrad)" + - Create an EC2 Placement Group; if the placement group already exists, + nothing is done. Or, delete an existing placement group. If the placement + group is absent, do nothing. See also + U(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html) +author: + - "Brad Macpherson (@iiibrad)" options: name: description: diff --git a/plugins/modules/ec2_placement_group_info.py b/plugins/modules/ec2_placement_group_info.py index 78979bf7079..323cc2f7303 100644 --- a/plugins/modules/ec2_placement_group_info.py +++ b/plugins/modules/ec2_placement_group_info.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: List EC2 Placement Group(s) details description: - - List details of EC2 Placement Group(s). -author: "Brad Macpherson (@iiibrad)" + - List details of EC2 Placement Group(s). +author: + - "Brad Macpherson (@iiibrad)" options: names: description: diff --git a/plugins/modules/ec2_transit_gateway_info.py b/plugins/modules/ec2_transit_gateway_info.py index 1a29f6fbb66..1fbcc0a7153 100644 --- a/plugins/modules/ec2_transit_gateway_info.py +++ b/plugins/modules/ec2_transit_gateway_info.py @@ -9,8 +9,9 @@ short_description: Gather information about ec2 transit gateways in AWS version_added: 1.0.0 description: - - Gather information about ec2 transit gateways in AWS -author: "Bob Boldin (@BobBoldin)" + - Gather information about ec2 transit gateways in AWS +author: + - "Bob Boldin (@BobBoldin)" options: transit_gateway_ids: description: diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py index c2178995777..1e14e6d10fe 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py @@ -37,7 +37,8 @@ type: bool required: false default: false -author: "Mark Chappell (@tremble)" +author: + - "Mark Chappell (@tremble)" extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py index d233cfafd8f..fc4d1cc7ccc 100644 --- a/plugins/modules/ec2_vpc_egress_igw.py +++ b/plugins/modules/ec2_vpc_egress_igw.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Manage an AWS VPC Egress Only Internet gateway description: - - Manage an AWS VPC Egress Only Internet gateway -author: Daniel Shepherd (@shepdelacreme) + - Manage an AWS VPC Egress Only Internet gateway +author: + - Daniel Shepherd (@shepdelacreme) options: vpc_id: description: diff --git a/plugins/modules/ec2_vpc_nacl.py b/plugins/modules/ec2_vpc_nacl.py index 727f889d8fa..e01a98ed99c 100644 --- a/plugins/modules/ec2_vpc_nacl.py +++ b/plugins/modules/ec2_vpc_nacl.py @@ -71,7 +71,8 @@ type: str choices: ['present', 'absent'] default: present -author: Mike Mochan (@mmochan) +author: + - Mike Mochan (@mmochan) notes: - Support for I(purge_tags) was added in release 4.0.0. extends_documentation_fragment: diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py index 64d212e9a3e..953943e6965 100644 --- a/plugins/modules/ec2_vpc_nacl_info.py +++ b/plugins/modules/ec2_vpc_nacl_info.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Gather information about Network ACLs in an AWS VPC description: - - Gather information about Network ACLs in an AWS VPC -author: "Brad Davidson (@brandond)" + - Gather information about Network ACLs in an AWS VPC +author: + - "Brad Davidson (@brandond)" options: nacl_ids: description: diff --git a/plugins/modules/ec2_vpc_peering_info.py b/plugins/modules/ec2_vpc_peering_info.py index 8fb82384936..30ce7ee9fd5 100644 --- a/plugins/modules/ec2_vpc_peering_info.py +++ b/plugins/modules/ec2_vpc_peering_info.py @@ -23,7 +23,8 @@ for possible filters. type: dict default: {} -author: Karen Cheng (@Etherdaemon) +author: + - Karen Cheng (@Etherdaemon) extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/ec2_vpc_vpn_info.py b/plugins/modules/ec2_vpc_vpn_info.py index 216638c2f70..3d3b2815170 100644 --- a/plugins/modules/ec2_vpc_vpn_info.py +++ b/plugins/modules/ec2_vpc_vpn_info.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Gather information about VPN Connections in AWS. description: - - Gather information about VPN Connections in AWS. -author: Madhura Naniwadekar (@Madhura-CSI) + - Gather information about VPN Connections in AWS. +author: + - Madhura Naniwadekar (@Madhura-CSI) options: filters: description: diff --git a/plugins/modules/ec2_win_password.py b/plugins/modules/ec2_win_password.py index 8d093fbc574..9831f9b72de 100644 --- a/plugins/modules/ec2_win_password.py +++ b/plugins/modules/ec2_win_password.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Gets the default administrator password for EC2 Windows instances description: - - Gets the default administrator password from any EC2 Windows instance. The instance is referenced by its id (e.g. C(i-XXXXXXX)). -author: "Rick Mendes (@rickmendes)" + - Gets the default administrator password from any EC2 Windows instance. The instance is referenced by its id (e.g. C(i-XXXXXXX)). +author: + - "Rick Mendes (@rickmendes)" options: instance_id: description: @@ -47,7 +48,7 @@ type: int requirements: -- cryptography + - cryptography extends_documentation_fragment: - amazon.aws.common.modules diff --git a/plugins/modules/ecs_attribute.py b/plugins/modules/ecs_attribute.py index b8926858a4a..79d878f779d 100644 --- a/plugins/modules/ecs_attribute.py +++ b/plugins/modules/ecs_attribute.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: manage ecs attributes description: - - Create, update or delete ECS container instance attributes. -author: Andrej Svenke (@anryko) + - Create, update or delete ECS container instance attributes. +author: + - Andrej Svenke (@anryko) options: cluster: description: diff --git a/plugins/modules/ecs_cluster.py b/plugins/modules/ecs_cluster.py index ec336edca4f..dab635ccb3a 100644 --- a/plugins/modules/ecs_cluster.py +++ b/plugins/modules/ecs_cluster.py @@ -10,11 +10,12 @@ version_added: 1.0.0 short_description: Create or terminate ECS clusters. notes: - - When deleting a cluster, the information returned is the state of the cluster prior to deletion. - - It will also wait for a cluster to have instances registered to it. + - When deleting a cluster, the information returned is the state of the cluster prior to deletion. + - It will also wait for a cluster to have instances registered to it. description: - - Creates or terminates ecs clusters. -author: Mark Chance (@Java1Guy) + - Creates or terminates ecs clusters. +author: + - Mark Chance (@Java1Guy) options: state: description: diff --git a/plugins/modules/ecs_tag.py b/plugins/modules/ecs_tag.py index a217e6319ed..d0e0578ad09 100644 --- a/plugins/modules/ecs_tag.py +++ b/plugins/modules/ecs_tag.py @@ -9,11 +9,9 @@ module: ecs_tag version_added: 1.0.0 short_description: create and remove tags on Amazon ECS resources -notes: - - none description: - - Creates and removes tags for Amazon ECS resources. - - Resources are referenced by their cluster name. + - Creates and removes tags for Amazon ECS resources. + - Resources are referenced by their cluster name. author: - Michael Pechner (@mpechner) options: diff --git a/plugins/modules/efs_info.py b/plugins/modules/efs_info.py index 7c79c0adfae..a653e35c81e 100644 --- a/plugins/modules/efs_info.py +++ b/plugins/modules/efs_info.py @@ -10,10 +10,10 @@ version_added: 1.0.0 short_description: Get information about Amazon EFS file systems description: - - This module can be used to search Amazon EFS file systems. - Note that the M(community.aws.efs_info) module no longer returns C(ansible_facts)! +- This module can be used to search Amazon EFS file systems. + Note that the M(community.aws.efs_info) module no longer returns C(ansible_facts)! author: - - "Ryan Sydnor (@ryansydnor)" +- "Ryan Sydnor (@ryansydnor)" options: name: description: diff --git a/plugins/modules/efs_tag.py b/plugins/modules/efs_tag.py index f577ba1888b..f4a8433930f 100644 --- a/plugins/modules/efs_tag.py +++ b/plugins/modules/efs_tag.py @@ -10,8 +10,8 @@ version_added: 2.0.0 short_description: create and remove tags on Amazon EFS resources description: - - Creates and removes tags for Amazon EFS resources. - - Resources are referenced by their ID (filesystem or filesystem access point). + - Creates and removes tags for Amazon EFS resources. + - Resources are referenced by their ID (filesystem or filesystem access point). author: - Milan Zink (@zeten30) options: diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index e920c88d0fe..4a70738dc3c 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -12,7 +12,8 @@ description: - Manage cache clusters in Amazon ElastiCache. - Returns information about the specified cache cluster. -author: "Jim Dalton (@jsdalton)" +author: + - "Jim Dalton (@jsdalton)" options: state: description: diff --git a/plugins/modules/elasticache_parameter_group.py b/plugins/modules/elasticache_parameter_group.py index 9aec0267e20..04a789bd59f 100644 --- a/plugins/modules/elasticache_parameter_group.py +++ b/plugins/modules/elasticache_parameter_group.py @@ -12,7 +12,8 @@ description: - Manage cache security groups in Amazon ElastiCache. - Returns information about the specified cache cluster. -author: "Sloane Hertel (@s-hertel)" +author: + - "Sloane Hertel (@s-hertel)" options: group_family: diff --git a/plugins/modules/elasticache_snapshot.py b/plugins/modules/elasticache_snapshot.py index 929b4b7d53c..6cc245a74f2 100644 --- a/plugins/modules/elasticache_snapshot.py +++ b/plugins/modules/elasticache_snapshot.py @@ -12,7 +12,8 @@ description: - Manage cache snapshots in Amazon ElastiCache. - Returns information about the specified snapshot. -author: "Sloane Hertel (@s-hertel)" +author: + - "Sloane Hertel (@s-hertel)" options: name: description: diff --git a/plugins/modules/elasticache_subnet_group.py b/plugins/modules/elasticache_subnet_group.py index af9944421c7..1cccc017a49 100644 --- a/plugins/modules/elasticache_subnet_group.py +++ b/plugins/modules/elasticache_subnet_group.py @@ -10,7 +10,7 @@ version_added: 1.0.0 short_description: manage ElastiCache subnet groups description: - - Creates, modifies, and deletes ElastiCache subnet groups. + - Creates, modifies, and deletes ElastiCache subnet groups. options: state: description: diff --git a/plugins/modules/elb_classic_lb_info.py b/plugins/modules/elb_classic_lb_info.py index f2aca86b0e4..6086ca80908 100644 --- a/plugins/modules/elb_classic_lb_info.py +++ b/plugins/modules/elb_classic_lb_info.py @@ -10,7 +10,7 @@ version_added: 1.0.0 short_description: Gather information about EC2 Elastic Load Balancers in AWS description: - - Gather information about EC2 Elastic Load Balancers in AWS + - Gather information about EC2 Elastic Load Balancers in AWS author: - "Michael Schultz (@mjschultz)" - "Fernando Jose Pando (@nand0p)" diff --git a/plugins/modules/elb_instance.py b/plugins/modules/elb_instance.py index 91bc0d51fc9..7f402b5bd5e 100644 --- a/plugins/modules/elb_instance.py +++ b/plugins/modules/elb_instance.py @@ -13,7 +13,8 @@ - This module de-registers or registers an AWS EC2 instance from the ELBs that it belongs to. - Will be marked changed when called only if there are ELBs found to operate on. -author: "John Jarvis (@jarv)" +author: + - "John Jarvis (@jarv)" options: state: description: @@ -53,8 +54,8 @@ default: 0 type: int notes: -- The ec2_elbs fact previously set by this module was deprecated in release 2.1.0 and since release - 4.0.0 is no longer set. + - The ec2_elbs fact previously set by this module was deprecated in release 2.1.0 and since release + 4.0.0 is no longer set. extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/elb_target.py b/plugins/modules/elb_target.py index a9ab83d460e..33121d76851 100644 --- a/plugins/modules/elb_target.py +++ b/plugins/modules/elb_target.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Manage a target in a target group description: - - Used to register or deregister a target in a target group. -author: "Rob White (@wimnat)" + - Used to register or deregister a target in a target group. +author: + - "Rob White (@wimnat)" options: deregister_unused: description: diff --git a/plugins/modules/elb_target_group_info.py b/plugins/modules/elb_target_group_info.py index 9ae9737b372..c3dfd454365 100644 --- a/plugins/modules/elb_target_group_info.py +++ b/plugins/modules/elb_target_group_info.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Gather information about ELB target groups in AWS description: - - Gather information about ELB target groups in AWS -author: Rob White (@wimnat) + - Gather information about ELB target groups in AWS +author: + - Rob White (@wimnat) options: load_balancer_arn: description: diff --git a/plugins/modules/elb_target_info.py b/plugins/modules/elb_target_info.py index 1d6668a305a..88e634d3adf 100644 --- a/plugins/modules/elb_target_info.py +++ b/plugins/modules/elb_target_info.py @@ -12,8 +12,8 @@ description: - This module will search through every target group in a region to find which ones have registered a given instance ID or IP. - -author: "Yaakov Kuperman (@yaakov-github)" +author: + - "Yaakov Kuperman (@yaakov-github)" options: instance_id: description: diff --git a/plugins/modules/iam_access_key.py b/plugins/modules/iam_access_key.py index c59d62c1089..0043a5e2b53 100644 --- a/plugins/modules/iam_access_key.py +++ b/plugins/modules/iam_access_key.py @@ -11,7 +11,8 @@ short_description: Manage AWS IAM User access keys description: - Manage AWS IAM user access keys. -author: Mark Chappell (@tremble) +author: + - Mark Chappell (@tremble) options: user_name: description: diff --git a/plugins/modules/iam_access_key_info.py b/plugins/modules/iam_access_key_info.py index b1bdf5096be..38e2e95cefc 100644 --- a/plugins/modules/iam_access_key_info.py +++ b/plugins/modules/iam_access_key_info.py @@ -12,7 +12,8 @@ description: - 'Fetches information AWS IAM user access keys.' - 'Note: It is not possible to fetch the secret access key.' -author: Mark Chappell (@tremble) +author: + - Mark Chappell (@tremble) options: user_name: description: diff --git a/plugins/modules/iam_group.py b/plugins/modules/iam_group.py index d48fde8ec21..1f71ba36f83 100644 --- a/plugins/modules/iam_group.py +++ b/plugins/modules/iam_group.py @@ -12,8 +12,8 @@ description: - Manage AWS IAM groups. author: -- Nick Aslanidis (@naslanidis) -- Maksym Postument (@infectsoldier) + - Nick Aslanidis (@naslanidis) + - Maksym Postument (@infectsoldier) options: name: description: diff --git a/plugins/modules/iam_managed_policy.py b/plugins/modules/iam_managed_policy.py index e33d1ef379c..b712ca32a6c 100644 --- a/plugins/modules/iam_managed_policy.py +++ b/plugins/modules/iam_managed_policy.py @@ -10,7 +10,7 @@ version_added: 1.0.0 short_description: Manage User Managed IAM policies description: - - Allows creating and removing managed IAM policies + - Allows creating and removing managed IAM policies options: policy_name: description: @@ -43,7 +43,8 @@ choices: [ "present", "absent" ] type: str -author: "Dan Kozlowski (@dkhenry)" +author: + - "Dan Kozlowski (@dkhenry)" extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/iam_mfa_device_info.py b/plugins/modules/iam_mfa_device_info.py index 6526af34c48..c0c434a9be9 100644 --- a/plugins/modules/iam_mfa_device_info.py +++ b/plugins/modules/iam_mfa_device_info.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: List the MFA (Multi-Factor Authentication) devices registered for a user description: - - List the MFA (Multi-Factor Authentication) devices registered for a user -author: Victor Costan (@pwnall) + - List the MFA (Multi-Factor Authentication) devices registered for a user +author: + - Victor Costan (@pwnall) options: user_name: description: diff --git a/plugins/modules/iam_password_policy.py b/plugins/modules/iam_password_policy.py index dbe39fb64f8..0508d562f99 100644 --- a/plugins/modules/iam_password_policy.py +++ b/plugins/modules/iam_password_policy.py @@ -10,9 +10,9 @@ version_added: 1.0.0 short_description: Update an IAM Password Policy description: - - Module updates an IAM Password Policy on a given AWS account + - Module updates an IAM Password Policy on a given AWS account author: - - "Aaron Smith (@slapula)" + - "Aaron Smith (@slapula)" options: state: description: diff --git a/plugins/modules/iam_server_certificate_info.py b/plugins/modules/iam_server_certificate_info.py index 04b0e40afdd..abfc9e04dd1 100644 --- a/plugins/modules/iam_server_certificate_info.py +++ b/plugins/modules/iam_server_certificate_info.py @@ -11,7 +11,8 @@ short_description: Retrieve the information of a server certificate description: - Retrieve the attributes of a server certificate. -author: "Allen Sanabria (@linuxdynasty)" +author: + - "Allen Sanabria (@linuxdynasty)" options: name: description: diff --git a/plugins/modules/kinesis_stream.py b/plugins/modules/kinesis_stream.py index 0dafa54829e..866e2bacea3 100644 --- a/plugins/modules/kinesis_stream.py +++ b/plugins/modules/kinesis_stream.py @@ -10,11 +10,12 @@ version_added: 1.0.0 short_description: Manage a Kinesis Stream. description: - - Create or Delete a Kinesis Stream. - - Update the retention period of a Kinesis Stream. - - Update Tags on a Kinesis Stream. - - Enable/disable server side encryption on a Kinesis Stream. -author: Allen Sanabria (@linuxdynasty) + - Create or Delete a Kinesis Stream. + - Update the retention period of a Kinesis Stream. + - Update Tags on a Kinesis Stream. + - Enable/disable server side encryption on a Kinesis Stream. +author: + - Allen Sanabria (@linuxdynasty) options: name: description: diff --git a/plugins/modules/lightsail.py b/plugins/modules/lightsail.py index 354475f8c98..af7a4117c1d 100644 --- a/plugins/modules/lightsail.py +++ b/plugins/modules/lightsail.py @@ -10,11 +10,11 @@ version_added: 1.0.0 short_description: Manage instances in AWS Lightsail description: - - Manage instances in AWS Lightsail. - - Instance tagging is not yet supported in this module. + - Manage instances in AWS Lightsail. + - Instance tagging is not yet supported in this module. author: - - "Nick Ball (@nickball)" - - "Prasad Katti (@prasadkatti)" + - "Nick Ball (@nickball)" + - "Prasad Katti (@prasadkatti)" options: state: description: diff --git a/plugins/modules/networkfirewall_info.py b/plugins/modules/networkfirewall_info.py index 0f198ae9a16..0fd34d05ec8 100644 --- a/plugins/modules/networkfirewall_info.py +++ b/plugins/modules/networkfirewall_info.py @@ -32,7 +32,8 @@ elements: str aliases: ['vpcs', 'vpc_id'] -author: Mark Chappell (@tremble) +author: + - Mark Chappell (@tremble) extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/networkfirewall_policy_info.py b/plugins/modules/networkfirewall_policy_info.py index 2417cb26dae..62f76027fbb 100644 --- a/plugins/modules/networkfirewall_policy_info.py +++ b/plugins/modules/networkfirewall_policy_info.py @@ -24,7 +24,8 @@ required: false type: str -author: Mark Chappell (@tremble) +author: + - Mark Chappell (@tremble) extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/networkfirewall_rule_group_info.py b/plugins/modules/networkfirewall_rule_group_info.py index 35ae13a2254..e1d597561dd 100644 --- a/plugins/modules/networkfirewall_rule_group_info.py +++ b/plugins/modules/networkfirewall_rule_group_info.py @@ -41,7 +41,8 @@ choices: ['managed', 'account'] type: str -author: Mark Chappell (@tremble) +author: + - Mark Chappell (@tremble) extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules diff --git a/plugins/modules/opensearch.py b/plugins/modules/opensearch.py index 374f3405beb..5a7b323f3d2 100644 --- a/plugins/modules/opensearch.py +++ b/plugins/modules/opensearch.py @@ -11,7 +11,8 @@ description: - Creates or modify a Amazon OpenSearch Service domain. version_added: 4.0.0 -author: "Sebastien Rosset (@sebastien-rosset)" +author: + - "Sebastien Rosset (@sebastien-rosset)" options: state: description: diff --git a/plugins/modules/opensearch_info.py b/plugins/modules/opensearch_info.py index f9fb1f22d80..b444b4c2151 100644 --- a/plugins/modules/opensearch_info.py +++ b/plugins/modules/opensearch_info.py @@ -11,7 +11,8 @@ description: - Obtain information about one Amazon OpenSearch Service domain. version_added: 4.0.0 -author: "Sebastien Rosset (@sebastien-rosset)" +author: + - "Sebastien Rosset (@sebastien-rosset)" options: domain_name: description: diff --git a/plugins/modules/redshift_cross_region_snapshots.py b/plugins/modules/redshift_cross_region_snapshots.py index b62fa7b69d2..f8e0970f65c 100644 --- a/plugins/modules/redshift_cross_region_snapshots.py +++ b/plugins/modules/redshift_cross_region_snapshots.py @@ -12,7 +12,8 @@ description: - Manage Redshift Cross Region Snapshots. Supports KMS-Encrypted Snapshots. - For more information, see U(https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-snapshots.html#cross-region-snapshot-copy) -author: JR Kerkstra (@captainkerk) +author: + - JR Kerkstra (@captainkerk) options: cluster_name: description: diff --git a/plugins/modules/redshift_info.py b/plugins/modules/redshift_info.py index 9cdcf16f208..f8dc499d841 100644 --- a/plugins/modules/redshift_info.py +++ b/plugins/modules/redshift_info.py @@ -8,7 +8,8 @@ --- module: redshift_info version_added: 1.0.0 -author: "Jens Carl (@j-carl)" +author: + - "Jens Carl (@j-carl)" short_description: Gather information about Redshift cluster(s) description: - Gather information about Redshift cluster(s). diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index cf4a3f3bba0..d002b52b33a 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Manage S3 bucket lifecycle rules in AWS description: - - Manage S3 bucket lifecycle rules in AWS. -author: "Rob White (@wimnat)" + - Manage S3 bucket lifecycle rules in AWS. +author: + - "Rob White (@wimnat)" notes: - If specifying expiration time as days then transition time must also be specified in days. - If specifying expiration time as a date then transition time must also be specified as a date. diff --git a/plugins/modules/s3_logging.py b/plugins/modules/s3_logging.py index 8ef0dba89e3..36d12565286 100644 --- a/plugins/modules/s3_logging.py +++ b/plugins/modules/s3_logging.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Manage logging facility of an s3 bucket in AWS description: - - Manage logging facility of an s3 bucket in AWS -author: Rob White (@wimnat) + - Manage logging facility of an s3 bucket in AWS +author: + - Rob White (@wimnat) options: name: description: diff --git a/plugins/modules/s3_metrics_configuration.py b/plugins/modules/s3_metrics_configuration.py index ca9d0cc8744..0036d1d5972 100644 --- a/plugins/modules/s3_metrics_configuration.py +++ b/plugins/modules/s3_metrics_configuration.py @@ -10,12 +10,13 @@ version_added: 1.3.0 short_description: Manage s3 bucket metrics configuration in AWS description: - - Manage s3 bucket metrics configuration in AWS which allows to get the CloudWatch request metrics for the objects in a bucket -author: Dmytro Vorotyntsev (@vorotech) + - Manage s3 bucket metrics configuration in AWS which allows to get the CloudWatch request metrics for the objects in a bucket +author: + - Dmytro Vorotyntsev (@vorotech) notes: - - This modules manages single metrics configuration, the s3 bucket might have up to 1,000 metrics configurations - - To request metrics for the entire bucket, create a metrics configuration without a filter - - Metrics configurations are necessary only to enable request metric, bucket-level daily storage metrics are always turned on + - This modules manages single metrics configuration, the s3 bucket might have up to 1,000 metrics configurations + - To request metrics for the entire bucket, create a metrics configuration without a filter + - Metrics configurations are necessary only to enable request metric, bucket-level daily storage metrics are always turned on options: bucket_name: description: diff --git a/plugins/modules/s3_sync.py b/plugins/modules/s3_sync.py index 73062ffc5e1..92817e6197f 100644 --- a/plugins/modules/s3_sync.py +++ b/plugins/modules/s3_sync.py @@ -10,8 +10,8 @@ version_added: 1.0.0 short_description: Efficiently upload multiple files to S3 description: - - The S3 module is great, but it is very slow for a large volume of files- even a dozen will be noticeable. In addition to speed, it handles globbing, - inclusions/exclusions, mime types, expiration mapping, recursion, cache control and smart directory mapping. +- The S3 module is great, but it is very slow for a large volume of files- even a dozen will be noticeable. In addition to speed, it handles globbing, + inclusions/exclusions, mime types, expiration mapping, recursion, cache control and smart directory mapping. options: mode: description: @@ -113,12 +113,12 @@ default: false type: bool -author: Ted Timmons (@tedder) +author: +- Ted Timmons (@tedder) extends_documentation_fragment: - amazon.aws.common.modules - amazon.aws.region.modules - amazon.aws.boto3 - """ EXAMPLES = r""" diff --git a/plugins/modules/s3_website.py b/plugins/modules/s3_website.py index 9e04427fcff..94f5e7f329f 100644 --- a/plugins/modules/s3_website.py +++ b/plugins/modules/s3_website.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Configure an s3 bucket as a website description: - - Configure an s3 bucket as a website -author: Rob White (@wimnat) + - Configure an s3 bucket as a website +author: + - Rob White (@wimnat) options: name: description: diff --git a/plugins/modules/sts_assume_role.py b/plugins/modules/sts_assume_role.py index 4afab7d6fae..13e3e7b475e 100644 --- a/plugins/modules/sts_assume_role.py +++ b/plugins/modules/sts_assume_role.py @@ -10,10 +10,10 @@ version_added: 1.0.0 short_description: Assume a role using AWS Security Token Service and obtain temporary credentials description: - - Assume a role using AWS Security Token Service and obtain temporary credentials. + - Assume a role using AWS Security Token Service and obtain temporary credentials. author: - - Boris Ekelchik (@bekelchik) - - Marek Piatek (@piontas) + - Boris Ekelchik (@bekelchik) + - Marek Piatek (@piontas) options: role_arn: description: diff --git a/plugins/modules/sts_session_token.py b/plugins/modules/sts_session_token.py index de17ce39403..c780097be61 100644 --- a/plugins/modules/sts_session_token.py +++ b/plugins/modules/sts_session_token.py @@ -10,8 +10,9 @@ version_added: 1.0.0 short_description: Obtain a session token from the AWS Security Token Service description: - - Obtain a session token from the AWS Security Token Service. -author: Victor Costan (@pwnall) + - Obtain a session token from the AWS Security Token Service. +author: + - Victor Costan (@pwnall) options: duration_seconds: description: From fac23e57422fb0b6ceb9b09fc3f5a8facb1e525f Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 6 Mar 2023 21:03:32 +0100 Subject: [PATCH 5/7] Mass update imports --- plugins/module_utils/ec2.py | 10 +++--- plugins/module_utils/modules.py | 8 ++--- plugins/module_utils/networkfirewall.py | 4 +-- plugins/module_utils/opensearch.py | 15 ++++---- plugins/module_utils/sns.py | 12 +++---- plugins/module_utils/transitgateway.py | 6 ++-- plugins/module_utils/wafv2.py | 5 +-- .../accessanalyzer_validate_policy_info.py | 3 +- plugins/modules/acm_certificate.py | 14 ++++---- plugins/modules/acm_certificate_info.py | 3 +- plugins/modules/api_gateway.py | 3 +- plugins/modules/api_gateway_domain.py | 15 +++++--- .../modules/application_autoscaling_policy.py | 10 +++--- .../modules/autoscaling_instance_refresh.py | 12 ++++--- .../autoscaling_instance_refresh_info.py | 9 +++-- plugins/modules/autoscaling_launch_config.py | 3 +- .../modules/autoscaling_launch_config_find.py | 1 + .../modules/autoscaling_launch_config_info.py | 3 +- plugins/modules/autoscaling_lifecycle_hook.py | 3 +- plugins/modules/autoscaling_policy.py | 6 ++-- .../modules/autoscaling_scheduled_action.py | 3 +- plugins/modules/aws_region_info.py | 15 ++++---- plugins/modules/batch_compute_environment.py | 10 ++++-- plugins/modules/batch_job_definition.py | 14 +++++--- plugins/modules/batch_job_queue.py | 13 ++++--- .../modules/cloudformation_exports_info.py | 7 ++-- plugins/modules/cloudformation_stack_set.py | 14 ++++---- plugins/modules/cloudfront_distribution.py | 29 ++++++++-------- .../modules/cloudfront_distribution_info.py | 3 +- plugins/modules/cloudfront_invalidation.py | 5 +-- .../cloudfront_origin_access_identity.py | 6 ++-- .../cloudfront_response_headers_policy.py | 18 ++++++---- plugins/modules/codebuild_project.py | 1 + plugins/modules/codecommit_repository.py | 3 +- plugins/modules/codepipeline.py | 5 +-- .../config_aggregation_authorization.py | 4 +-- plugins/modules/config_aggregator.py | 7 ++-- plugins/modules/config_delivery_channel.py | 5 +-- plugins/modules/config_recorder.py | 5 +-- plugins/modules/config_rule.py | 5 +-- plugins/modules/data_pipeline.py | 3 +- .../directconnect_confirm_connection.py | 9 +++-- plugins/modules/directconnect_connection.py | 9 +++-- .../directconnect_link_aggregation_group.py | 6 ++-- .../directconnect_virtual_interface.py | 8 +++-- plugins/modules/dms_endpoint.py | 8 +++-- .../modules/dms_replication_subnet_group.py | 4 ++- plugins/modules/dynamodb_table.py | 13 +++---- plugins/modules/ec2_ami_copy.py | 7 ++-- plugins/modules/ec2_customer_gateway.py | 3 +- plugins/modules/ec2_customer_gateway_info.py | 12 ++++--- plugins/modules/ec2_launch_template.py | 23 +++++++------ plugins/modules/ec2_placement_group.py | 5 +-- plugins/modules/ec2_placement_group_info.py | 6 ++-- plugins/modules/ec2_snapshot_copy.py | 3 +- plugins/modules/ec2_transit_gateway.py | 19 +++++++---- plugins/modules/ec2_transit_gateway_info.py | 9 ++--- .../ec2_transit_gateway_vpc_attachment.py | 2 -- ...ec2_transit_gateway_vpc_attachment_info.py | 2 -- plugins/modules/ec2_vpc_egress_igw.py | 5 +-- plugins/modules/ec2_vpc_nacl.py | 6 ++-- plugins/modules/ec2_vpc_nacl_info.py | 9 ++--- plugins/modules/ec2_vpc_peer.py | 14 ++++---- plugins/modules/ec2_vpc_peering_info.py | 12 ++++--- plugins/modules/ec2_vpc_vgw.py | 9 ++--- plugins/modules/ec2_vpc_vgw_info.py | 5 +-- plugins/modules/ec2_vpc_vpn.py | 22 +++++++----- plugins/modules/ec2_vpc_vpn_info.py | 12 ++++--- plugins/modules/ec2_win_password.py | 3 +- plugins/modules/ecs_attribute.py | 3 +- plugins/modules/ecs_cluster.py | 3 +- plugins/modules/ecs_ecr.py | 7 ++-- plugins/modules/ecs_service.py | 28 ++++++++------- plugins/modules/ecs_service_info.py | 7 ++-- plugins/modules/ecs_tag.py | 15 ++++---- plugins/modules/ecs_task.py | 8 +++-- plugins/modules/ecs_taskdefinition.py | 2 +- plugins/modules/ecs_taskdefinition_info.py | 7 ++-- plugins/modules/efs.py | 9 ++--- plugins/modules/efs_info.py | 6 ++-- plugins/modules/efs_tag.py | 10 ++++-- plugins/modules/eks_cluster.py | 16 +++++---- plugins/modules/eks_fargate_profile.py | 16 +++++---- plugins/modules/eks_nodegroup.py | 16 +++++---- plugins/modules/elasticache.py | 17 ++++------ plugins/modules/elasticache_info.py | 15 ++++---- plugins/modules/elasticache_snapshot.py | 3 +- plugins/modules/elasticache_subnet_group.py | 5 +-- plugins/modules/elasticbeanstalk_app.py | 3 +- plugins/modules/elb_classic_lb_info.py | 17 +++++----- plugins/modules/elb_instance.py | 5 +-- plugins/modules/elb_network_lb.py | 10 ++++-- plugins/modules/elb_target.py | 6 ++-- plugins/modules/elb_target_group.py | 11 +++--- plugins/modules/elb_target_group_info.py | 6 ++-- plugins/modules/elb_target_info.py | 10 +++--- plugins/modules/glue_connection.py | 8 ++--- plugins/modules/glue_crawler.py | 9 ++--- plugins/modules/glue_job.py | 10 +++--- plugins/modules/iam_access_key.py | 9 ++--- plugins/modules/iam_access_key_info.py | 5 +-- plugins/modules/iam_group.py | 5 +-- plugins/modules/iam_managed_policy.py | 7 ++-- plugins/modules/iam_password_policy.py | 3 +- plugins/modules/iam_role.py | 13 +++---- plugins/modules/iam_role_info.py | 7 ++-- plugins/modules/iam_saml_federation.py | 5 +-- plugins/modules/iam_server_certificate.py | 5 +-- .../modules/iam_server_certificate_info.py | 1 - plugins/modules/inspector_target.py | 18 +++++----- plugins/modules/kinesis_stream.py | 5 +-- plugins/modules/lightsail.py | 3 +- plugins/modules/lightsail_static_ip.py | 3 +- plugins/modules/msk_cluster.py | 10 +++--- plugins/modules/msk_config.py | 8 ++--- plugins/modules/networkfirewall.py | 3 +- plugins/modules/networkfirewall_info.py | 3 +- plugins/modules/networkfirewall_policy.py | 3 +- .../modules/networkfirewall_policy_info.py | 3 +- plugins/modules/networkfirewall_rule_group.py | 3 +- .../networkfirewall_rule_group_info.py | 3 +- plugins/modules/opensearch.py | 34 ++++++++----------- plugins/modules/opensearch_info.py | 16 ++++----- plugins/modules/redshift.py | 16 +++++---- plugins/modules/redshift_info.py | 6 ++-- plugins/modules/redshift_subnet_group.py | 7 ++-- plugins/modules/s3_bucket_info.py | 8 +++-- plugins/modules/s3_bucket_notification.py | 10 +++--- plugins/modules/s3_cors.py | 8 +++-- plugins/modules/s3_lifecycle.py | 9 ++--- plugins/modules/s3_logging.py | 7 ++-- plugins/modules/s3_metrics_configuration.py | 10 +++--- plugins/modules/s3_sync.py | 5 ++- plugins/modules/s3_website.py | 3 +- plugins/modules/secretsmanager_secret.py | 19 +++++++---- plugins/modules/ses_identity.py | 13 ++++--- plugins/modules/ses_identity_policy.py | 11 +++--- plugins/modules/ses_rule_set.py | 12 ++++--- plugins/modules/sns.py | 6 ++-- plugins/modules/sns_topic.py | 7 ++-- plugins/modules/sns_topic_info.py | 5 +-- plugins/modules/sqs_queue.py | 9 ++--- plugins/modules/ssm_parameter.py | 12 ++++--- .../modules/stepfunctions_state_machine.py | 17 +++++----- .../stepfunctions_state_machine_execution.py | 3 +- plugins/modules/storagegateway_info.py | 10 +++--- plugins/modules/sts_assume_role.py | 10 +++--- plugins/modules/waf_condition.py | 9 ++--- plugins/modules/waf_info.py | 4 ++- plugins/modules/waf_rule.py | 20 +++++------ plugins/modules/waf_web_acl.py | 20 +++++------ plugins/modules/wafv2_ip_set.py | 9 +++-- plugins/modules/wafv2_ip_set_info.py | 6 ++-- plugins/modules/wafv2_resources.py | 6 ++-- plugins/modules/wafv2_resources_info.py | 6 ++-- plugins/modules/wafv2_rule_group.py | 15 ++++---- plugins/modules/wafv2_rule_group_info.py | 8 +++-- plugins/modules/wafv2_web_acl.py | 11 +++--- plugins/modules/wafv2_web_acl_info.py | 6 ++-- 159 files changed, 789 insertions(+), 582 deletions(-) diff --git a/plugins/module_utils/ec2.py b/plugins/module_utils/ec2.py index 897a7458724..2874e278d9c 100644 --- a/plugins/module_utils/ec2.py +++ b/plugins/module_utils/ec2.py @@ -5,13 +5,13 @@ from copy import deepcopy -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_specifications +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list from ansible_collections.community.aws.plugins.module_utils.base import BaseResourceManager from ansible_collections.community.aws.plugins.module_utils.base import BaseWaiterFactory diff --git a/plugins/module_utils/modules.py b/plugins/module_utils/modules.py index cab9e8afc72..1ff78758a9b 100644 --- a/plugins/module_utils/modules.py +++ b/plugins/module_utils/modules.py @@ -3,12 +3,10 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.common import set_collection_info -from ansible_collections.community.aws.plugins.module_utils.common import ( - COMMUNITY_AWS_COLLECTION_NAME, - COMMUNITY_AWS_COLLECTION_VERSION, -) +from ansible_collections.community.aws.plugins.module_utils.common import COMMUNITY_AWS_COLLECTION_NAME +from ansible_collections.community.aws.plugins.module_utils.common import COMMUNITY_AWS_COLLECTION_VERSION class AnsibleCommunityAWSModule(AnsibleAWSModule): diff --git a/plugins/module_utils/networkfirewall.py b/plugins/module_utils/networkfirewall.py index cc1e349685c..e4ffa91d814 100644 --- a/plugins/module_utils/networkfirewall.py +++ b/plugins/module_utils/networkfirewall.py @@ -11,8 +11,8 @@ from ansible.module_utils.six import string_types from ansible_collections.amazon.aws.plugins.module_utils.arn import parse_aws_arn -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags diff --git a/plugins/module_utils/opensearch.py b/plugins/module_utils/opensearch.py index 9ea76bec4f5..b5e0bbfeb8c 100644 --- a/plugins/module_utils/opensearch.py +++ b/plugins/module_utils/opensearch.py @@ -13,17 +13,14 @@ except ImportError: pass # caught by AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - ansible_dict_to_boto3_tag_list, - camel_dict_to_snake_dict, - compare_aws_tags, -) -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.tagging import ( - boto3_tag_list_to_ansible_dict, -) +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible.module_utils.six import string_types +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + def get_domain_status(client, module, domain_name): """ diff --git a/plugins/module_utils/sns.py b/plugins/module_utils/sns.py index 23271df20cb..baa816b1a3e 100644 --- a/plugins/module_utils/sns.py +++ b/plugins/module_utils/sns.py @@ -11,13 +11,13 @@ except ImportError: pass # handled by AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags @AWSRetry.jittered_backoff() diff --git a/plugins/module_utils/transitgateway.py b/plugins/module_utils/transitgateway.py index 40d8f3f9602..fff2ce63ffe 100644 --- a/plugins/module_utils/transitgateway.py +++ b/plugins/module_utils/transitgateway.py @@ -5,9 +5,9 @@ from copy import deepcopy -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list from ansible_collections.community.aws.plugins.module_utils.ec2 import BaseEc2Manager from ansible_collections.community.aws.plugins.module_utils.ec2 import Boto3Mixin diff --git a/plugins/module_utils/wafv2.py b/plugins/module_utils/wafv2.py index 68611bec058..c1770978b9c 100644 --- a/plugins/module_utils/wafv2.py +++ b/plugins/module_utils/wafv2.py @@ -4,11 +4,12 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags diff --git a/plugins/modules/accessanalyzer_validate_policy_info.py b/plugins/modules/accessanalyzer_validate_policy_info.py index 3e118843515..817f414671b 100644 --- a/plugins/modules/accessanalyzer_validate_policy_info.py +++ b/plugins/modules/accessanalyzer_validate_policy_info.py @@ -167,8 +167,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def filter_findings(findings, type_filter): diff --git a/plugins/modules/acm_certificate.py b/plugins/modules/acm_certificate.py index ccd0eae7c9f..e7ea9c6d87a 100644 --- a/plugins/modules/acm_certificate.py +++ b/plugins/modules/acm_certificate.py @@ -250,15 +250,15 @@ except ImportError: pass # handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.acm import ACMServiceManager -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - boto3_tag_list_to_ansible_dict, - ansible_dict_to_boto3_tag_list, -) from ansible.module_utils._text import to_text +from ansible_collections.amazon.aws.plugins.module_utils.acm import ACMServiceManager +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def ensure_tags(client, module, resource_arn, existing_tags, tags, purge_tags): if tags is None: diff --git a/plugins/modules/acm_certificate_info.py b/plugins/modules/acm_certificate_info.py index 961229006cc..2364751f519 100644 --- a/plugins/modules/acm_certificate_info.py +++ b/plugins/modules/acm_certificate_info.py @@ -257,9 +257,10 @@ type: str """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.acm import ACMServiceManager +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def main(): argument_spec = dict( diff --git a/plugins/modules/api_gateway.py b/plugins/modules/api_gateway.py index 837b0deb0bd..615c3d89aa3 100644 --- a/plugins/modules/api_gateway.py +++ b/plugins/modules/api_gateway.py @@ -175,8 +175,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def main(): diff --git a/plugins/modules/api_gateway_domain.py b/plugins/modules/api_gateway_domain.py index 0647aba5bfb..a1afeaec95f 100644 --- a/plugins/modules/api_gateway_domain.py +++ b/plugins/modules/api_gateway_domain.py @@ -110,17 +110,22 @@ ] """ +import copy + try: - from botocore.exceptions import ClientError, BotoCoreError, EndpointConnectionError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError + from botocore.exceptions import EndpointConnectionError except ImportError: pass # caught by imported AnsibleAWSModule -import copy +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict, snake_dict_to_camel_dict def get_domain(module, client): diff --git a/plugins/modules/application_autoscaling_policy.py b/plugins/modules/application_autoscaling_policy.py index 89458e15f18..1b8669d84c8 100644 --- a/plugins/modules/application_autoscaling_policy.py +++ b/plugins/modules/application_autoscaling_policy.py @@ -281,16 +281,18 @@ returned: when state present type: str sample: '2017-09-28T08:22:51.881000-03:00' -""" # NOQA - -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import _camel_to_snake, camel_dict_to_snake_dict +""" try: import botocore except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import _camel_to_snake + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + # Merge the results of the scalable target creation and policy deletion/creation # There's no risk in overriding values since mutual keys have the same values in our case diff --git a/plugins/modules/autoscaling_instance_refresh.py b/plugins/modules/autoscaling_instance_refresh.py index ce0b9fc3f4a..7cf82132e64 100644 --- a/plugins/modules/autoscaling_instance_refresh.py +++ b/plugins/modules/autoscaling_instance_refresh.py @@ -138,16 +138,18 @@ """ try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.core import scrub_none_parameters -from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict def start_or_cancel_instance_refresh(conn, module): diff --git a/plugins/modules/autoscaling_instance_refresh_info.py b/plugins/modules/autoscaling_instance_refresh_info.py index f514d98b140..64581b46829 100644 --- a/plugins/modules/autoscaling_instance_refresh_info.py +++ b/plugins/modules/autoscaling_instance_refresh_info.py @@ -120,13 +120,16 @@ """ try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict def find_asg_instance_refreshes(conn, module): diff --git a/plugins/modules/autoscaling_launch_config.py b/plugins/modules/autoscaling_launch_config.py index 01c41c05332..b21f296ce0e 100644 --- a/plugins/modules/autoscaling_launch_config.py +++ b/plugins/modules/autoscaling_launch_config.py @@ -451,9 +451,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def create_block_device_meta(module, volume): if 'snapshot' not in volume and 'ephemeral' not in volume and 'no_device' not in volume: diff --git a/plugins/modules/autoscaling_launch_config_find.py b/plugins/modules/autoscaling_launch_config_find.py index 4d417be998b..8f3ca14bec3 100644 --- a/plugins/modules/autoscaling_launch_config_find.py +++ b/plugins/modules/autoscaling_launch_config_find.py @@ -129,6 +129,7 @@ sample: True ... """ + import re try: diff --git a/plugins/modules/autoscaling_launch_config_info.py b/plugins/modules/autoscaling_launch_config_info.py index d28b794eaf8..73e8fbdd8da 100644 --- a/plugins/modules/autoscaling_launch_config_info.py +++ b/plugins/modules/autoscaling_launch_config_info.py @@ -150,7 +150,6 @@ try: import botocore - from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule @@ -170,7 +169,7 @@ def list_launch_configs(connection, module): try: pg = connection.get_paginator('describe_launch_configurations') launch_configs = pg.paginate(LaunchConfigurationNames=launch_config_name).build_full_result() - except ClientError as e: + except botocore.exceptions.ClientError as e: module.fail_json_aws(e, msg="Failed to list launch configs") snaked_launch_configs = [] diff --git a/plugins/modules/autoscaling_lifecycle_hook.py b/plugins/modules/autoscaling_lifecycle_hook.py index 7ac53c94b30..a3b8edb499b 100644 --- a/plugins/modules/autoscaling_lifecycle_hook.py +++ b/plugins/modules/autoscaling_lifecycle_hook.py @@ -135,9 +135,10 @@ except ImportError: pass # handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def create_lifecycle_hook(connection, module): diff --git a/plugins/modules/autoscaling_policy.py b/plugins/modules/autoscaling_policy.py index c5ceff4a10c..b628fe7b58f 100644 --- a/plugins/modules/autoscaling_policy.py +++ b/plugins/modules/autoscaling_policy.py @@ -355,10 +355,12 @@ except ImportError: pass # caught by imported AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def build_target_specification(target_tracking_config): diff --git a/plugins/modules/autoscaling_scheduled_action.py b/plugins/modules/autoscaling_scheduled_action.py index 577254b95bb..bf0d4bcc44f 100644 --- a/plugins/modules/autoscaling_scheduled_action.py +++ b/plugins/modules/autoscaling_scheduled_action.py @@ -164,8 +164,9 @@ except ImportError: HAS_DATEUTIL = False +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def format_request(): diff --git a/plugins/modules/aws_region_info.py b/plugins/modules/aws_region_info.py index 1a5861b2c52..837e9326552 100644 --- a/plugins/modules/aws_region_info.py +++ b/plugins/modules/aws_region_info.py @@ -54,16 +54,19 @@ }]" """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict - try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def main(): argument_spec = dict( diff --git a/plugins/modules/batch_compute_environment.py b/plugins/modules/batch_compute_environment.py index 2024a5d7a65..79123501992 100644 --- a/plugins/modules/batch_compute_environment.py +++ b/plugins/modules/batch_compute_environment.py @@ -223,14 +223,18 @@ """ import re -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import snake_dict_to_camel_dict, camel_dict_to_snake_dict try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + # --------------------------------------------------------------------------------------------------- # diff --git a/plugins/modules/batch_job_definition.py b/plugins/modules/batch_job_definition.py index 849f92ae344..5eac0cacfe1 100644 --- a/plugins/modules/batch_job_definition.py +++ b/plugins/modules/batch_job_definition.py @@ -223,15 +223,19 @@ type: dict """ -from ansible_collections.amazon.aws.plugins.module_utils.batch import cc, set_api_params -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict - try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.batch import cc +from ansible_collections.amazon.aws.plugins.module_utils.batch import set_api_params + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + # --------------------------------------------------------------------------------------------------- # diff --git a/plugins/modules/batch_job_queue.py b/plugins/modules/batch_job_queue.py index 4303dbfe7eb..f71848bb04a 100644 --- a/plugins/modules/batch_job_queue.py +++ b/plugins/modules/batch_job_queue.py @@ -104,15 +104,18 @@ type: dict """ -from ansible_collections.amazon.aws.plugins.module_utils.batch import set_api_params -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict - try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.batch import set_api_params + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + # --------------------------------------------------------------------------------------------------- # # Helper Functions & classes diff --git a/plugins/modules/cloudformation_exports_info.py b/plugins/modules/cloudformation_exports_info.py index c74528de4a0..604abfd1436 100644 --- a/plugins/modules/cloudformation_exports_info.py +++ b/plugins/modules/cloudformation_exports_info.py @@ -35,15 +35,16 @@ type: dict """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry - try: from botocore.exceptions import ClientError from botocore.exceptions import BotoCoreError except ImportError: pass # handled by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + @AWSRetry.exponential_backoff() def list_exports(cloudformation_client): diff --git a/plugins/modules/cloudformation_stack_set.py b/plugins/modules/cloudformation_stack_set.py index d3841bc2b78..e15f1c95229 100644 --- a/plugins/modules/cloudformation_stack_set.py +++ b/plugins/modules/cloudformation_stack_set.py @@ -293,7 +293,7 @@ Type: "AWS::SNS::Topic" Properties: {} -""" # NOQA +""" import datetime import itertools @@ -301,7 +301,8 @@ import uuid try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: # handled by AnsibleAWSModule pass @@ -309,11 +310,12 @@ from ansible.module_utils._text import to_native from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict def create_stack_set(module, stack_params, cfn): diff --git a/plugins/modules/cloudfront_distribution.py b/plugins/modules/cloudfront_distribution.py index 19efd3949d7..ec6e74daf36 100644 --- a/plugins/modules/cloudfront_distribution.py +++ b/plugins/modules/cloudfront_distribution.py @@ -1413,27 +1413,28 @@ sample: abcd1234-1234-abcd-abcd-abcd12345678 """ -from ansible.module_utils._text import to_text, to_native -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.cloudfront_facts import CloudFrontFactsServiceManager -from ansible.module_utils.common.dict_transformations import recursive_diff -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, compare_aws_tags, ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, snake_dict_to_camel_dict +from collections import OrderedDict import datetime -try: - from collections import OrderedDict -except ImportError: - try: - from ordereddict import OrderedDict - except ImportError: - pass # caught by AnsibleAWSModule (as python 2.6 + boto3 => ordereddict is installed) - try: import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils._text import to_native +from ansible.module_utils._text import to_text +from ansible.module_utils.common.dict_transformations import recursive_diff +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.cloudfront_facts import CloudFrontFactsServiceManager +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def change_dict_key_name(dictionary, old_key, new_key): if old_key in dictionary: diff --git a/plugins/modules/cloudfront_distribution_info.py b/plugins/modules/cloudfront_distribution_info.py index a14d14f166b..bc6bd8073c9 100644 --- a/plugins/modules/cloudfront_distribution_info.py +++ b/plugins/modules/cloudfront_distribution_info.py @@ -242,9 +242,10 @@ type: dict """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.cloudfront_facts import CloudFrontFactsServiceManager +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def set_facts_for_distribution_id_and_alias(details, facts, distribution_id, aliases): facts[distribution_id] = details diff --git a/plugins/modules/cloudfront_invalidation.py b/plugins/modules/cloudfront_invalidation.py index 67b32eb7718..adee5058b17 100644 --- a/plugins/modules/cloudfront_invalidation.py +++ b/plugins/modules/cloudfront_invalidation.py @@ -139,10 +139,11 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_message +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_message from ansible_collections.amazon.aws.plugins.module_utils.cloudfront_facts import CloudFrontFactsServiceManager +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class CloudFrontInvalidationServiceManager(object): """ diff --git a/plugins/modules/cloudfront_origin_access_identity.py b/plugins/modules/cloudfront_origin_access_identity.py index 4c13fc9f30f..1da411f8677 100644 --- a/plugins/modules/cloudfront_origin_access_identity.py +++ b/plugins/modules/cloudfront_origin_access_identity.py @@ -116,15 +116,17 @@ import datetime try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by imported AnsibleAWSModule from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.cloudfront_facts import CloudFrontFactsServiceManager + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code class CloudFrontOriginAccessIdentityServiceManager(object): diff --git a/plugins/modules/cloudfront_response_headers_policy.py b/plugins/modules/cloudfront_response_headers_policy.py index 10482fcafdf..c84346c387a 100644 --- a/plugins/modules/cloudfront_response_headers_policy.py +++ b/plugins/modules/cloudfront_response_headers_policy.py @@ -140,14 +140,18 @@ sample: my-header-policy """ +import datetime + try: - from botocore.exceptions import ClientError, ParamValidationError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by imported AnsibleAWSModule -from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict, snake_dict_to_camel_dict +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -import datetime class CloudfrontResponseHeadersPolicyService(object): @@ -171,7 +175,7 @@ def find_response_headers_policy(self, name): matching_policy = None return matching_policy - except (ParamValidationError, ClientError, BotoCoreError) as e: + except (ClientError, BotoCoreError) as e: self.module.fail_json_aws(e, msg="Error fetching policy information") def create_response_header_policy(self, name, comment, cors_config, security_headers_config, custom_headers_config): @@ -205,7 +209,7 @@ def create_response_header_policy(self, name, comment, cors_config, security_hea try: result = self.client.create_response_headers_policy(ResponseHeadersPolicyConfig=config) changed = True - except (ParamValidationError, ClientError, BotoCoreError) as e: + except (ClientError, BotoCoreError) as e: self.module.fail_json_aws(e, msg="Error creating policy") else: policy_id = matching_policy['ResponseHeadersPolicy']['Id'] @@ -220,7 +224,7 @@ def create_response_header_policy(self, name, comment, cors_config, security_hea # consider change made by this execution of the module if returned timestamp was very recent if changed_time > seconds_ago: changed = True - except (ParamValidationError, ClientError, BotoCoreError) as e: + except (ClientError, BotoCoreError) as e: self.module.fail_json_aws(e, msg="Updating creating policy") self.module.exit_json(changed=changed, **camel_dict_to_snake_dict(result)) @@ -238,7 +242,7 @@ def delete_response_header_policy(self, name): else: try: result = self.client.delete_response_headers_policy(Id=policy_id, IfMatch=etag) - except (ParamValidationError, ClientError, BotoCoreError) as e: + except (ClientError, BotoCoreError) as e: self.module.fail_json_aws(e, msg="Error deleting policy") self.module.exit_json(changed=True, **camel_dict_to_snake_dict(result)) diff --git a/plugins/modules/codebuild_project.py b/plugins/modules/codebuild_project.py index 2773d1b3f1a..71f05bf7233 100644 --- a/plugins/modules/codebuild_project.py +++ b/plugins/modules/codebuild_project.py @@ -299,6 +299,7 @@ from ansible_collections.amazon.aws.plugins.module_utils.exceptions import AnsibleAWSError from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule diff --git a/plugins/modules/codecommit_repository.py b/plugins/modules/codecommit_repository.py index 64e0a3cd66e..1552738bea5 100644 --- a/plugins/modules/codecommit_repository.py +++ b/plugins/modules/codecommit_repository.py @@ -137,8 +137,9 @@ except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict class CodeCommit(object): diff --git a/plugins/modules/codepipeline.py b/plugins/modules/codepipeline.py index c0733639b15..a2ec7713b4a 100644 --- a/plugins/modules/codepipeline.py +++ b/plugins/modules/codepipeline.py @@ -202,9 +202,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies def create_pipeline(client, name, role_arn, artifact_store, stages, version, module): diff --git a/plugins/modules/config_aggregation_authorization.py b/plugins/modules/config_aggregation_authorization.py index 741141b6d5a..96f1eb1d9cd 100644 --- a/plugins/modules/config_aggregation_authorization.py +++ b/plugins/modules/config_aggregation_authorization.py @@ -50,14 +50,14 @@ RETURN = r"""#""" - try: import botocore except ImportError: pass # handled by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def resource_exists(client, module, params): diff --git a/plugins/modules/config_aggregator.py b/plugins/modules/config_aggregator.py index fac8f049a03..38271fc4542 100644 --- a/plugins/modules/config_aggregator.py +++ b/plugins/modules/config_aggregator.py @@ -94,9 +94,12 @@ except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict def resource_exists(client, module, params): diff --git a/plugins/modules/config_delivery_channel.py b/plugins/modules/config_delivery_channel.py index 87ff5d93d99..2dd5fbc68d2 100644 --- a/plugins/modules/config_delivery_channel.py +++ b/plugins/modules/config_delivery_channel.py @@ -71,9 +71,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry # this waits for an IAM role to become fully available, at the cost of diff --git a/plugins/modules/config_recorder.py b/plugins/modules/config_recorder.py index 75fb8c5bb0b..b310787b72d 100644 --- a/plugins/modules/config_recorder.py +++ b/plugins/modules/config_recorder.py @@ -85,9 +85,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def resource_exists(client, module, params): diff --git a/plugins/modules/config_rule.py b/plugins/modules/config_rule.py index 12e0c77bb6d..4fd3103931f 100644 --- a/plugins/modules/config_rule.py +++ b/plugins/modules/config_rule.py @@ -113,9 +113,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def rule_exists(client, module, params): diff --git a/plugins/modules/data_pipeline.py b/plugins/modules/data_pipeline.py index 82452d9129d..51068159507 100644 --- a/plugins/modules/data_pipeline.py +++ b/plugins/modules/data_pipeline.py @@ -206,8 +206,9 @@ from ansible.module_utils._text import to_text from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code DP_ACTIVE_STATES = ['ACTIVE', 'SCHEDULED'] diff --git a/plugins/modules/directconnect_confirm_connection.py b/plugins/modules/directconnect_confirm_connection.py index de1a816e684..25aeebb244c 100644 --- a/plugins/modules/directconnect_confirm_connection.py +++ b/plugins/modules/directconnect_confirm_connection.py @@ -58,15 +58,18 @@ import traceback try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # handled by imported AnsibleAWSModule from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import DirectConnectError -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + retry_params = {"retries": 10, "delay": 5, "backoff": 1.2, "catch_extra_error_codes": ["DirectConnectClientException"]} diff --git a/plugins/modules/directconnect_connection.py b/plugins/modules/directconnect_connection.py index 6c980fbb459..709fef7a79f 100644 --- a/plugins/modules/directconnect_connection.py +++ b/plugins/modules/directconnect_connection.py @@ -156,18 +156,21 @@ import traceback try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # handled by imported AnsibleAWSModule from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import DirectConnectError from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import associate_connection_and_lag from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import delete_connection from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import disassociate_connection_and_lag -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + retry_params = {"retries": 10, "delay": 5, "backoff": 1.2, "catch_extra_error_codes": ["DirectConnectClientException"]} diff --git a/plugins/modules/directconnect_link_aggregation_group.py b/plugins/modules/directconnect_link_aggregation_group.py index 29d0445556a..8a50e3c7e89 100644 --- a/plugins/modules/directconnect_link_aggregation_group.py +++ b/plugins/modules/directconnect_link_aggregation_group.py @@ -171,13 +171,13 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry - from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import DirectConnectError from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import delete_connection from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import delete_virtual_interface from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import disassociate_connection_and_lag +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def lag_status(client, lag_id): diff --git a/plugins/modules/directconnect_virtual_interface.py b/plugins/modules/directconnect_virtual_interface.py index 4c13112a179..bded2ab57ab 100644 --- a/plugins/modules/directconnect_virtual_interface.py +++ b/plugins/modules/directconnect_virtual_interface.py @@ -248,17 +248,19 @@ import traceback try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: # handled by AnsibleAWSModule pass from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import DirectConnectError from ansible_collections.amazon.aws.plugins.module_utils.direct_connect import delete_virtual_interface -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def try_except_ClientError(failure_msg): diff --git a/plugins/modules/dms_endpoint.py b/plugins/modules/dms_endpoint.py index 499c7a2ed11..66b5dd9b2c3 100644 --- a/plugins/modules/dms_endpoint.py +++ b/plugins/modules/dms_endpoint.py @@ -332,13 +332,15 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + + backoff_params = dict(retries=5, delay=1, backoff=1.5) diff --git a/plugins/modules/dms_replication_subnet_group.py b/plugins/modules/dms_replication_subnet_group.py index c1ca2efe6f8..bd75df6d67b 100644 --- a/plugins/modules/dms_replication_subnet_group.py +++ b/plugins/modules/dms_replication_subnet_group.py @@ -61,8 +61,10 @@ except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry + backoff_params = dict(retries=5, delay=1, backoff=1.5) diff --git a/plugins/modules/dynamodb_table.py b/plugins/modules/dynamodb_table.py index 3a307242715..a059198d858 100644 --- a/plugins/modules/dynamodb_table.py +++ b/plugins/modules/dynamodb_table.py @@ -248,14 +248,15 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags DYNAMO_TYPE_DEFAULT = 'STRING' diff --git a/plugins/modules/ec2_ami_copy.py b/plugins/modules/ec2_ami_copy.py index 1aad6181896..5af897cdb80 100644 --- a/plugins/modules/ec2_ami_copy.py +++ b/plugins/modules/ec2_ami_copy.py @@ -133,15 +133,18 @@ """ try: - from botocore.exceptions import ClientError, WaiterError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError + from botocore.exceptions import WaiterError except ImportError: pass # caught by AnsibleAWSModule from ansible.module_utils._text import to_native from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list def copy_image(module, ec2): diff --git a/plugins/modules/ec2_customer_gateway.py b/plugins/modules/ec2_customer_gateway.py index 3ae519d1f30..b858f9c4ead 100644 --- a/plugins/modules/ec2_customer_gateway.py +++ b/plugins/modules/ec2_customer_gateway.py @@ -115,8 +115,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry class Ec2CustomerGatewayManager: diff --git a/plugins/modules/ec2_customer_gateway_info.py b/plugins/modules/ec2_customer_gateway_info.py index 6bd422abafc..d0674f52b19 100644 --- a/plugins/modules/ec2_customer_gateway_info.py +++ b/plugins/modules/ec2_customer_gateway_info.py @@ -81,15 +81,17 @@ import json try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list, - boto3_tag_list_to_ansible_dict, - camel_dict_to_snake_dict, - ) def date_handler(obj): diff --git a/plugins/modules/ec2_launch_template.py b/plugins/modules/ec2_launch_template.py index b632d8c64d3..17f345a2f7e 100644 --- a/plugins/modules/ec2_launch_template.py +++ b/plugins/modules/ec2_launch_template.py @@ -419,21 +419,24 @@ import re from uuid import uuid4 +try: + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError + from botocore.exceptions import WaiterError +except ImportError: + pass # caught by AnsibleAWSModule + from ansible.module_utils._text import to_text from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.core import scrub_none_parameters -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters -try: - from botocore.exceptions import ClientError, BotoCoreError, WaiterError -except ImportError: - pass # caught by AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def determine_iam_role(module, name_or_arn): diff --git a/plugins/modules/ec2_placement_group.py b/plugins/modules/ec2_placement_group.py index 7ee6925f9f3..8687ded59d1 100644 --- a/plugins/modules/ec2_placement_group.py +++ b/plugins/modules/ec2_placement_group.py @@ -105,9 +105,10 @@ except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry @AWSRetry.exponential_backoff() diff --git a/plugins/modules/ec2_placement_group_info.py b/plugins/modules/ec2_placement_group_info.py index 323cc2f7303..bc9d717e49d 100644 --- a/plugins/modules/ec2_placement_group_info.py +++ b/plugins/modules/ec2_placement_group_info.py @@ -71,12 +71,14 @@ """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule try: - from botocore.exceptions import (BotoCoreError, ClientError) + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def get_placement_groups_details(connection, module): names = module.params.get("names") diff --git a/plugins/modules/ec2_snapshot_copy.py b/plugins/modules/ec2_snapshot_copy.py index af1a6828546..59d0582c048 100644 --- a/plugins/modules/ec2_snapshot_copy.py +++ b/plugins/modules/ec2_snapshot_copy.py @@ -112,9 +112,10 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_specifications +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def copy_snapshot(module, ec2): """ diff --git a/plugins/modules/ec2_transit_gateway.py b/plugins/modules/ec2_transit_gateway.py index 5aa076c9968..832d16defc9 100644 --- a/plugins/modules/ec2_transit_gateway.py +++ b/plugins/modules/ec2_transit_gateway.py @@ -210,18 +210,23 @@ sample: tgw-3a9aa123 """ +from time import sleep +from time import time + try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # handled by imported AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from time import sleep, time -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ensure_ec2_tags +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule class AnsibleEc2Tgw(object): diff --git a/plugins/modules/ec2_transit_gateway_info.py b/plugins/modules/ec2_transit_gateway_info.py index 1fbcc0a7153..5053c8d65d8 100644 --- a/plugins/modules/ec2_transit_gateway_info.py +++ b/plugins/modules/ec2_transit_gateway_info.py @@ -168,11 +168,12 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict class AnsibleEc2TgwInfo(object): diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment.py b/plugins/modules/ec2_transit_gateway_vpc_attachment.py index c811eb93e90..2878fbf9129 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment.py @@ -216,9 +216,7 @@ example: '123456789012' """ - from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule - from ansible_collections.community.aws.plugins.module_utils.transitgateway import TransitGatewayVpcAttachmentManager diff --git a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py index 1e14e6d10fe..49c03ff432c 100644 --- a/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py +++ b/plugins/modules/ec2_transit_gateway_vpc_attachment_info.py @@ -142,9 +142,7 @@ example: '123456789012' """ - from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule - from ansible_collections.community.aws.plugins.module_utils.transitgateway import TransitGatewayVpcAttachmentManager diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py index fc4d1cc7ccc..b6fb0b837f1 100644 --- a/plugins/modules/ec2_vpc_egress_igw.py +++ b/plugins/modules/ec2_vpc_egress_igw.py @@ -63,9 +63,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def delete_eigw(module, connection, eigw_id): diff --git a/plugins/modules/ec2_vpc_nacl.py b/plugins/modules/ec2_vpc_nacl.py index e01a98ed99c..fa34ccd8118 100644 --- a/plugins/modules/ec2_vpc_nacl.py +++ b/plugins/modules/ec2_vpc_nacl.py @@ -158,11 +158,13 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ensure_ec2_tags +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_specifications +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + + # VPC-supported IANA protocol numbers # http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml PROTOCOL_NUMBERS = {'all': -1, 'icmp': 1, 'tcp': 6, 'udp': 17, 'ipv6-icmp': 58} diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py index 953943e6965..3d37cf26524 100644 --- a/plugins/modules/ec2_vpc_nacl_info.py +++ b/plugins/modules/ec2_vpc_nacl_info.py @@ -109,11 +109,12 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict # VPC-supported IANA protocol numbers diff --git a/plugins/modules/ec2_vpc_peer.py b/plugins/modules/ec2_vpc_peer.py index 977ba33040d..a5af559cc9d 100644 --- a/plugins/modules/ec2_vpc_peer.py +++ b/plugins/modules/ec2_vpc_peer.py @@ -357,14 +357,16 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.ec2 import add_ec2_tags from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ensure_ec2_tags +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def wait_for_state(client, module, state, pcx_id): diff --git a/plugins/modules/ec2_vpc_peering_info.py b/plugins/modules/ec2_vpc_peering_info.py index 30ce7ee9fd5..8faf64b8906 100644 --- a/plugins/modules/ec2_vpc_peering_info.py +++ b/plugins/modules/ec2_vpc_peering_info.py @@ -204,12 +204,14 @@ except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import normalize_boto3_result +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import normalize_boto3_result -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict def get_vpc_peers(client, module): diff --git a/plugins/modules/ec2_vpc_vgw.py b/plugins/modules/ec2_vpc_vgw.py index 83a157daa27..74aab4a077c 100644 --- a/plugins/modules/ec2_vpc_vgw.py +++ b/plugins/modules/ec2_vpc_vgw.py @@ -140,13 +140,14 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ensure_ec2_tags -from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_specifications from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule # AWS uses VpnGatewayLimitExceeded for both 'Too many VGWs' and 'Too many concurrent changes' diff --git a/plugins/modules/ec2_vpc_vgw_info.py b/plugins/modules/ec2_vpc_vgw_info.py index 2f88f804b4c..c729b2fa5b8 100644 --- a/plugins/modules/ec2_vpc_vgw_info.py +++ b/plugins/modules/ec2_vpc_vgw_info.py @@ -128,9 +128,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict def get_virtual_gateway_info(virtual_gateway): diff --git a/plugins/modules/ec2_vpc_vpn.py b/plugins/modules/ec2_vpc_vpn.py index 24c85e87995..b7e997fade0 100644 --- a/plugins/modules/ec2_vpc_vpn.py +++ b/plugins/modules/ec2_vpc_vpn.py @@ -291,19 +291,23 @@ vpn_connection_id: vpn-781e0e19 """ -from ansible.module_utils._text import to_text -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags - try: - from botocore.exceptions import BotoCoreError, ClientError, WaiterError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError + from botocore.exceptions import WaiterError except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils._text import to_text +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class VPNConnectionException(Exception): def __init__(self, msg, exception=None): diff --git a/plugins/modules/ec2_vpc_vpn_info.py b/plugins/modules/ec2_vpc_vpn_info.py index 3d3b2815170..5070af22266 100644 --- a/plugins/modules/ec2_vpc_vpn_info.py +++ b/plugins/modules/ec2_vpc_vpn_info.py @@ -161,15 +161,17 @@ import json try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list, - boto3_tag_list_to_ansible_dict, - camel_dict_to_snake_dict, - ) def date_handler(obj): diff --git a/plugins/modules/ec2_win_password.py b/plugins/modules/ec2_win_password.py index 9831f9b72de..06e3b88aa33 100644 --- a/plugins/modules/ec2_win_password.py +++ b/plugins/modules/ec2_win_password.py @@ -113,8 +113,9 @@ from ansible.module_utils._text import to_bytes +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def setup_module_object(): diff --git a/plugins/modules/ecs_attribute.py b/plugins/modules/ecs_attribute.py index 79d878f779d..c6931fc4f53 100644 --- a/plugins/modules/ecs_attribute.py +++ b/plugins/modules/ecs_attribute.py @@ -110,7 +110,8 @@ try: import botocore - from botocore.exceptions import ClientError, EndpointConnectionError + from botocore.exceptions import ClientError + from botocore.exceptions import EndpointConnectionError except ImportError: pass # Handled by AnsibleAWSModule diff --git a/plugins/modules/ecs_cluster.py b/plugins/modules/ecs_cluster.py index dab635ccb3a..7520cd0abc9 100644 --- a/plugins/modules/ecs_cluster.py +++ b/plugins/modules/ecs_cluster.py @@ -170,10 +170,11 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class EcsClusterManager: """Handles ECS Clusters""" diff --git a/plugins/modules/ecs_ecr.py b/plugins/modules/ecs_ecr.py index 0e25ced6992..4b5ce1ebe75 100644 --- a/plugins/modules/ecs_ecr.py +++ b/plugins/modules/ecs_ecr.py @@ -223,10 +223,11 @@ from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict from ansible.module_utils.six import string_types +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.botocore import boto_exception +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto_exception -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies def build_kwargs(registry_id): diff --git a/plugins/modules/ecs_service.py b/plugins/modules/ecs_service.py index 2965b1d6415..074dec4b176 100644 --- a/plugins/modules/ecs_service.py +++ b/plugins/modules/ecs_service.py @@ -674,6 +674,21 @@ import time +try: + import botocore +except ImportError: + pass # caught by AnsibleAWSModule + +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.transformation import map_complex_type + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + + DEPLOYMENT_CONTROLLER_TYPE_MAP = { 'type': 'str', } @@ -684,19 +699,6 @@ 'deployment_circuit_breaker': 'dict', } -from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict - -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import map_complex_type -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict - -try: - import botocore -except ImportError: - pass # caught by AnsibleAWSModule - class EcsServiceManager: """Handles ECS Services""" diff --git a/plugins/modules/ecs_service_info.py b/plugins/modules/ecs_service_info.py index 28e9587ed36..41dd999c9c1 100644 --- a/plugins/modules/ecs_service_info.py +++ b/plugins/modules/ecs_service_info.py @@ -129,16 +129,17 @@ returned: when events is true type: list elements: dict -""" # NOQA +""" try: import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry class EcsServiceManager: diff --git a/plugins/modules/ecs_tag.py b/plugins/modules/ecs_tag.py index d0e0578ad09..7aac8dfb4a7 100644 --- a/plugins/modules/ecs_tag.py +++ b/plugins/modules/ecs_tag.py @@ -106,14 +106,17 @@ type: dict """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list, compare_aws_tags - try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: - pass # Handled by AnsibleAWSModule -__metaclass__ = type + pass # Handled by AnsibleAWSModule + +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def get_tags(ecs, module, resource): diff --git a/plugins/modules/ecs_task.py b/plugins/modules/ecs_task.py index 885b4bc4d61..6c693b317bc 100644 --- a/plugins/modules/ecs_task.py +++ b/plugins/modules/ecs_task.py @@ -242,14 +242,16 @@ type: str """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names, ansible_dict_to_boto3_tag_list - try: import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class EcsExecManager: """Handles ECS Tasks""" diff --git a/plugins/modules/ecs_taskdefinition.py b/plugins/modules/ecs_taskdefinition.py index 79d19799147..16fcab712c4 100644 --- a/plugins/modules/ecs_taskdefinition.py +++ b/plugins/modules/ecs_taskdefinition.py @@ -781,9 +781,9 @@ except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry class EcsTaskManager: diff --git a/plugins/modules/ecs_taskdefinition_info.py b/plugins/modules/ecs_taskdefinition_info.py index 7a7c5c0549c..b619cd4c4be 100644 --- a/plugins/modules/ecs_taskdefinition_info.py +++ b/plugins/modules/ecs_taskdefinition_info.py @@ -347,14 +347,15 @@ type: str """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict - try: import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def main(): argument_spec = dict( diff --git a/plugins/modules/efs.py b/plugins/modules/efs.py index 72a9d92c80a..c3d1bc6830a 100644 --- a/plugins/modules/efs.py +++ b/plugins/modules/efs.py @@ -254,11 +254,12 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags def _index_by_key(key, items): diff --git a/plugins/modules/efs_info.py b/plugins/modules/efs_info.py index a653e35c81e..e73042555bb 100644 --- a/plugins/modules/efs_info.py +++ b/plugins/modules/efs_info.py @@ -177,9 +177,11 @@ from ansible.module_utils._text import to_native from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict class EFSConnection(object): diff --git a/plugins/modules/efs_tag.py b/plugins/modules/efs_tag.py index f4a8433930f..10978c5bf2f 100644 --- a/plugins/modules/efs_tag.py +++ b/plugins/modules/efs_tag.py @@ -93,14 +93,20 @@ """ try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: # Handled by AnsibleAWSModule pass -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list, compare_aws_tags, AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + MAX_AWS_RETRIES = 10 # How many retries to perform when an API call is failing WAIT_RETRY = 5 # how many seconds to wait between propagation status polls diff --git a/plugins/modules/eks_cluster.py b/plugins/modules/eks_cluster.py index af8ba54f3aa..699c74bdb5b 100644 --- a/plugins/modules/eks_cluster.py +++ b/plugins/modules/eks_cluster.py @@ -162,17 +162,19 @@ sample: '1.10' """ - -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, get_ec2_security_group_ids_from_names -from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter - try: - import botocore.exceptions + import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names +from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def ensure_present(client, module): name = module.params.get('name') diff --git a/plugins/modules/eks_fargate_profile.py b/plugins/modules/eks_fargate_profile.py index 632d3db54c3..abc4dd09f90 100644 --- a/plugins/modules/eks_fargate_profile.py +++ b/plugins/modules/eks_fargate_profile.py @@ -163,17 +163,19 @@ - ACTIVE """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter - try: - import botocore.exceptions + import botocore except ImportError: pass +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def validate_tags(client, module, fargate_profile): changed = False diff --git a/plugins/modules/eks_nodegroup.py b/plugins/modules/eks_nodegroup.py index ba8c06f9957..8528cc8a488 100644 --- a/plugins/modules/eks_nodegroup.py +++ b/plugins/modules/eks_nodegroup.py @@ -344,16 +344,20 @@ foo: bar """ -from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule, is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, snake_dict_to_camel_dict -from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter - try: - import botocore.exceptions + import botocore except ImportError: pass +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def validate_tags(client, module, nodegroup): changed = False diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index 4a70738dc3c..442142fd93a 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -127,8 +127,8 @@ community.aws.elasticache: name: "test-please-delete" state: rebooted - """ + from time import sleep try: @@ -136,12 +136,12 @@ except ImportError: pass # Handled by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info -class ElastiCacheManager(object): +class ElastiCacheManager(): """Handles elasticache creation and destruction""" @@ -150,7 +150,7 @@ class ElastiCacheManager(object): def __init__(self, module, name, engine, cache_engine_version, node_type, num_nodes, cache_port, cache_parameter_group, cache_subnet_group, cache_security_groups, security_group_ids, zone, wait, - hard_modify, region, **aws_connect_kwargs): + hard_modify): self.module = module self.name = name self.engine = engine.lower() @@ -166,9 +166,6 @@ def __init__(self, module, name, engine, cache_engine_version, node_type, self.wait = wait self.hard_modify = hard_modify - self.region = region - self.aws_connect_kwargs = aws_connect_kwargs - self.changed = False self.data = None self.status = 'gone' @@ -497,8 +494,6 @@ def main(): argument_spec=argument_spec, ) - region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module) - name = module.params['name'] state = module.params['state'] engine = module.params['engine'] @@ -527,7 +522,7 @@ def main(): cache_subnet_group, cache_security_groups, security_group_ids, zone, wait, - hard_modify, region, **aws_connect_kwargs) + hard_modify) if state == 'present': elasticache_manager.ensure_present() diff --git a/plugins/modules/elasticache_info.py b/plugins/modules/elasticache_info.py index 183cf39cfe6..02b18ee4778 100644 --- a/plugins/modules/elasticache_info.py +++ b/plugins/modules/elasticache_info.py @@ -402,18 +402,19 @@ Environment: test """ -from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict - - try: import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + @AWSRetry.exponential_backoff() def describe_cache_clusters_with_backoff(client, cluster_id=None): diff --git a/plugins/modules/elasticache_snapshot.py b/plugins/modules/elasticache_snapshot.py index 6cc245a74f2..e477fc86aa5 100644 --- a/plugins/modules/elasticache_snapshot.py +++ b/plugins/modules/elasticache_snapshot.py @@ -116,8 +116,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code def create(module, connection, replication_id, cluster_id, name): diff --git a/plugins/modules/elasticache_subnet_group.py b/plugins/modules/elasticache_subnet_group.py index 1cccc017a49..6353c72837b 100644 --- a/plugins/modules/elasticache_subnet_group.py +++ b/plugins/modules/elasticache_subnet_group.py @@ -102,9 +102,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def get_subnet_group(name): diff --git a/plugins/modules/elasticbeanstalk_app.py b/plugins/modules/elasticbeanstalk_app.py index 0348e6899a2..c6333379456 100644 --- a/plugins/modules/elasticbeanstalk_app.py +++ b/plugins/modules/elasticbeanstalk_app.py @@ -88,8 +88,9 @@ except ImportError: pass # handled by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_message + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_message def describe_app(ebs, app_name, module): diff --git a/plugins/modules/elb_classic_lb_info.py b/plugins/modules/elb_classic_lb_info.py index 6086ca80908..3d3d43d4e71 100644 --- a/plugins/modules/elb_classic_lb_info.py +++ b/plugins/modules/elb_classic_lb_info.py @@ -126,19 +126,20 @@ vpc_id: vpc-c248fda4 """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - AWSRetry, - camel_dict_to_snake_dict, - boto3_tag_list_to_ansible_dict -) - try: import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + + MAX_AWS_RETRIES = 5 MAX_AWS_DELAY = 5 diff --git a/plugins/modules/elb_instance.py b/plugins/modules/elb_instance.py index 7f402b5bd5e..fe1128c9661 100644 --- a/plugins/modules/elb_instance.py +++ b/plugins/modules/elb_instance.py @@ -95,9 +95,10 @@ except ImportError: pass # Handled by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry class ElbManager: diff --git a/plugins/modules/elb_network_lb.py b/plugins/modules/elb_network_lb.py index 749af1a651f..069882dc90c 100644 --- a/plugins/modules/elb_network_lb.py +++ b/plugins/modules/elb_network_lb.py @@ -327,9 +327,15 @@ sample: vpc-0011223344 """ +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListener +from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListeners +from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import NetworkLoadBalancer + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, boto3_tag_list_to_ansible_dict, compare_aws_tags -from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import NetworkLoadBalancer, ELBListeners, ELBListener def create_or_update_elb(elb_obj): diff --git a/plugins/modules/elb_target.py b/plugins/modules/elb_target.py index 33121d76851..fd05cd67a3a 100644 --- a/plugins/modules/elb_target.py +++ b/plugins/modules/elb_target.py @@ -112,7 +112,8 @@ """ -from time import time, sleep +from time import sleep +from time import time try: import botocore @@ -121,8 +122,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry @AWSRetry.jittered_backoff(retries=10, delay=10, catch_extra_error_codes=['TargetGroupNotFound']) diff --git a/plugins/modules/elb_target_group.py b/plugins/modules/elb_target_group.py index f53aa6940c3..784fa143a4f 100644 --- a/plugins/modules/elb_target_group.py +++ b/plugins/modules/elb_target_group.py @@ -447,12 +447,13 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags def get_tg_attributes(connection, module, tg_arn): diff --git a/plugins/modules/elb_target_group_info.py b/plugins/modules/elb_target_group_info.py index c3dfd454365..d58c2f248f5 100644 --- a/plugins/modules/elb_target_group_info.py +++ b/plugins/modules/elb_target_group_info.py @@ -211,9 +211,11 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, boto3_tag_list_to_ansible_dict @AWSRetry.jittered_backoff(retries=10) diff --git a/plugins/modules/elb_target_info.py b/plugins/modules/elb_target_info.py index 88e634d3adf..393e290e51b 100644 --- a/plugins/modules/elb_target_info.py +++ b/plugins/modules/elb_target_info.py @@ -204,16 +204,18 @@ type: str """ -__metaclass__ = type - try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: # we can handle the lack of boto3 based on the ec2 module pass +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry class Target(object): diff --git a/plugins/modules/glue_connection.py b/plugins/modules/glue_connection.py index 843f46dfcdc..e9a6b306dac 100644 --- a/plugins/modules/glue_connection.py +++ b/plugins/modules/glue_connection.py @@ -157,7 +157,6 @@ sample: {'JDBC_CONNECTION_URL':'jdbc:mysql://mydb:3306/databasename','USERNAME':'x','PASSWORD':'y'} """ -# Non-ansible imports import copy import time @@ -168,10 +167,11 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def _get_glue_connection(connection, module): diff --git a/plugins/modules/glue_crawler.py b/plugins/modules/glue_crawler.py index 6ac5c3dff7a..04c6cd3eb52 100644 --- a/plugins/modules/glue_crawler.py +++ b/plugins/modules/glue_crawler.py @@ -206,11 +206,12 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.iam import get_aws_account_info +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def _get_glue_crawler(connection, module, glue_crawler_name): diff --git a/plugins/modules/glue_job.py b/plugins/modules/glue_job.py index 50ef6eb57b0..6e979f28a9d 100644 --- a/plugins/modules/glue_job.py +++ b/plugins/modules/glue_job.py @@ -223,7 +223,6 @@ sample: 300 """ -# Non-ansible imports import copy try: @@ -233,11 +232,12 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.iam import get_aws_account_info +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def _get_glue_job(connection, module, glue_job_name): diff --git a/plugins/modules/iam_access_key.py b/plugins/modules/iam_access_key.py index 0043a5e2b53..af472fbe8c6 100644 --- a/plugins/modules/iam_access_key.py +++ b/plugins/modules/iam_access_key.py @@ -125,11 +125,12 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.botocore import normalize_boto3_result +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.core import normalize_boto3_result -from ansible_collections.amazon.aws.plugins.module_utils.core import scrub_none_parameters -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def delete_access_key(access_keys, user, access_key_id): diff --git a/plugins/modules/iam_access_key_info.py b/plugins/modules/iam_access_key_info.py index 38e2e95cefc..6573e657a18 100644 --- a/plugins/modules/iam_access_key_info.py +++ b/plugins/modules/iam_access_key_info.py @@ -75,9 +75,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import normalize_boto3_result +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import normalize_boto3_result -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def get_access_keys(user): diff --git a/plugins/modules/iam_group.py b/plugins/modules/iam_group.py index 1f71ba36f83..9dc43ec0a94 100644 --- a/plugins/modules/iam_group.py +++ b/plugins/modules/iam_group.py @@ -171,9 +171,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def compare_attached_group_policies(current_attached_policies, new_attached_policies): diff --git a/plugins/modules/iam_managed_policy.py b/plugins/modules/iam_managed_policy.py index b712ca32a6c..f590fcf9d64 100644 --- a/plugins/modules/iam_managed_policy.py +++ b/plugins/modules/iam_managed_policy.py @@ -132,10 +132,11 @@ from ansible.module_utils._text import to_native from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies @AWSRetry.jittered_backoff(retries=5, delay=5, backoff=2.0) diff --git a/plugins/modules/iam_password_policy.py b/plugins/modules/iam_password_policy.py index 0508d562f99..a980511c2fa 100644 --- a/plugins/modules/iam_password_policy.py +++ b/plugins/modules/iam_password_policy.py @@ -101,8 +101,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code class IAMConnection(object): diff --git a/plugins/modules/iam_role.py b/plugins/modules/iam_role.py index 6f909b47d59..07463cd9736 100644 --- a/plugins/modules/iam_role.py +++ b/plugins/modules/iam_role.py @@ -224,13 +224,14 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies @AWSRetry.jittered_backoff() diff --git a/plugins/modules/iam_role_info.py b/plugins/modules/iam_role_info.py index ca0dd750688..e3bdb7695bf 100644 --- a/plugins/modules/iam_role_info.py +++ b/plugins/modules/iam_role_info.py @@ -159,10 +159,11 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict @AWSRetry.jittered_backoff() diff --git a/plugins/modules/iam_saml_federation.py b/plugins/modules/iam_saml_federation.py index c47223c7eb8..e134588f7ef 100644 --- a/plugins/modules/iam_saml_federation.py +++ b/plugins/modules/iam_saml_federation.py @@ -90,12 +90,13 @@ """ try: - import botocore.exceptions + import botocore except ImportError: pass +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry class SAMLProviderManager: diff --git a/plugins/modules/iam_server_certificate.py b/plugins/modules/iam_server_certificate.py index 7a04a2d4633..8132f977508 100644 --- a/plugins/modules/iam_server_certificate.py +++ b/plugins/modules/iam_server_certificate.py @@ -99,9 +99,10 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry @AWSRetry.jittered_backoff() diff --git a/plugins/modules/iam_server_certificate_info.py b/plugins/modules/iam_server_certificate_info.py index abfc9e04dd1..eb38a5f8b48 100644 --- a/plugins/modules/iam_server_certificate_info.py +++ b/plugins/modules/iam_server_certificate_info.py @@ -78,7 +78,6 @@ try: import botocore - import botocore.exceptions except ImportError: pass # Handled by AnsibleAWSModule diff --git a/plugins/modules/inspector_target.py b/plugins/modules/inspector_target.py index 77daa941aa0..8891fa34a67 100644 --- a/plugins/modules/inspector_target.py +++ b/plugins/modules/inspector_target.py @@ -97,20 +97,20 @@ sample: "2018-01-29T13:48:51.958000+00:00" """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - ansible_dict_to_boto3_tag_list, - boto3_tag_list_to_ansible_dict, - camel_dict_to_snake_dict, - compare_aws_tags, -) - try: import botocore except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + @AWSRetry.jittered_backoff(retries=5, delay=5, backoff=2.0) def main(): diff --git a/plugins/modules/kinesis_stream.py b/plugins/modules/kinesis_stream.py index 866e2bacea3..2bcca6a4ad4 100644 --- a/plugins/modules/kinesis_stream.py +++ b/plugins/modules/kinesis_stream.py @@ -189,9 +189,10 @@ from ansible.module_utils._text import to_native from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags def get_tags(client, stream_name): diff --git a/plugins/modules/lightsail.py b/plugins/modules/lightsail.py index af7a4117c1d..23ab0c76c86 100644 --- a/plugins/modules/lightsail.py +++ b/plugins/modules/lightsail.py @@ -156,8 +156,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code def find_instance_info(module, client, instance_name, fail_if_not_found=False): diff --git a/plugins/modules/lightsail_static_ip.py b/plugins/modules/lightsail_static_ip.py index 3cd71a6ba63..961f451a4ee 100644 --- a/plugins/modules/lightsail_static_ip.py +++ b/plugins/modules/lightsail_static_ip.py @@ -70,8 +70,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code def find_static_ip_info(module, client, static_ip_name, fail_if_not_found=False): diff --git a/plugins/modules/msk_cluster.py b/plugins/modules/msk_cluster.py index c092dc52599..65c9edea258 100644 --- a/plugins/modules/msk_cluster.py +++ b/plugins/modules/msk_cluster.py @@ -263,12 +263,12 @@ except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - camel_dict_to_snake_dict, - compare_aws_tags, - AWSRetry, -) @AWSRetry.jittered_backoff(retries=5, delay=5) diff --git a/plugins/modules/msk_config.py b/plugins/modules/msk_config.py index 30f5adbf60b..8dce485410f 100644 --- a/plugins/modules/msk_config.py +++ b/plugins/modules/msk_config.py @@ -96,11 +96,11 @@ except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - camel_dict_to_snake_dict, - AWSRetry, -) def dict_to_prop(d): diff --git a/plugins/modules/networkfirewall.py b/plugins/modules/networkfirewall.py index 996c5b1d882..9460701cc9a 100644 --- a/plugins/modules/networkfirewall.py +++ b/plugins/modules/networkfirewall.py @@ -269,8 +269,7 @@ } """ - -from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.community.aws.plugins.module_utils.networkfirewall import NetworkFirewallManager diff --git a/plugins/modules/networkfirewall_info.py b/plugins/modules/networkfirewall_info.py index 0fd34d05ec8..70395f75d9e 100644 --- a/plugins/modules/networkfirewall_info.py +++ b/plugins/modules/networkfirewall_info.py @@ -185,8 +185,7 @@ } """ - -from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.community.aws.plugins.module_utils.networkfirewall import NetworkFirewallManager diff --git a/plugins/modules/networkfirewall_policy.py b/plugins/modules/networkfirewall_policy.py index 0c08c5f1bfb..61affcbc9ab 100644 --- a/plugins/modules/networkfirewall_policy.py +++ b/plugins/modules/networkfirewall_policy.py @@ -335,8 +335,7 @@ example: {'tagName': 'Some Value'} """ - -from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.community.aws.plugins.module_utils.networkfirewall import NetworkFirewallPolicyManager diff --git a/plugins/modules/networkfirewall_policy_info.py b/plugins/modules/networkfirewall_policy_info.py index 62f76027fbb..9f0de62e119 100644 --- a/plugins/modules/networkfirewall_policy_info.py +++ b/plugins/modules/networkfirewall_policy_info.py @@ -213,8 +213,7 @@ example: {'tagName': 'Some Value'} """ - -from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.community.aws.plugins.module_utils.networkfirewall import NetworkFirewallPolicyManager diff --git a/plugins/modules/networkfirewall_rule_group.py b/plugins/modules/networkfirewall_rule_group.py index 2b3eb34da95..2a10b6f4e69 100644 --- a/plugins/modules/networkfirewall_rule_group.py +++ b/plugins/modules/networkfirewall_rule_group.py @@ -707,8 +707,7 @@ example: 'STATEFUL' """ - -from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.community.aws.plugins.module_utils.networkfirewall import NetworkFirewallRuleManager diff --git a/plugins/modules/networkfirewall_rule_group_info.py b/plugins/modules/networkfirewall_rule_group_info.py index e1d597561dd..bcd83070b42 100644 --- a/plugins/modules/networkfirewall_rule_group_info.py +++ b/plugins/modules/networkfirewall_rule_group_info.py @@ -388,8 +388,7 @@ example: 'STATEFUL' """ - -from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.community.aws.plugins.module_utils.networkfirewall import NetworkFirewallRuleManager diff --git a/plugins/modules/opensearch.py b/plugins/modules/opensearch.py index 5a7b323f3d2..0f0fe38b4b3 100644 --- a/plugins/modules/opensearch.py +++ b/plugins/modules/opensearch.py @@ -492,26 +492,20 @@ from ansible.module_utils.six import string_types -# import module snippets -from ansible_collections.amazon.aws.plugins.module_utils.core import ( - AnsibleAWSModule, - is_boto3_error_code, -) -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - AWSRetry, - boto3_tag_list_to_ansible_dict, - compare_policies, -) -from ansible_collections.community.aws.plugins.module_utils.opensearch import ( - compare_domain_versions, - ensure_tags, - get_domain_status, - get_domain_config, - get_target_increment_version, - normalize_opensearch, - parse_version, - wait_for_domain_status, -) +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule +from ansible_collections.community.aws.plugins.module_utils.opensearch import compare_domain_versions +from ansible_collections.community.aws.plugins.module_utils.opensearch import ensure_tags +from ansible_collections.community.aws.plugins.module_utils.opensearch import get_domain_status +from ansible_collections.community.aws.plugins.module_utils.opensearch import get_domain_config +from ansible_collections.community.aws.plugins.module_utils.opensearch import get_target_increment_version +from ansible_collections.community.aws.plugins.module_utils.opensearch import normalize_opensearch +from ansible_collections.community.aws.plugins.module_utils.opensearch import parse_version +from ansible_collections.community.aws.plugins.module_utils.opensearch import wait_for_domain_status def ensure_domain_absent(client, module): diff --git a/plugins/modules/opensearch_info.py b/plugins/modules/opensearch_info.py index b444b4c2151..2859c4854b5 100644 --- a/plugins/modules/opensearch_info.py +++ b/plugins/modules/opensearch_info.py @@ -447,16 +447,14 @@ except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( - AWSRetry, - boto3_tag_list_to_ansible_dict, - camel_dict_to_snake_dict, -) -from ansible_collections.community.aws.plugins.module_utils.opensearch import ( - get_domain_config, - get_domain_status, -) +from ansible_collections.community.aws.plugins.module_utils.opensearch import get_domain_config +from ansible_collections.community.aws.plugins.module_utils.opensearch import get_domain_status def domain_info(client, module): diff --git a/plugins/modules/redshift.py b/plugins/modules/redshift.py index ffaf1fa71ed..e0efbefa02a 100644 --- a/plugins/modules/redshift.py +++ b/plugins/modules/redshift.py @@ -260,14 +260,16 @@ except ImportError: pass # caught by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import snake_dict_to_camel_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.iam import get_aws_account_id +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def _ensure_tags(redshift, identifier, existing_tags, module): diff --git a/plugins/modules/redshift_info.py b/plugins/modules/redshift_info.py index f8dc499d841..2093dd38ad5 100644 --- a/plugins/modules/redshift_info.py +++ b/plugins/modules/redshift_info.py @@ -275,12 +275,14 @@ import re try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict def match_tags(tags_to_match, cluster): diff --git a/plugins/modules/redshift_subnet_group.py b/plugins/modules/redshift_subnet_group.py index 43ff95de534..724c064cbe9 100644 --- a/plugins/modules/redshift_subnet_group.py +++ b/plugins/modules/redshift_subnet_group.py @@ -98,10 +98,11 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict def get_subnet_group(name): diff --git a/plugins/modules/s3_bucket_info.py b/plugins/modules/s3_bucket_info.py index 3ed7e98504c..20995539c45 100644 --- a/plugins/modules/s3_bucket_info.py +++ b/plugins/modules/s3_bucket_info.py @@ -402,10 +402,12 @@ except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict def get_bucket_list(module, connection, name="", name_filter=""): diff --git a/plugins/modules/s3_bucket_notification.py b/plugins/modules/s3_bucket_notification.py index 7940fcddf05..0a8109b2adb 100644 --- a/plugins/modules/s3_bucket_notification.py +++ b/plugins/modules/s3_bucket_notification.py @@ -156,14 +156,16 @@ type: list """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict - try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # will be protected by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class AmazonBucket: def __init__(self, module, client): diff --git a/plugins/modules/s3_cors.py b/plugins/modules/s3_cors.py index 0c52dee9a19..797c8cc5050 100644 --- a/plugins/modules/s3_cors.py +++ b/plugins/modules/s3_cors.py @@ -96,12 +96,16 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import snake_dict_to_camel_dict, compare_policies def create_or_update_bucket_cors(connection, module): diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index d002b52b33a..7490685b20d 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -235,11 +235,12 @@ except ImportError: pass # handled by AnsibleAwsModule +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_message +from ansible_collections.amazon.aws.plugins.module_utils.botocore import normalize_boto3_result +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_message -from ansible_collections.amazon.aws.plugins.module_utils.core import normalize_boto3_result -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def parse_date(date): diff --git a/plugins/modules/s3_logging.py b/plugins/modules/s3_logging.py index 36d12565286..64dbb574b6d 100644 --- a/plugins/modules/s3_logging.py +++ b/plugins/modules/s3_logging.py @@ -62,11 +62,12 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry def compare_bucket_logging(bucket_logging, target_bucket, target_prefix): diff --git a/plugins/modules/s3_metrics_configuration.py b/plugins/modules/s3_metrics_configuration.py index 0036d1d5972..83b368a3e2a 100644 --- a/plugins/modules/s3_metrics_configuration.py +++ b/plugins/modules/s3_metrics_configuration.py @@ -95,14 +95,16 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list def _create_metrics_configuration(mc_id, filter_prefix, filter_tags): diff --git a/plugins/modules/s3_sync.py b/plugins/modules/s3_sync.py index 92817e6197f..30a2e675f33 100644 --- a/plugins/modules/s3_sync.py +++ b/plugins/modules/s3_sync.py @@ -249,11 +249,10 @@ from ansible.module_utils._text import to_text -# import module snippets -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code from ansible_collections.community.aws.plugins.module_utils.etag import calculate_multipart_etag +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule def gather_files(fileroot, include=None, exclude=None): diff --git a/plugins/modules/s3_website.py b/plugins/modules/s3_website.py index 94f5e7f329f..b73da51a68c 100644 --- a/plugins/modules/s3_website.py +++ b/plugins/modules/s3_website.py @@ -166,8 +166,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code def _create_redirect_dict(url): diff --git a/plugins/modules/secretsmanager_secret.py b/plugins/modules/secretsmanager_secret.py index e8e9685be8f..4aea26ebfc2 100644 --- a/plugins/modules/secretsmanager_secret.py +++ b/plugins/modules/secretsmanager_secret.py @@ -212,19 +212,26 @@ version_added: 4.0.0 """ -from ansible.module_utils._text import to_bytes -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import snake_dict_to_camel_dict, camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, compare_aws_tags, ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies from traceback import format_exc import json try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class Secret(object): """An object representation of the Secret described by the self.module args""" diff --git a/plugins/modules/ses_identity.py b/plugins/modules/ses_identity.py index 85dbae4a858..40ac0fc94a3 100644 --- a/plugins/modules/ses_identity.py +++ b/plugins/modules/ses_identity.py @@ -217,17 +217,20 @@ type: bool """ -from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry - import time try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def get_verification_attributes(connection, module, identity, retries=0, retryDelay=10): # Unpredictably get_identity_verification_attributes doesn't include the identity even when we've diff --git a/plugins/modules/ses_identity_policy.py b/plugins/modules/ses_identity_policy.py index 7b6c2d9e853..ed558307df5 100644 --- a/plugins/modules/ses_identity_policy.py +++ b/plugins/modules/ses_identity_policy.py @@ -83,16 +83,19 @@ sample: [ExamplePolicy] """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies, AWSRetry - import json try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def get_identity_policy(connection, module, identity, policy_name): try: diff --git a/plugins/modules/ses_rule_set.py b/plugins/modules/ses_rule_set.py index 5534e42506f..72730b1b28f 100644 --- a/plugins/modules/ses_rule_set.py +++ b/plugins/modules/ses_rule_set.py @@ -98,14 +98,18 @@ }] """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry - try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def list_rule_sets(client, module): try: diff --git a/plugins/modules/sns.py b/plugins/modules/sns.py index 79d27dfbc05..6f4338954f8 100644 --- a/plugins/modules/sns.py +++ b/plugins/modules/sns.py @@ -126,13 +126,15 @@ import json try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.community.aws.plugins.module_utils.sns import topic_arn_lookup +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def main(): protocols = [ diff --git a/plugins/modules/sns_topic.py b/plugins/modules/sns_topic.py index 8cc45dfebe6..03b3338350c 100644 --- a/plugins/modules/sns_topic.py +++ b/plugins/modules/sns_topic.py @@ -338,10 +338,11 @@ except ImportError: pass # handled by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import scrub_none_parameters -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list from ansible_collections.community.aws.plugins.module_utils.sns import list_topics from ansible_collections.community.aws.plugins.module_utils.sns import topic_arn_lookup from ansible_collections.community.aws.plugins.module_utils.sns import compare_delivery_policies diff --git a/plugins/modules/sns_topic_info.py b/plugins/modules/sns_topic_info.py index cce6bc2a251..2fcde33e94c 100644 --- a/plugins/modules/sns_topic_info.py +++ b/plugins/modules/sns_topic_info.py @@ -137,11 +137,12 @@ except ImportError: pass # handled by AnsibleAWSModule -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.community.aws.plugins.module_utils.sns import list_topics from ansible_collections.community.aws.plugins.module_utils.sns import get_info +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def main(): argument_spec = dict( diff --git a/plugins/modules/sqs_queue.py b/plugins/modules/sqs_queue.py index 8a23eb90066..4a23f18871b 100644 --- a/plugins/modules/sqs_queue.py +++ b/plugins/modules/sqs_queue.py @@ -268,11 +268,12 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies def get_queue_name(module, is_fifo=False): diff --git a/plugins/modules/ssm_parameter.py b/plugins/modules/ssm_parameter.py index 7c6cdfd4519..493d2b294c4 100644 --- a/plugins/modules/ssm_parameter.py +++ b/plugins/modules/ssm_parameter.py @@ -245,20 +245,22 @@ try: import botocore - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # Handled by AnsibleAWSModule from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.community.aws.plugins.module_utils.base import BaseWaiterFactory +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags +from ansible_collections.community.aws.plugins.module_utils.base import BaseWaiterFactory +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class ParameterWaiterFactory(BaseWaiterFactory): def __init__(self, module): diff --git a/plugins/modules/stepfunctions_state_machine.py b/plugins/modules/stepfunctions_state_machine.py index c0fc81a7f3a..0f4b3ec1397 100644 --- a/plugins/modules/stepfunctions_state_machine.py +++ b/plugins/modules/stepfunctions_state_machine.py @@ -84,18 +84,19 @@ returned: always """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_tag_list, - AWSRetry, - compare_aws_tags, - boto3_tag_list_to_ansible_dict, - ) - try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.tagging import compare_aws_tags + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def manage_state_machine(state, sfn_client, module): state_machine_arn = get_state_machine_arn(sfn_client, module) diff --git a/plugins/modules/stepfunctions_state_machine_execution.py b/plugins/modules/stepfunctions_state_machine_execution.py index 7d34e214daa..0b6858fbf42 100644 --- a/plugins/modules/stepfunctions_state_machine_execution.py +++ b/plugins/modules/stepfunctions_state_machine_execution.py @@ -94,8 +94,9 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code def start_execution(module, sfn_client): diff --git a/plugins/modules/storagegateway_info.py b/plugins/modules/storagegateway_info.py index 91b50c7a480..854d1cbb0d8 100644 --- a/plugins/modules/storagegateway_info.py +++ b/plugins/modules/storagegateway_info.py @@ -172,14 +172,16 @@ region: eu-west-3 """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict - try: - from botocore.exceptions import BotoCoreError, ClientError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class SGWInformationManager(object): def __init__(self, client, module): diff --git a/plugins/modules/sts_assume_role.py b/plugins/modules/sts_assume_role.py index 13e3e7b475e..c53bfa9c978 100644 --- a/plugins/modules/sts_assume_role.py +++ b/plugins/modules/sts_assume_role.py @@ -100,14 +100,16 @@ """ -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict - try: - from botocore.exceptions import ClientError, ParamValidationError + from botocore.exceptions import ClientError + from botocore.exceptions import ParamValidationError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + def _parse_response(response): credentials = response.get('Credentials', {}) diff --git a/plugins/modules/waf_condition.py b/plugins/modules/waf_condition.py index 15bc0580036..6e1911323c9 100644 --- a/plugins/modules/waf_condition.py +++ b/plugins/modules/waf_condition.py @@ -405,16 +405,17 @@ from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry from ansible_collections.amazon.aws.plugins.module_utils.waf import MATCH_LOOKUP from ansible_collections.amazon.aws.plugins.module_utils.waf import run_func_with_change_token_backoff from ansible_collections.amazon.aws.plugins.module_utils.waf import get_rule_with_backoff from ansible_collections.amazon.aws.plugins.module_utils.waf import list_regional_rules_with_backoff from ansible_collections.amazon.aws.plugins.module_utils.waf import list_rules_with_backoff +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule + class Condition(object): diff --git a/plugins/modules/waf_info.py b/plugins/modules/waf_info.py index efe4f04bace..37a8c2bd025 100644 --- a/plugins/modules/waf_info.py +++ b/plugins/modules/waf_info.py @@ -114,8 +114,10 @@ ] """ +from ansible_collections.amazon.aws.plugins.module_utils.waf import get_web_acl +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_web_acls + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.waf import list_web_acls, get_web_acl def main(): diff --git a/plugins/modules/waf_rule.py b/plugins/modules/waf_rule.py index 816d64a2414..54129dafc12 100644 --- a/plugins/modules/waf_rule.py +++ b/plugins/modules/waf_rule.py @@ -143,17 +143,17 @@ except ImportError: pass # handled by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.waf import MATCH_LOOKUP +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_regional_rules_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_rules_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import run_func_with_change_token_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import get_web_acl_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_web_acls_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_regional_web_acls_with_backoff + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.waf import ( - MATCH_LOOKUP, - list_regional_rules_with_backoff, - list_rules_with_backoff, - run_func_with_change_token_backoff, - get_web_acl_with_backoff, - list_web_acls_with_backoff, - list_regional_web_acls_with_backoff, -) def get_rule_by_name(client, module, name): diff --git a/plugins/modules/waf_web_acl.py b/plugins/modules/waf_web_acl.py index fe2e41887cd..dc35308e833 100644 --- a/plugins/modules/waf_web_acl.py +++ b/plugins/modules/waf_web_acl.py @@ -159,23 +159,23 @@ sample: 10fff965-4b6b-46e2-9d78-24f6d2e2d21c """ +import re + try: import botocore except ImportError: pass # handled by AnsibleAWSModule -import re +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.waiters import get_waiter -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.waf import ( - list_regional_rules_with_backoff, - list_regional_web_acls_with_backoff, - list_rules_with_backoff, - list_web_acls_with_backoff, - run_func_with_change_token_backoff, -) + +from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_regional_rules_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_regional_web_acls_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_rules_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import list_web_acls_with_backoff +from ansible_collections.amazon.aws.plugins.module_utils.waf import run_func_with_change_token_backoff def get_web_acl_by_name(client, module, name): diff --git a/plugins/modules/wafv2_ip_set.py b/plugins/modules/wafv2_ip_set.py index 24739d09bfe..961c9325b31 100644 --- a/plugins/modules/wafv2_ip_set.py +++ b/plugins/modules/wafv2_ip_set.py @@ -115,13 +115,16 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import describe_wafv2_tags from ansible_collections.community.aws.plugins.module_utils.wafv2 import ensure_wafv2_tags diff --git a/plugins/modules/wafv2_ip_set_info.py b/plugins/modules/wafv2_ip_set_info.py index b4898d7f96a..4e0d4feb538 100644 --- a/plugins/modules/wafv2_ip_set_info.py +++ b/plugins/modules/wafv2_ip_set_info.py @@ -70,12 +70,14 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import describe_wafv2_tags diff --git a/plugins/modules/wafv2_resources.py b/plugins/modules/wafv2_resources.py index ac551dc6016..552a2de03bd 100644 --- a/plugins/modules/wafv2_resources.py +++ b/plugins/modules/wafv2_resources.py @@ -60,12 +60,14 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_list_web_acls diff --git a/plugins/modules/wafv2_resources_info.py b/plugins/modules/wafv2_resources_info.py index a844d5c78f3..f9c5c3c08c2 100644 --- a/plugins/modules/wafv2_resources_info.py +++ b/plugins/modules/wafv2_resources_info.py @@ -49,12 +49,14 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_list_web_acls diff --git a/plugins/modules/wafv2_rule_group.py b/plugins/modules/wafv2_rule_group.py index 789a468bc63..60cc60a131f 100644 --- a/plugins/modules/wafv2_rule_group.py +++ b/plugins/modules/wafv2_rule_group.py @@ -198,19 +198,22 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import snake_dict_to_camel_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import compare_priority_rules -from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_list_rule_groups -from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_snake_dict_to_camel_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import describe_wafv2_tags from ansible_collections.community.aws.plugins.module_utils.wafv2 import ensure_wafv2_tags +from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_list_rule_groups +from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_snake_dict_to_camel_dict class RuleGroup: diff --git a/plugins/modules/wafv2_rule_group_info.py b/plugins/modules/wafv2_rule_group_info.py index 1c7f6ea64bf..c95b74f81c7 100644 --- a/plugins/modules/wafv2_rule_group_info.py +++ b/plugins/modules/wafv2_rule_group_info.py @@ -87,14 +87,16 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_list_rule_groups from ansible_collections.community.aws.plugins.module_utils.wafv2 import describe_wafv2_tags +from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_list_rule_groups def get_rule_group(wafv2, name, scope, id, fail_json_aws): diff --git a/plugins/modules/wafv2_web_acl.py b/plugins/modules/wafv2_web_acl.py index a62860d602e..3b7fd8daa16 100644 --- a/plugins/modules/wafv2_web_acl.py +++ b/plugins/modules/wafv2_web_acl.py @@ -313,14 +313,17 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict +from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict + +from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import snake_dict_to_camel_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import compare_priority_rules from ansible_collections.community.aws.plugins.module_utils.wafv2 import describe_wafv2_tags from ansible_collections.community.aws.plugins.module_utils.wafv2 import ensure_wafv2_tags diff --git a/plugins/modules/wafv2_web_acl_info.py b/plugins/modules/wafv2_web_acl_info.py index 423ba52543d..8fe00f66a1a 100644 --- a/plugins/modules/wafv2_web_acl_info.py +++ b/plugins/modules/wafv2_web_acl_info.py @@ -89,12 +89,14 @@ """ try: - from botocore.exceptions import ClientError, BotoCoreError + from botocore.exceptions import BotoCoreError + from botocore.exceptions import ClientError except ImportError: pass # caught by AnsibleAWSModule +from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict + from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict from ansible_collections.community.aws.plugins.module_utils.wafv2 import describe_wafv2_tags from ansible_collections.community.aws.plugins.module_utils.wafv2 import wafv2_list_web_acls From c590496365a477f2c358a2bdfef6e5a51e376e4e Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Tue, 7 Mar 2023 08:23:36 +0100 Subject: [PATCH 6/7] Missing RETURN docs --- plugins/connection/aws_ssm.py | 2 +- plugins/modules/ec2_win_password.py | 2 ++ plugins/modules/elasticache.py | 2 ++ plugins/modules/iam_server_certificate.py | 2 ++ plugins/modules/opensearch.py | 2 ++ plugins/modules/s3_lifecycle.py | 2 ++ plugins/modules/s3_logging.py | 2 ++ plugins/modules/s3_metrics_configuration.py | 2 ++ 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/plugins/connection/aws_ssm.py b/plugins/connection/aws_ssm.py index cdf4bf70522..e24c5e379ce 100644 --- a/plugins/connection/aws_ssm.py +++ b/plugins/connection/aws_ssm.py @@ -5,7 +5,7 @@ # Based on the ssh connection plugin by Michael DeHaan -DOCUMENTATION = """ +DOCUMENTATION = r""" name: aws_ssm author: - Pat Sharkey (@psharkey) diff --git a/plugins/modules/ec2_win_password.py b/plugins/modules/ec2_win_password.py index 06e3b88aa33..aec9940cd30 100644 --- a/plugins/modules/ec2_win_password.py +++ b/plugins/modules/ec2_win_password.py @@ -56,6 +56,8 @@ - amazon.aws.boto3 """ +RETURN = r""" # """ + EXAMPLES = r""" # Example of getting a password - name: get the Administrator password diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index 442142fd93a..067134725d7 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -100,6 +100,8 @@ - amazon.aws.boto3 """ +RETURN = r""" # """ + EXAMPLES = r""" # Note: None of these examples set aws_access_key, aws_secret_key, or region. # It is assumed that their matching environment variables are set. diff --git a/plugins/modules/iam_server_certificate.py b/plugins/modules/iam_server_certificate.py index 8132f977508..3ab35fb6864 100644 --- a/plugins/modules/iam_server_certificate.py +++ b/plugins/modules/iam_server_certificate.py @@ -67,6 +67,8 @@ - amazon.aws.boto3 """ +RETURN = r""" # """ + EXAMPLES = r""" - name: Basic server certificate upload from local file community.aws.iam_server_certificate: diff --git a/plugins/modules/opensearch.py b/plugins/modules/opensearch.py index 0f0fe38b4b3..bbe290890a0 100644 --- a/plugins/modules/opensearch.py +++ b/plugins/modules/opensearch.py @@ -394,6 +394,8 @@ - amazon.aws.boto3 """ +RETURN = r""" # """ + EXAMPLES = r""" - name: Create OpenSearch domain for dev environment, no zone awareness, no dedicated masters diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index 7490685b20d..b01402ebdb5 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -153,6 +153,8 @@ - amazon.aws.boto3 """ +RETURN = r""" # """ + EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. diff --git a/plugins/modules/s3_logging.py b/plugins/modules/s3_logging.py index 64dbb574b6d..3db5fbf61e7 100644 --- a/plugins/modules/s3_logging.py +++ b/plugins/modules/s3_logging.py @@ -40,6 +40,8 @@ - amazon.aws.boto3 """ +RETURN = r""" # """ + EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. diff --git a/plugins/modules/s3_metrics_configuration.py b/plugins/modules/s3_metrics_configuration.py index 83b368a3e2a..333bb98cb67 100644 --- a/plugins/modules/s3_metrics_configuration.py +++ b/plugins/modules/s3_metrics_configuration.py @@ -52,6 +52,8 @@ - amazon.aws.boto3 """ +RETURN = r""" # """ + EXAMPLES = r""" # Note: These examples do not set authentication details, see the AWS Guide for details. From c41dc1b690275a7e3fc9b879758bd2cb4220d979 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Tue, 7 Mar 2023 11:29:26 +0100 Subject: [PATCH 7/7] changelog --- changelogs/fragments/1738-headers.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelogs/fragments/1738-headers.yml diff --git a/changelogs/fragments/1738-headers.yml b/changelogs/fragments/1738-headers.yml new file mode 100644 index 00000000000..585fe6a5ca6 --- /dev/null +++ b/changelogs/fragments/1738-headers.yml @@ -0,0 +1,7 @@ +minor_changes: +- community.aws - updated imports based on changes in amazon.aws (https://github.com/ansible-collections/community.aws/pull/1738). +- community.aws - updated document fragments based on changes in amazon.aws (https://github.com/ansible-collections/community.aws/pull/1738). +trivial: +- Add file encoding comment to all plugins +- Replace full GPL prefix entries with one line version +- Add missing copyright notices