Merged in latest main to resolve conflicts

ansible-collections · Jul 12, 2021 · 8e65c90 · 8e65c90
2 parents 7cdb401 + 2463775
commit 8e65c90
Show file tree

Hide file tree

Showing 291 changed files with 1,988 additions and 2,949 deletions.
diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
@@ -357,4 +357,4 @@ files:
 macros:
   connection: plugins/connection
   modules: plugins/modules
-  team_aws: jillr s-hertel tremble
+  team_aws: jillr s-hertel tremble markuman
diff --git a/README.md b/README.md
@@ -1,6 +1,4 @@
 # Community AWS Collection
-[![Shippable build status](https://api.shippable.com/projects//5e5ed2ae0fcc0d0006d2c037badge?branch=main)](https://api.shippable.com/projects/i5e5ed2ae0fcc0d0006d2c037/badge?branch=main)
-<!--[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.aws)](https://codecov.io/gh/ansible-collections/community.aws)-->
 
 The Ansible Community AWS collection includes a variety of Ansible content to help automate the management of AWS instances. This collection is maintained by the Ansible community.
 

diff --git a/...elb-module-add-ip_address_type_option.yml → ...elb-module-add-ip_address_type_option.yml b/...elb-module-add-ip_address_type_option.yml → ...elb-module-add-ip_address_type_option.yml
diff --git a/...instance-preferred_maintenance_window.yml → ...instance-preferred_maintenance_window.yml b/...instance-preferred_maintenance_window.yml → ...instance-preferred_maintenance_window.yml
diff --git a/changelogs/564-route53-retries.yml → changelogs/fragments/564-route53-retries.yml b/changelogs/564-route53-retries.yml → changelogs/fragments/564-route53-retries.yml
diff --git a/changelogs/fragments/586-elb-renames.yml b/changelogs/fragments/586-elb-renames.yml
@@ -0,0 +1,8 @@
+minor_changes:
+- elb_instance - make elb_instance idempotent when deregistering instances.  Merged from ec2_elb U(https://github.com/ansible/ansible/pull/31660).
+deprecated_features:
+- ec2_elb - the ``ec2_elb`` module has been removed and redirected to the ``elb_instance`` module which functions identically.
+  The original ``ec2_elb`` name is now deprecated and will be removed in release 3.0.0 (https://github.com/ansible-collections/community.aws/pull/586).
+- ec2_elb_info - the boto based ``ec2_elb_info`` module has been deprecated in favour of the boto3 based ``elb_classic_lb_info`` module.
+  The ``ec2_elb_info`` module will be removed in release 3.0.0 (https://github.com/ansible-collections/community.aws/pull/586).
+- elb_classic_lb - the ``elb_classic_lb`` module has been removed and redirected to the ``amazon.aws.ec2_elb_lb`` module which functions identically.
diff --git a/changelogs/fragments/592-sqs_queue-idempotent.yml b/changelogs/fragments/592-sqs_queue-idempotent.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- sqs_queue - fix queue attribute comparison to make module idempotent (https://github.com/ansible-collections/community.aws/pull/592).
diff --git a/changelogs/fragments/600-ecs-task-defination-env-file-validations.yml b/changelogs/fragments/600-ecs-task-defination-env-file-validations.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- ecs_taskdefinition - fix typo in ecs task defination for env file validations (https://github.com/ansible-collections/community.aws/pull/600).
diff --git a/changelogs/fragments/614-ec2_vpc_peer-tagging.yml b/changelogs/fragments/614-ec2_vpc_peer-tagging.yml
@@ -0,0 +1,4 @@
+bugfixes:
+- ec2_vpc_peer - automatically retry when attempting to tag freshly created peering connections (https://github.com/ansible-collections/community.aws/pull/614).
+minor_changes:
+- ec2_vpc_peer - use shared code for tagging peering connections (https://github.com/ansible-collections/community.aws/pull/614).
diff --git a/changelogs/fragments/616-ec2_vpc_route_table-tagging.yml b/changelogs/fragments/616-ec2_vpc_route_table-tagging.yml
@@ -0,0 +1,4 @@
+bugfixes:
+- ec2_vpc_route_table - automatically retry when attempting to modify freshly created route tables (https://github.com/ansible-collections/community.aws/pull/616).
+minor_changes:
+- ec2_vpc_route_table - use shared code for tagging route tables (https://github.com/ansible-collections/community.aws/pull/616).
diff --git a/changelogs/fragments/629-imports-cleanup.yml b/changelogs/fragments/629-imports-cleanup.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- various community.aws modules - remove unused imports (https://github.com/ansible-collections/community.aws/pull/629)
diff --git a/changelogs/fragments/rename-connection-retries.yml b/changelogs/fragments/rename-connection-retries.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - aws_ssm - rename ``retries`` to ``reconnection_retries`` to avoid conflict with task retries
diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -71,6 +71,8 @@ action_groups:
   - aws_inspector_target
   - aws_kms
   - aws_kms_info
+  - aws_msk_cluster
+  - aws_msk_config
   - aws_region_info
   - aws_s3_bucket_info
   - aws_s3_cors
@@ -292,6 +294,14 @@ plugin_routing:
           ec2_customer_gateway_facts was renamed in Ansible 2.9 to
           ec2_customer_gateway_info.
           Please update your tasks.
+    ec2_elb:
+      redirect: community.aws.elb_instance
+      deprecation:
+        removal_version: 3.0.0
+        warning_text: >-
+          ec2_elb was renamed in community.aws 2.0.0 to
+          elb_instance.
+          Please update your tasks.
     ec2_instance:
       redirect: amazon.aws.ec2_instance
     ec2_instance_facts:
@@ -306,9 +316,17 @@ plugin_routing:
           Please update your tasks.
     ec2_elb_facts:
       deprecation:
-        removal_date: 2021-12-01
+        removal_version: 3.0.0
+        warning_text: >-
+          The ec2_elb_info module has been deprecated and replaced by
+          the elb_classic_lb_info module.
+          Please update your tasks.
+    ec2_elb_info:
+      deprecation:
+        removal_version: 3.0.0
         warning_text: >-
-          ec2_elb_facts was renamed in Ansible 2.9 to ec2_elb_info.
+          The ec2_elb_info module has been deprecated and replaced by
+          the elb_classic_lb_info module.
           Please update your tasks.
     ec2_lc_facts:
       deprecation:
@@ -409,6 +427,8 @@ plugin_routing:
           elb_application_lb_facts was renamed in Ansible 2.9 to
           elb_application_lb_info.
           Please update your tasks.
+    elb_classic_lb:
+      redirect: amazon.aws.ec2_elb_lb
     elb_classic_lb_facts:
       deprecation:
         removal_date: 2021-12-01

diff --git a/plugins/connection/aws_ssm.py b/plugins/connection/aws_ssm.py
@@ -58,7 +58,7 @@
     vars:
     - name: ansible_aws_ssm_profile
     version_added: 1.5.0
-  retries:
+  reconnection_retries:
     description: Number of attempts to connect.
     default: 3
     type: integer
@@ -206,7 +206,7 @@ def _ssm_retry(func):
     """
     @wraps(func)
     def wrapped(self, *args, **kwargs):
-        remaining_tries = int(self.get_option('retries')) + 1
+        remaining_tries = int(self.get_option('reconnection_retries')) + 1
         cmd_summary = "%s..." % args[0]
         for attempt in range(remaining_tries):
             cmd = args[0]

diff --git a/plugins/modules/aws_acm.py b/plugins/modules/aws_acm.py
@@ -145,14 +145,11 @@
     choices: [present, absent]
     default: present
     type: str
-requirements:
-  - boto3
 author:
   - Matthew Davis (@matt-telstra) on behalf of Telstra Corporation Limited
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
 '''
 
 EXAMPLES = '''

diff --git a/plugins/modules/aws_acm_info.py b/plugins/modules/aws_acm_info.py
@@ -39,14 +39,11 @@
     description:
       - Filter results to show only certificates with tags that match all the tags specified here.
     type: dict
-requirements:
-  - boto3
 author:
   - Will Thames (@willthames)
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
 '''
 
 EXAMPLES = r'''

diff --git a/plugins/modules/aws_api_gateway.py b/plugins/modules/aws_api_gateway.py
@@ -26,7 +26,6 @@
      - swagger_file and swagger_text are passed directly on to AWS
        transparently whilst swagger_dict is an ansible dict which is
        converted to JSON before the API definitions are uploaded.
-requirements: [ boto3 ]
 options:
   api_id:
     description:
@@ -114,7 +113,6 @@
      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 = '''

diff --git a/plugins/modules/aws_application_scaling_policy.py b/plugins/modules/aws_application_scaling_policy.py
@@ -19,7 +19,6 @@
 author:
     - Gustavo Maia (@gurumaia)
     - Chen Leibovich (@chenl87)
-requirements: [ json, botocore, boto3 ]
 options:
     state:
         description: Whether a policy should be C(present) or C(absent).
@@ -105,7 +104,6 @@
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
 '''
 
 EXAMPLES = '''

diff --git a/plugins/modules/aws_batch_compute_environment.py b/plugins/modules/aws_batch_compute_environment.py
@@ -118,9 +118,6 @@
     description:
       - The Amazon Resource Name (ARN) of the Amazon EC2 Spot Fleet IAM role applied to a SPOT compute environment.
     type: str
-
-requirements:
-    - boto3
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2

diff --git a/plugins/modules/aws_batch_job_definition.py b/plugins/modules/aws_batch_job_definition.py
@@ -169,8 +169,6 @@
         attempts. If attempts is greater than one, the job is retried if it fails until it has moved to RUNNABLE that
         many times.
     type: int
-requirements:
-    - boto3
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2

diff --git a/plugins/modules/aws_batch_job_queue.py b/plugins/modules/aws_batch_job_queue.py
@@ -59,8 +59,6 @@
         compute_environment:
             type: str
             description: The name of the compute environment.
-requirements:
-    - boto3
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2

diff --git a/plugins/modules/aws_codebuild.py b/plugins/modules/aws_codebuild.py
@@ -18,7 +18,6 @@
     - Create or delete a CodeBuild projects on AWS, used for building code artifacts from source code.
 author:
     - Stefan Horning (@stefanhorning) <horning@mediapeers.com>
-requirements: [ botocore, boto3 ]
 options:
     name:
         description:

diff --git a/plugins/modules/aws_codecommit.py b/plugins/modules/aws_codecommit.py
@@ -16,12 +16,6 @@
   - Supports creation and deletion of CodeCommit repositories.
   - See U(https://aws.amazon.com/codecommit/) for more information about CodeCommit.
 author: Shuang Wang (@ptux)
-
-requirements:
-  - botocore
-  - boto3
-  - python >= 2.6
-
 options:
   name:
     description:

diff --git a/plugins/modules/aws_codepipeline.py b/plugins/modules/aws_codepipeline.py
@@ -18,7 +18,6 @@
     - Create or delete a CodePipeline on AWS.
 author:
     - Stefan Horning (@stefanhorning) <horning@mediapeers.com>
-requirements: [ botocore, boto3 ]
 options:
     name:
         description:

diff --git a/plugins/modules/aws_config_aggregation_authorization.py b/plugins/modules/aws_config_aggregation_authorization.py
@@ -14,7 +14,6 @@
 short_description: Manage cross-account AWS Config authorizations
 description:
     - Module manages AWS Config resources.
-requirements: [ 'botocore', 'boto3' ]
 author:
     - "Aaron Smith (@slapula)"
 options:

diff --git a/plugins/modules/aws_config_aggregator.py b/plugins/modules/aws_config_aggregator.py
@@ -14,7 +14,6 @@
 short_description: Manage AWS Config aggregations across multiple accounts
 description:
     - Module manages AWS Config resources
-requirements: [ 'botocore', 'boto3' ]
 author:
     - "Aaron Smith (@slapula)"
 options:

diff --git a/plugins/modules/aws_config_delivery_channel.py b/plugins/modules/aws_config_delivery_channel.py
@@ -14,7 +14,6 @@
 short_description: Manage AWS Config delivery channels
 description:
     - This module manages AWS Config delivery locations for rule checks and configuration info.
-requirements: [ 'botocore', 'boto3' ]
 author:
     - "Aaron Smith (@slapula)"
 options:

diff --git a/plugins/modules/aws_config_recorder.py b/plugins/modules/aws_config_recorder.py
@@ -14,7 +14,6 @@
 short_description: Manage AWS Config Recorders
 description:
     - Module manages AWS Config configuration recorder settings.
-requirements: [ 'botocore', 'boto3' ]
 author:
     - "Aaron Smith (@slapula)"
 options:

diff --git a/plugins/modules/aws_config_rule.py b/plugins/modules/aws_config_rule.py
@@ -14,7 +14,6 @@
 short_description: Manage AWS Config resources
 description:
     - Module manages AWS Config rules
-requirements: [ 'botocore', 'boto3' ]
 author:
     - "Aaron Smith (@slapula)"
 options:

diff --git a/plugins/modules/aws_direct_connect_confirm_connection.py b/plugins/modules/aws_direct_connect_confirm_connection.py
@@ -21,10 +21,6 @@
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
-requirements:
-  - boto3
-  - botocore
 options:
   name:
     description:

diff --git a/plugins/modules/aws_direct_connect_connection.py b/plugins/modules/aws_direct_connect_connection.py
@@ -19,10 +19,6 @@
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
-requirements:
-  - boto3
-  - botocore
 options:
   state:
     description:

diff --git a/plugins/modules/aws_direct_connect_gateway.py b/plugins/modules/aws_direct_connect_gateway.py
@@ -19,8 +19,6 @@
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
-requirements: [ boto3 ]
 options:
   state:
     description:

diff --git a/plugins/modules/aws_direct_connect_link_aggregation_group.py b/plugins/modules/aws_direct_connect_link_aggregation_group.py
@@ -17,10 +17,6 @@
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
-requirements:
-  - boto3
-  - botocore
 options:
   state:
     description:

diff --git a/plugins/modules/aws_direct_connect_virtual_interface.py b/plugins/modules/aws_direct_connect_virtual_interface.py
@@ -14,9 +14,6 @@
 description:
   - Create, delete, or modify a Direct Connect public or private virtual interface.
 author: "Sloane Hertel (@s-hertel)"
-requirements:
-  - boto3
-  - botocore
 options:
   state:
     description:

diff --git a/plugins/modules/aws_eks_cluster.py b/plugins/modules/aws_eks_cluster.py
@@ -54,8 +54,6 @@
       to 1200 seconds (20 minutes).
     default: 1200
     type: int
-
-requirements: [ 'botocore', 'boto3' ]
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2

diff --git a/plugins/modules/aws_glue_connection.py b/plugins/modules/aws_glue_connection.py
@@ -13,7 +13,6 @@
 short_description: Manage an AWS Glue connection
 description:
     - Manage an AWS Glue connection. See U(https://aws.amazon.com/glue/) for details.
-requirements: [ boto3 ]
 author: "Rob White (@wimnat)"
 options:
   availability_zone:

diff --git a/plugins/modules/aws_glue_job.py b/plugins/modules/aws_glue_job.py
@@ -13,7 +13,6 @@
 short_description: Manage an AWS Glue job
 description:
     - Manage an AWS Glue job. See U(https://aws.amazon.com/glue/) for details.
-requirements: [ boto3 ]
 author:
   - "Rob White (@wimnat)"
   - "Vijayanand Sharma (@vijayanandsharma)"

diff --git a/plugins/modules/aws_inspector_target.py b/plugins/modules/aws_inspector_target.py
@@ -38,10 +38,6 @@
 extends_documentation_fragment:
 - amazon.aws.aws
 - amazon.aws.ec2
-
-requirements:
-  - boto3
-  - botocore
 '''
 
 EXAMPLES = '''
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- sqs_queue - fix queue attribute comparison to make module idempotent (https://github.com/ansible-collections/community.aws/pull/592).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- ecs_taskdefinition - fix typo in ecs task defination for env file validations (https://github.com/ansible-collections/community.aws/pull/600).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- various community.aws modules - remove unused imports (https://github.com/ansible-collections/community.aws/pull/629)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- aws_ssm - rename ``retries`` to ``reconnection_retries`` to avoid conflict with task retries