Merge branch 'main' into route_table_ipv6

CHANGELOG.rst

@@ -5,6 +5,45 @@ community.aws Release Notes
 .. contents:: Topics
 
 
+v3.1.1
+======
+
+Minor Changes
+-------------
+
+- bump the release version of the amazon.aws collection from 3.1.0 to 3.1.1 because of a bug that occurred while uploading to Galaxy.
+
+v3.1.0
+======
+
+Minor Changes
+-------------
+
+- add new parameters hostvars_prefix and hostvars_suffix for inventory plugins aws_ec2 and aws_rds (https://github.com/ansible-collections/amazon.aws/issues/535).
+- aws_s3 - Add ``validate_bucket_name`` option, to control bucket name validation (https://github.com/ansible-collections/amazon.aws/pull/615).
+- aws_s3 - add latest choice on ``overwrite`` parameter to get latest object on S3 (https://github.com/ansible-collections/amazon.aws/pull/595).
+- ec2_vol - add support for OutpostArn param (https://github.com/ansible-collections/amazon.aws/pull/597).
+- ec2_vol - tag volume on creation (https://github.com/ansible-collections/amazon.aws/pull/603).
+- ec2_vpc_route_table - add support for IPv6 in creating route tables (https://github.com/ansible-collections/amazon.aws/pull/601).
+- s3_bucket - Add ``validate_bucket_name`` option, to control bucket name validation (https://github.com/ansible-collections/amazon.aws/pull/615).
+
+Deprecated Features
+-------------------
+
+- ec2_instance - The default value for ```instance_type``` has been deprecated, in the future release you must set an instance_type or a launch_template (https://github.com/ansible-collections/amazon.aws/pull/587).
+
+Bugfixes
+--------
+
+- Various modules and plugins - use vendored version of ``distutils.version`` instead of the deprecated Python standard library ``distutils`` (https://github.com/ansible-collections/amazon.aws/pull/599).
+- aws_acm - No longer raising ResourceNotFound exception while retrieving ACM certificates.
+- aws_s3 - fix exception raised when using module to copy from source to destination and key is missing from source (https://github.com/ansible-collections/amazon.aws/issues/602).
+- ec2_instance - Add a condition to handle default ```instance_type``` value for fix breaking on instance creation with launch template (https://github.com/ansible-collections/amazon.aws/pull/587).
+- ec2_key - add support for ED25519 key type (https://github.com/ansible-collections/amazon.aws/issues/572).
+- ec2_vol - Sets the Iops value in req_obj even if the iops value has not changed, to allow modifying volume types that require passing an iops value to boto. (https://github.com/ansible-collections/amazon.aws/pull/606)
+- elb_classic_lb - handle security_group_ids when providing security_group_names and fix broken tasks in integration test (https://github.com/ansible-collections/amazon.aws/pull/592).
+- s3_bucket - Enable the management of bucket-level ACLs (https://github.com/ansible-collections/amazon.aws/issues/573).
+
 v3.0.0
 ======
 

CONTRIBUTING.md

@@ -6,7 +6,7 @@ General information about setting up your Python environment, testing modules,
 Ansible coding styles, and more can be found in the [Ansible Community Guide](
 https://docs.ansible.com/ansible/latest/community/index.html).
 
-Information about boto library usage, module utils, testing, and more can be
+Information about AWS SDK library usage, module utils, testing, and more can be
 found in the [AWS Guidelines](https://docs.ansible.com/ansible/devel/dev_guide/platforms/aws_guidelines.html)
 documentation.
 
@@ -41,7 +41,7 @@ issue, or by reporting any additional information
 
 ## Pull Requests
 
-All modules MUST have integration tests for new features. Upgrading to boto3 shall be considered a feature request.  
+All modules MUST have integration tests for new features.
 Bug fixes for modules that currently have integration tests SHOULD have tests added.  
 New modules should be submitted to the [community.aws](https://github.com/ansible-collections/community.aws) collection
 and MUST have integration tests.

README.md

@@ -21,9 +21,9 @@ As the AWS SDK for Python (Boto3 and Botocore) has [ceased supporting Python 2.7
 
 Starting with the 2.0.0 releases of amazon.aws and community.aws, it is generally the collection's policy to support the versions of `botocore` and `boto3` that were released 12 months prior to the most recent major collection release, following semantic versioning (for example, 2.0.0, 3.0.0).
 
-Version 3.0.0 of this collection supports `boto3 >= 1.16.0` and `botocore >= 1.19.0`
+Version 4.0.0 of this collection supports `boto3 >= 1.17.0` and `botocore >= 1.20.0`
 
-Support for the original AWS SDK `boto` has been deprecated and the module_utils library code to support it will be removed in release 4.0.0.
+All support for the original AWS SDK `boto` was removed in release 4.0.0.
 
 ## Included content
 
@@ -110,7 +110,7 @@ be manually installed using pip:
 
 or:
 
-    pip install boto boto3 botocore
+    pip install boto3 botocore
 
 ## Using this collection
 

changelogs/changelog.yaml

@@ -649,3 +649,60 @@ releases:
     - 575-deprecate-boto.yml
     - remove_deprecated_facts.yml
     release_date: '2021-12-06'
+  3.1.0:
+    changes:
+      bugfixes:
+      - Various modules and plugins - use vendored version of ``distutils.version``
+        instead of the deprecated Python standard library ``distutils`` (https://github.com/ansible-collections/amazon.aws/pull/599).
+      - aws_acm - No longer raising ResourceNotFound exception while retrieving ACM
+        certificates.
+      - aws_s3 - fix exception raised when using module to copy from source to destination
+        and key is missing from source (https://github.com/ansible-collections/amazon.aws/issues/602).
+      - ec2_instance - Add a condition to handle default ```instance_type``` value
+        for fix breaking on instance creation with launch template (https://github.com/ansible-collections/amazon.aws/pull/587).
+      - ec2_key - add support for ED25519 key type (https://github.com/ansible-collections/amazon.aws/issues/572).
+      - ec2_vol - Sets the Iops value in req_obj even if the iops value has not changed,
+        to allow modifying volume types that require passing an iops value to boto.
+        (https://github.com/ansible-collections/amazon.aws/pull/606)
+      - elb_classic_lb - handle security_group_ids when providing security_group_names
+        and fix broken tasks in integration test (https://github.com/ansible-collections/amazon.aws/pull/592).
+      - s3_bucket - Enable the management of bucket-level ACLs (https://github.com/ansible-collections/amazon.aws/issues/573).
+      deprecated_features:
+      - ec2_instance - The default value for ```instance_type``` has been deprecated,
+        in the future release you must set an instance_type or a launch_template (https://github.com/ansible-collections/amazon.aws/pull/587).
+      minor_changes:
+      - add new parameters hostvars_prefix and hostvars_suffix for inventory plugins
+        aws_ec2 and aws_rds (https://github.com/ansible-collections/amazon.aws/issues/535).
+      - aws_s3 - Add ``validate_bucket_name`` option, to control bucket name validation
+        (https://github.com/ansible-collections/amazon.aws/pull/615).
+      - aws_s3 - add latest choice on ``overwrite`` parameter to get latest object
+        on S3 (https://github.com/ansible-collections/amazon.aws/pull/595).
+      - ec2_vol - add support for OutpostArn param (https://github.com/ansible-collections/amazon.aws/pull/597).
+      - ec2_vol - tag volume on creation (https://github.com/ansible-collections/amazon.aws/pull/603).
+      - ec2_vpc_route_table - add support for IPv6 in creating route tables (https://github.com/ansible-collections/amazon.aws/pull/601).
+      - s3_bucket - Add ``validate_bucket_name`` option, to control bucket name validation
+        (https://github.com/ansible-collections/amazon.aws/pull/615).
+    fragments:
+    - 587-ec2_instance-default-instance-type-launch-template.yml
+    - 592-elb_classic_lb-handle-sg-ids-fix-tests.yml
+    - 593-aws_s3-fix-copy-when-missing-key.yml
+    - 595-aws_s3-add-latest-choice-on-overwrite-parameter.yml
+    - 597-ec2_vol-add-outpostarn-support.yml
+    - 601-ec2_vpc_route_table-ipv6-support.yml
+    - 603-ec2_vol-add-tags-on-creation.yml
+    - 606-ec2_vol-set-iops-even-if-unchanged-for-boto-req.yml
+    - 611-s3_bucket-add-support-for-acl.yml
+    - 614-ec2_key-add-support-for-ed25519-key-type.yml
+    - 615-s3-validate_bucket_name.yml
+    - 619-aws_ec2-aws_rds-add-support-for-hostvars_prefix-and-hostvars_suffix.yml
+    - 646-acm-resource-not-found.yml
+    - disutils.version.yml
+    release_date: '2022-02-10'
+  3.1.1:
+    changes:
+      minor_changes:
+      - bump the release version of the amazon.aws collection from 3.1.0 to 3.1.1
+        because of a bug that occurred while uploading to Galaxy.
+    fragments:
+    - bump_release_version.yml
+    release_date: '2022-02-15'

changelogs/fragments/587-ec2_instance-default-instance-type-launch-template.yml

@@ -0,0 +1,6 @@
+bugfixes:
+  - ec2_instance - Add a condition to handle default ```instance_type``` value
+    for fix breaking on instance creation with launch template (https://github.com/ansible-collections/amazon.aws/pull/587).
+deprecated_features:
+  - ec2_instance - The default value for ```instance_type``` has been deprecated,
+    in the future release you must set an instance_type or a launch_template (https://github.com/ansible-collections/amazon.aws/pull/587).

changelogs/fragments/591-aws_secrets-handle-pagination.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- aws_secret - add pagination for ``bypath`` functionality (https://github.com/ansible-collections/amazon.aws/pull/591).

changelogs/fragments/598-ec2_vpc_subnet-add-outpostarn-support.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - ec2_vpc_subnet - add support for OutpostArn param (https://github.com/ansible-collections/amazon.aws/pull/598).

changelogs/fragments/615-s3-validate_bucket_name.yml

@@ -0,0 +1,3 @@
+minor_changes:
+  - aws_s3 - Add ``validate_bucket_name`` option, to control bucket name validation (https://github.com/ansible-collections/amazon.aws/pull/615).
+  - s3_bucket - Add ``validate_bucket_name`` option, to control bucket name validation (https://github.com/ansible-collections/amazon.aws/pull/615).

changelogs/fragments/626-ec2_vol-iops-when-source-does-not-have-iops.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ec2_vol - changing a volume from a type that does not support IOPS (like ``standard``) to a type that does (like ``gp3``) fails (https://github.com/ansible-collections/amazon.aws/issues/626).

changelogs/fragments/630-remove-boto.yml

@@ -0,0 +1,4 @@
+breaking_changes:
+- ec2 - The ``ec2`` module has been removed in release 4.0.0 and replaced by the ``ec2_instance`` module (https://github.com/ansible-collections/amazon.aws/pull/630).
+- module_utils - Support for the original AWS SDK aka ``boto`` has been removed, including all relevant helper functions.
+  All modules should now use the ``boto3``/``botocore`` AWS SDK (https://github.com/ansible-collections/amazon.aws/pull/630)

changelogs/fragments/631-ec2_vpc_net-check_mode.yml

@@ -0,0 +1,6 @@
+bugfixes:
+- >-
+  ec2_vpc_net - In check mode, ensure the module does not change the configuration.
+  Handle case when Amazon-provided ipv6 block is enabled, then disabled, then enabled again.
+  Do not disable IPv6 CIDR association (using Amazon pool) if ipv6_cidr property is not present in the task.
+  If the VPC already exists and ipv6_cidr property, retain the current config (https://github.com/ansible-collections/amazon.aws/pull/631).

changelogs/fragments/655-aws_ec2-aws_rds-add-support-for-hostvars_prefix-and-hostvars_suffix.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- module_utils - add new aliases ``aws_session_token`` and ``session_token`` to the ``security_token`` paramater to be more in-line with the boto SDK (https://github.com/ansible-collections/amazon.aws/pull/631).

changelogs/fragments/691-ec2_vpc_igw-fix-null-igw-error.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - ec2_vpc_igw - fix 'NoneType' object is not subscriptable error (https://github.com/ansible-collections/amazon.aws/pull/691).

changelogs/fragments/695-ec2_vpc_igw-fix-nonetype-with-paginator.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - ec2_vpc_igw - use paginator for describe internet gateways and add retry to fix NoneType object is not subscriptable error (https://github.com/ansible-collections/amazon.aws/pull/695).

changelogs/fragments/696-elbv2-support-alb-attributes.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - module_utils.elbv2 - Add support for alb specific attributes and compare_elb_attributes method to support check_mode in module_utils.elbv2 (https://github.com/ansible-collections/amazon.aws/pull/696).

changelogs/fragments/715-ec2-instance-metadata-options.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - ec2_instance - Add missing ``metadata_options`` parameters (https://github.com/ansible-collections/amazon.aws/pull/715).

changelogs/fragments/release-4--botocore.yml

@@ -0,0 +1,7 @@
+major_changes:
+- amazon.aws collection - The amazon.aws collection has dropped support for
+  ``botocore<1.20.0`` and ``boto3<1.17.0``. Most modules will continue to work
+  with older versions of the AWS SDK, however compatability with older versions
+  of the SDK is not guaranteed and will not be tested. When using older versions
+  of the SDK a warning will be emitted by Ansible
+  (https://github.com/ansible-collections/amazon.aws/pull/574).

changelogs/fragments/validate-plugins.yml

@@ -0,0 +1,9 @@
+bugfixes:
+  - "aws_resource_actions callback plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."
+  - "aws_ec2 inventory plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."
+  - "aws_rds inventory plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."
+  - "aws_account_attribute lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."
+  - "aws_account_attribute lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."
+  - "aws_secret lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."
+  - "aws_service_ip_ranges lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."
+  - "aws_ssm lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)."

docs/amazon.aws.aws_az_info_module.rst

@@ -27,8 +27,8 @@ Requirements
 The below requirements are needed on the host that executes this module.
 
 - python >= 3.6
-- boto3 >= 1.15.0
-- botocore >= 1.18.0
+- boto3 >= 1.16.0
+- botocore >= 1.19.0
 
 
 Parameters

docs/amazon.aws.aws_caller_info_module.rst

@@ -27,8 +27,8 @@ Requirements
 The below requirements are needed on the host that executes this module.
 
 - python >= 3.6
-- boto3 >= 1.15.0
-- botocore >= 1.18.0
+- boto3 >= 1.16.0
+- botocore >= 1.19.0
 
 
 Parameters

docs/amazon.aws.aws_ec2_inventory.rst

@@ -17,7 +17,7 @@ amazon.aws.aws_ec2
 Synopsis
 --------
 - Get inventory hosts from Amazon Web Services EC2.
-- Uses a YAML configuration file that ends with ``aws_ec2.(yml|yaml``).
+- Uses a YAML configuration file that ends with ``aws_ec2.{yml|yaml}``.
 
 
 
@@ -339,6 +339,42 @@ Parameters
                         <div>To use tags as hostnames use the syntax tag:Name=Value to use the hostname Name_Value, or tag:Name to use the value of the Name tag.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>hostvars_prefix</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.1.0</div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>The prefix for host variables names coming from AWS.</div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>hostvars_suffix</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.1.0</div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>The suffix for host variables names coming from AWS.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -716,6 +752,12 @@ Examples
       ansible_host: public_dns_name
     groups:
       libvpc: vpc_id == 'vpc-####'
+    # Define prefix and suffix for host variables coming from AWS.
+    plugin: aws_ec2
+    regions:
+      - us-east-1
+    hostvars_prefix: 'aws_'
+    hostvars_suffix: '_ec2'