Merge branch 'main' into patch-8

.github/workflows/changelog_and_linters.yml

@@ -7,4 +7,7 @@ jobs:
   changelog:
     uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
   linters:
-    uses: ansible-network/github_actions/.github/workflows/tox-linters.yml@main
+    uses: ansible-network/github_actions/.github/workflows/tox.yml@main
+    with:
+      envname: ""
+      labelname: "lint"

.yamllint

@@ -0,0 +1,15 @@
+---
+rules:
+  indentation:
+    ignore: &default_ignores |
+      # automatically generated, we can't control it
+      changelogs/changelog.yaml
+      # Will be gone when we release and automatically reformatted
+      changelogs/fragments/*
+  document-start:
+    ignore: *default_ignores
+  line-length:
+    ignore: *default_ignores
+    max: 160
+
+ignore-from-file: .gitignore

CHANGELOG.rst

@@ -5,6 +5,30 @@ amazon.aws Release Notes
 .. contents:: Topics
 
 
+v6.4.0
+======
+
+Release Summary
+---------------
+
+This release brings a new module named ``amazon.aws.ec2_key_info``, some documentation improvements, new features and bugfixes.
+
+Minor Changes
+-------------
+
+- cloudformation - Add support for ``disable_rollback`` to update stack operation (https://github.com/ansible-collections/amazon.aws/issues/1681).
+- ec2_key - add support for new parameter ``file_name`` to save private key in when new key is created by AWS. When this option is provided the generated private key will be removed from the module return (https://github.com/ansible-collections/amazon.aws/pull/1704).
+
+Bugfixes
+--------
+
+- backup_selection - ensures that updating an existing selection will add new ``Conditions`` if there previously were not any (https://github.com/ansible-collections/amazon.aws/pull/1701).
+
+New Modules
+-----------
+
+- ec2_key_info - Gather information about EC2 key pairs in AWS
+
 v6.3.0
 ======
 

README.md

@@ -1,5 +1,5 @@
 # Amazon AWS Collection
-The Ansible Amazon AWS collection includes a variety of Ansible content to help automate the management of AWS instances. This collection is maintained by the Ansible cloud team.
+The Ansible Amazon AWS collection includes a variety of Ansible content to help automate the management of AWS services. This collection is maintained by the Ansible cloud team.
 
 AWS related modules and plugins supported by the Ansible community are in the [community.aws](https://github.com/ansible-collections/community.aws/) collection.
 
@@ -13,19 +13,33 @@ Use amazon.aws 4.x.y if you are using Ansible 2.9 or Ansible Core 2.10.
 
 This collection depends on the AWS SDK for Python (Boto3 and Botocore).  Due to the
 [AWS SDK Python Support Policy](https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/)
-this collection requires Python 3.6 or greater.
-
-Amazon have also announced the end of support for
-[Python less than 3.7](https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/).
-As such support for Python less than 3.7 by this collection has been deprecated and will be removed in release 7.0.0.
-Additionally, support for Python less than 3.8 is expected to be removed in a release after 2024-12-01 based on currently
-available schedules.
+this collection requires Python 3.7 or greater.
+
+Amazon have also announced the planned end of support for
+[Python less than 3.8](https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/).
+As such support for Python less than 3.8 will be removed in a release after 2024-12-01.
+
+<!---
+### End of Support by Python Versions:
+
+| Python Version | AWS SDK | Collection |
+| -------------- | -------- | ---------- |
+| 2.7 | July 2021 | Release 2.0.0 (September 2021) |
+| 3.4 | February 2021 | Release 1.0.0 (June 2020) |
+| 3.5 | February 2021 | Release 2.0.0 (September 2021) |
+| 3.6 | May 2022 | Release 7.0.0 (November 2023) |
+| 3.7 | December 2023 | *After December 2024* |
+| 3.8 | April 2025 | *After April 2026* |
+| 3.9 | April 2026 | *After April 2027* |
+| 3.10 | April 2027 | *After April 2028* |
+| 3.11 | April 2028 | *After April 2029* |
+--->
 
 ## AWS SDK version compatibility
 
 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 6.0.0 of this collection supports `boto3 >= 1.22.0` and `botocore >= 1.25.0`
+Version 7.0.0 of this collection supports `boto3 >= 1.26.0` and `botocore >= 1.29.0`
 
 All support for the original AWS SDK `boto` was removed in release 4.0.0.
 

changelogs/changelog.yaml

@@ -854,9 +854,9 @@ releases:
     - validate-plugins.yml
     release_date: '2022-05-26'
   3.3.1:
-    release_date: '2022-06-22'
     changes:
       release_summary: Various minor documentation fixes.
+    release_date: '2022-06-22'
   3.4.0:
     changes:
       bugfixes:
@@ -2007,8 +2007,9 @@ releases:
       - ec2_vpc_route_table - add support for Carrier Gateway entry (https://github.com/ansible-collections/amazon.aws/pull/926).
       - ec2_vpc_subnet - retry fetching subnet details after creation if the first
         attempt fails (https://github.com/ansible-collections/amazon.aws/pull/1526).
-      - inventory aws ec2 - add parameter ``use_ssm_inventory`` allowing to query ssm
-        inventory information for configured EC2 instances and populate hostvars (https://github.com/ansible-collections/amazon.aws/issues/704).
+      - inventory aws ec2 - add parameter ``use_ssm_inventory`` allowing to query
+        ssm inventory information for configured EC2 instances and populate hostvars
+        (https://github.com/ansible-collections/amazon.aws/issues/704).
       - inventory plugins - refactor cache handling (https://github.com/ansible-collections/amazon.aws/pull/1285).
       - inventory plugins - refactor file verification handling (https://github.com/ansible-collections/amazon.aws/pull/1285).
       - inventory_aws_ec2 integration tests - replace local module ``test_get_ssm_inventory``
@@ -2370,3 +2371,28 @@ releases:
     - ec2_vpc_route_table_info-filter-fix.yml
     - release_summary.yml
     release_date: '2023-08-03'
+  6.4.0:
+    changes:
+      bugfixes:
+      - backup_selection - ensures that updating an existing selection will add new
+        ``Conditions`` if there previously were not any (https://github.com/ansible-collections/amazon.aws/pull/1701).
+      minor_changes:
+      - cloudformation - Add support for ``disable_rollback`` to update stack operation
+        (https://github.com/ansible-collections/amazon.aws/issues/1681).
+      - ec2_key - add support for new parameter ``file_name`` to save private key
+        in when new key is created by AWS. When this option is provided the generated
+        private key will be removed from the module return (https://github.com/ansible-collections/amazon.aws/pull/1704).
+      release_summary: This release brings a new module named ``amazon.aws.ec2_key_info``,
+        some documentation improvements, new features and bugfixes.
+    fragments:
+    - 1681-cloudformation-add-support-for-disable_rollback-to-update.yml
+    - 1685-ssm_parameter-update-examples-to-use-fqcn.yml
+    - 1701-backup-selection-bugfix.yml
+    - doc_update_for_keypair_nolog.yml
+    - ec2_key-fix-security-vulnerability.yml
+    - release_summary.yml
+    modules:
+    - description: Gather information about EC2 key pairs in AWS
+      name: ec2_key_info
+      namespace: ''
+    release_date: '2023-09-05'

changelogs/config.yaml

@@ -1,3 +1,4 @@
+---
 changelog_filename_template: ../CHANGELOG.rst
 changelog_filename_version_depth: 0
 changes_file: changelog.yaml
@@ -9,21 +10,21 @@ notesdir: fragments
 prelude_section_name: release_summary
 prelude_section_title: Release Summary
 sections:
-- - major_changes
-  - Major Changes
-- - minor_changes
-  - Minor Changes
-- - breaking_changes
-  - Breaking Changes / Porting Guide
-- - deprecated_features
-  - Deprecated Features
-- - removed_features
-  - Removed Features (previously deprecated)
-- - security_fixes
-  - Security Fixes
-- - bugfixes
-  - Bugfixes
-- - known_issues
-  - Known Issues
+  - - major_changes
+    - Major Changes
+  - - minor_changes
+    - Minor Changes
+  - - breaking_changes
+    - Breaking Changes / Porting Guide
+  - - deprecated_features
+    - Deprecated Features
+  - - removed_features
+    - Removed Features (previously deprecated)
+  - - security_fixes
+    - Security Fixes
+  - - bugfixes
+    - Bugfixes
+  - - known_issues
+    - Known Issues
 title: amazon.aws
 trivial_section_name: trivial

changelogs/fragments/1631-route53_health_check-added-calculcated.yml

@@ -1,5 +1,5 @@
 ---
 minor_changes:
-  - route53_health_check - add support for another ``type`` choice called ``CALCULATED`` (https://github.com/ansible-collections/amazon.aws/pull/1631). 
+  - route53_health_check - add support for another ``type`` choice called ``CALCULATED`` (https://github.com/ansible-collections/amazon.aws/pull/1631).
   - route53_health_check - add support for a string list parameter called ``child_health_checks`` to specify health checks that must be healthy for the calculated health check (https://github.com/ansible-collections/amazon.aws/pull/1631).
-  - route53_health_check - add support for an integer parameter called ``health_threshold`` to specify the minimum number of healthy child health checks that must be healthy for the calculated health check (https://github.com/ansible-collections/amazon.aws/pull/1631).
+  - route53_health_check - add support for an integer parameter called ``health_threshold`` to specify the minimum number of healthy child health checks that must be healthy for the calculated health check (https://github.com/ansible-collections/amazon.aws/pull/1631).

changelogs/fragments/1647-add-type-started-and-stopped.yml

@@ -1,4 +1,4 @@
 ---
 minor_changes:
   - rds_cluster - add support for another ``state`` choice called ``started``. This starts the rds cluster (https://github.com/ansible-collections/amazon.aws/pull/1647/files).
-  - rds_cluster - add support for another ``state`` choice called ``stopped``. This stops the rds cluster (https://github.com/ansible-collections/amazon.aws/pull/1647/files).
+  - rds_cluster - add support for another ``state`` choice called ``stopped``. This stops the rds cluster (https://github.com/ansible-collections/amazon.aws/pull/1647/files).

changelogs/fragments/1705-rds_cluster-add-support-remove-cluster-from-global-db.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+- rds_cluster - Add support for removing cluster from global db (https://github.com/ansible-collections/amazon.aws/pull/1705).

changelogs/fragments/1767-elb_application_lb_info-Throttling.yml

@@ -0,0 +1,4 @@
+bugfixes:
+- elb_application_lb_info - ensure all API queries use the retry decorator (https://github.com/ansible-collections/amazon.aws/issues/1767).
+minor_changes:
+- elb_application_lb_info - drop redundant ``describe_load_balancers`` call fetching ``ip_address_type`` (https://github.com/ansible-collections/amazon.aws/pull/1768).

changelogs/fragments/1771-isort.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- amazon.aws collection - apply isort code formatting to ensure consistent formatting of code (https://github.com/ansible-collections/amazon.aws/pull/1771).

changelogs/fragments/1778-elb_application_lb_info-fetch-subsets.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - "elb_application_lb_info - add new parameters ``include_attributes``, ``include_listeners`` and  ``include_listener_rules`` to optionally speed up module by fetching less information (https://github.com/ansible-collections/amazon.aws/pull/1778)."

changelogs/fragments/20230906-galaxy.yml

@@ -0,0 +1,2 @@
+trivial:
+- galaxy.yml - add description to collection.

changelogs/fragments/20230908-alias-cleanup.yml

@@ -0,0 +1,2 @@
+trivial:
+- Update integration tests to reflect renamed plugins

changelogs/fragments/20230911-ec2_ami-release.yml

@@ -0,0 +1,2 @@
+trivial:
+- ec2_ami - fix version_added for org owners.

changelogs/fragments/botocore.yml

@@ -0,0 +1,6 @@
+breaking_changes:
+- The amazon.aws collection has dropped support for ``botocore<1.29.0`` and
+  ``boto3<1.26.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/1763).

changelogs/fragments/migrate_aws_region_info.yml

@@ -0,0 +1,5 @@
+---
+major_changes:
+  - aws_region_info - The module has been migrated from the ``community.aws`` collection.
+    Playbooks using the Fully Qualified Collection Name for this module should be
+    updated to use ``amazon.aws.aws_region_info``.

changelogs/fragments/migrate_iam_access_key.yml

@@ -0,0 +1,7 @@
+major_changes:
+- iam_access_key - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.iam_access_key``.
+- iam_access_key_info - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.iam_access_key_info``.

changelogs/fragments/migrate_iam_group.yml

@@ -0,0 +1,4 @@
+major_changes:
+- iam_group - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.iam_group`` (https://github.com/ansible-collections/amazon.aws/pull/1755).

changelogs/fragments/migrate_iam_managed_policy.yml

@@ -0,0 +1,4 @@
+major_changes:
+- iam_managed_policy - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.iam_managed_policy`` (https://github.com/ansible-collections/amazon.aws/pull/1762).

changelogs/fragments/migrate_iam_mfa_device_info.yml

@@ -0,0 +1,4 @@
+major_changes:
+- iam_mfa_device_info - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.iam_mfa_device_info`` (https://github.com/ansible-collections/amazon.aws/pull/1761).

changelogs/fragments/migrate_iam_password_policy.yml

@@ -0,0 +1,4 @@
+major_changes:
+- iam_password_policy - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.iam_password_policy``.

changelogs/fragments/migrate_iam_role.yml

@@ -0,0 +1,7 @@
+major_changes:
+- iam_role - The module has been migrated from the ``community.aws`` collection. Playbooks
+  using the Fully Qualified Collection Name for this module should be updated to use
+  ``amazon.aws.iam_role`` (https://github.com/ansible-collections/amazon.aws/pull/1760).
+- iam_role_info - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.iam_role_info`` (https://github.com/ansible-collections/amazon.aws/pull/1760).

changelogs/fragments/migrate_s3_bucket_info.yml

@@ -0,0 +1,8 @@
+---
+major_changes:
+  - aws_s3_bucket_info - The module has been migrated from the ``community.aws`` collection.
+    Playbooks using the Fully Qualified Collection Name for this module should be
+    updated to use ``amazon.aws.aws_s3_bucket_info``.
+  - s3_bucket_info - The module has been migrated from the ``community.aws`` collection.
+    Playbooks using the Fully Qualified Collection Name for this module should be
+    updated to use ``amazon.aws.s3_bucket_info``.

changelogs/fragments/migrate_sts_assume_role.yml

@@ -0,0 +1,4 @@
+major_changes:
+- sts_assume_role - The module has been migrated from the ``community.aws`` collection.
+  Playbooks using the Fully Qualified Collection Name for this module should be updated
+  to use ``amazon.aws.sts_assume_role``.

changelogs/fragments/python37.yml

@@ -0,0 +1,10 @@
+breaking_changes:
+- amazon.aws collection - due to the AWS SDKs announcing the end of support
+  for Python less than 3.7 (https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/)
+  support for Python less than 3.7 by this collection wss been deprecated in release 6.0.0 and removed in release 7.0.0.
+  (https://github.com/ansible-collections/amazon.aws/pull/1763).
+
+# We've already announced the deprecation for <3.8 (with 6.0.0), dropping support for <3.9 on ours side will happen
+# after April 2026.  This is about 2 years + 5 months away assuming a November 7.0.0 release, we could announce
+# the deprecation now, but assuming we release 8.0.0 in about 6 months a just short of 2 year
+# deprecation feels fine given it's predictable.

galaxy.yml

@@ -1,10 +1,11 @@
+---
 namespace: amazon
 name: aws
 version: 7.0.0-dev0
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)
-description: null
+description: A variety of Ansible content to help automate the management of AWS services.
 license_file: COPYING
 tags: [amazon, aws, cloud]
 repository: https://github.com/ansible-collections/amazon.aws