Prepare 4.5.0 release (#1522)

Prepare 4.5.0 release SUMMARY One last release for the road ISSUE TYPE Docs Pull Request COMPONENT NAME CHANGELOG.rst galaxy.yml ADDITIONAL INFORMATION Reviewed-by: Alina Buzachis
ansible-collections · May 5, 2023 · a805e8e · a805e8e
1 parent 97e7416
commit a805e8e
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,25 @@ amazon.aws Release Notes
 .. contents:: Topics
 
 
+v4.5.0
+======
+
+Release Summary
+---------------
+
+This release contains a minor bugfix for the ``ec2_vol`` module, some minor work on the ``ec2_key`` module, and various documentation fixes.  This is the last planned release of the 4.x series.
+
+
+Minor Changes
+-------------
+
+- ec2_key - minor refactoring and improved unit-tests coverage (https://github.com/ansible-collections/amazon.aws/pull/1288).
+
+Bugfixes
+--------
+
+- ec2_vol - handle ec2_vol.tags when the associated instance already exists (https://github.com/ansible-collections/amazon.aws/pull/1071).
+
 v4.4.0
 ======
 

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -1057,3 +1057,22 @@ releases:
     - 20230106-ec2_vol.yml
     - release_summary.yml
     release_date: '2023-01-09'
+  4.5.0:
+    changes:
+      bugfixes:
+      - ec2_vol - handle ec2_vol.tags when the associated instance already exists
+        (https://github.com/ansible-collections/amazon.aws/pull/1071).
+      minor_changes:
+      - ec2_key - minor refactoring and improved unit-tests coverage (https://github.com/ansible-collections/amazon.aws/pull/1288).
+      release_summary: 'This release contains a minor bugfix for the ``ec2_vol`` module,
+        some minor work on the ``ec2_key`` module, and various documentation fixes.  This
+        is the last planned release of the 4.x series.
+
+        '
+    fragments:
+    - 1071-ec2_vol_tags_idempotent.yaml
+    - 1357-subnet-example.yml
+    - 1395-s3-encryption.yml
+    - release-notes.yml
+    - unit-tests_test_ec2_key_only.yaml
+    release_date: '2023-05-05'
diff --git a/changelogs/fragments/1071-ec2_vol_tags_idempotent.yaml b/changelogs/fragments/1071-ec2_vol_tags_idempotent.yaml
diff --git a/changelogs/fragments/1357-subnet-example.yml b/changelogs/fragments/1357-subnet-example.yml
diff --git a/changelogs/fragments/1395-s3-encryption.yml b/changelogs/fragments/1395-s3-encryption.yml
diff --git a/changelogs/fragments/unit-tests_test_ec2_key_only.yaml b/changelogs/fragments/unit-tests_test_ec2_key_only.yaml
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: amazon
 name: aws
-version: 4.4.0
+version: 4.5.0
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

diff --git a/tests/unit/plugins/modules/test_ec2_key.py b/tests/unit/plugins/modules/test_ec2_key.py
@@ -220,10 +220,14 @@ def test__create_key_pair():
     expected_params = {'KeyName': name}
 
     ec2_client.create_key_pair.return_value = {
-        'KeyFingerprint': 'd7:ff:a6:63:18:64:9c:57:a1:ee:ca:a4:ad:c2:81:62',
-        'KeyMaterial': '-----BEGIN RSA PRIVATE KEY-----\nMIIEXm7/Bi9wba2m0Qtclu\nCXQw2paSIZb\n-----END RSA PRIVATE KEY-----',
-        'KeyName': 'my_keypair',
-        'KeyPairId': 'key-012345678905a208d'
+        "KeyFingerprint": "d7:ff:a6:63:18:64:9c:57:a1:ee:ca:a4:ad:c2:81:62",
+        "KeyMaterial": (
+            "-----BEGIN RSA PRIVATE KEY-----\n"  # gitleaks:allow
+            "MIIEXm7/Bi9wba2m0Qtclu\nCXQw2paSIZb\n"
+            "-----END RSA PRIVATE KEY-----"
+        ),
+        "KeyName": "my_keypair",
+        "KeyPairId": "key-012345678905a208d",
     }
 
     result = ec2_key._create_key_pair(ec2_client, name, tag_spec, key_type)