Merging upstream version 9.5.1+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 41 insertions, 20 deletions

diff --git a/ansible_collections/amazon/aws/FILES.json b/ansible_collections/amazon/aws/FILES.json
index 1f9947ab7..61352c6b6 100644
--- a/ansible_collections/amazon/aws/FILES.json
+++ b/ansible_collections/amazon/aws/FILES.json
@@ -123,7 +123,7 @@
    "name": ".github/workflows/docs-pr.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "befbd2d31f5509f704e57c06b07c42fa7867dd353ab3d24856eb865cf8d44b00",
+   "chksum_sha256": "12f439dd44738a38b1468b670158eaf719539b91f0570d2b9a2f0565ef1de659",
    "format": 1
   },
   {
@@ -221,7 +221,7 @@
    "name": "changelogs/changelog.yaml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "8484f733ac3da28af9d97a0f85ecc2f3d601009ed6d55d02f8a3cac6dc32eea9",
+   "chksum_sha256": "fab623a9b576e9d450f5285c5ad77eed36f30882a396eeba97046f4b8fdbf3cd",
    "format": 1
   },
   {
@@ -256,7 +256,7 @@
    "name": "docs/docsite/rst/CHANGELOG.rst",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "b3a5af02bc807a9248c3820f9f07c6ce0fbf5f75f22613ae3e79a795d34165fc",
+   "chksum_sha256": "f60899f9e09f217d9c8963676ddad7d070ce9233e0f32c02b96ad1839ec3cd9f",
    "format": 1
   },
   {
@@ -543,7 +543,7 @@
    "name": "plugins/module_utils/common.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "c2056cf9ef583ee29ac1165aa03e5cf165830ed6d1703c275c4c9d154222f3c3",
+   "chksum_sha256": "cef7b396d560a646961755d2a54c7131e553dfe26fbb26e04be073cce5bb0095",
    "format": 1
   },
   {
@@ -599,7 +599,7 @@
    "name": "plugins/module_utils/iam.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "8aaa38e784250525c884b936370b2db5ff61b84fcd62a30c239a5e3dc8e20ca3",
+   "chksum_sha256": "1cd5d5532049e4afd2858a35480cd173f72c4ed9174c67bb26186e47fe183ba5",
    "format": 1
   },
   {
@@ -662,7 +662,7 @@
    "name": "plugins/module_utils/transformation.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "77e7b561643de0ed96b958af3ec6694edae360c8fb4e51ffa4144dace02063fe",
+   "chksum_sha256": "882308fe4ef2b74fcb41dd09b0e6575d47e2f3d6a3f2164d8dc1706cec213f0c",
    "format": 1
   },
   {
@@ -851,7 +851,7 @@
    "name": "plugins/modules/cloudwatchlogs_log_group_info.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "00a40c6593d6cc582205943f247a33d7621e4ffa49410c9476e6fefc4e800ccd",
+   "chksum_sha256": "03d947455d91f77a833dd705fc05d2882a62786e1e09968f7cc8b668964d56f6",
    "format": 1
   },
   {
@@ -1243,7 +1243,7 @@
    "name": "plugins/modules/iam_user_info.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "92d2d3f21e43a53f4e25ed497c76d2935ed533b8bdbf9aa5af41a4a8c27e2cb7",
+   "chksum_sha256": "11b3a159e2c6542b861c94c5d5f1eae8375f1e0e4ecef7ad413932254f6a3157",
    "format": 1
   },
   {
@@ -1446,7 +1446,7 @@
    "name": "plugins/modules/s3_object.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "36bf675910b9b5a9a932fc90c1ceb4f2c54d90a191bf9c2cb8a47cd5ebea032f",
+   "chksum_sha256": "47610c1c778b26def1d5c3aef8c5f6d2089537445ae420d1da5f1afb4a0b8600",
    "format": 1
   },
   {
@@ -1495,7 +1495,7 @@
    "name": "plugins/plugin_utils/inventory.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "1c652b1e2733fe92f7d95ea6f76bed638fbed402e7ffe15753e896328869f4b3",
+   "chksum_sha256": "2bbe05440920c867bd4b8935a0a97963211b74149ca6c83d9990f9b6a5e4e6ae",
    "format": 1
   },
   {
@@ -2531,7 +2531,7 @@
    "name": "tests/integration/targets/ec2_ami/tasks/main.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "9433c585f807cca76bb83c1cbe0a5d0a85966ead2ca30dde4cefd71be3cf155f",
+   "chksum_sha256": "919ee94ad149f90556ea20402e2393253157946b2d0e32a71957a4f58cfa6018",
    "format": 1
   },
   {
@@ -4302,7 +4302,7 @@
    "name": "tests/integration/targets/ec2_security_group/tasks/multi_nested_target.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "be781072f2d349ec5c93cbb05e40ef71846d2f4b5884ad297a736d3b0c72e542",
+   "chksum_sha256": "79aa1549464410bff8ff9f0272780d8b408a370d088100617656975024b6fef2",
    "format": 1
   },
   {
@@ -6115,7 +6115,7 @@
    "name": "tests/integration/targets/inventory_aws_ec2/playbooks/create_inventory_config.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "c031a3d0f6a2c17914bedc3a7b37c475cbd55420cb7ae7fe4c6f24855bb5565d",
+   "chksum_sha256": "44bab5285a394bde857e65e324b15039d248a20c9a05b5eec45eac2ce312550e",
    "format": 1
   },
   {
@@ -6259,6 +6259,13 @@
    "format": 1
   },
   {
+   "name": "tests/integration/targets/inventory_aws_ec2/templates/config.ini.j2",
+   "ftype": "file",
+   "chksum_type": "sha256",
+   "chksum_sha256": "777e02f32a471e59d05fc66ef26716aaaa368085f991f179866d8f38a7d44aae",
+   "format": 1
+  },
+  {
    "name": "tests/integration/targets/inventory_aws_ec2/templates/inventory.yml.j2",
    "ftype": "file",
    "chksum_type": "sha256",
@@ -6332,7 +6339,7 @@
    "name": "tests/integration/targets/inventory_aws_ec2/templates/inventory_with_template.yml.j2",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "156031d22e1ae780ea2012e96afd68679bd27ee0cfe4bec4b03bf556f5477375",
+   "chksum_sha256": "a15b10d8b1dc85d869d6df0054d44d95b68d53d5cda6c9372dc86d72e260a00d",
    "format": 1
   },
   {
@@ -9447,7 +9454,7 @@
    "name": "tests/integration/targets/s3_object/tasks/copy_object.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "9b412470d4ef414efef1f407f84c72f1685f77c6ef2551517cdfa4cd6ab1515d",
+   "chksum_sha256": "a935fc78dc9973eac71decd7308d4e827c27a7f30b29c7c416f9f676163b4ec7",
    "format": 1
   },
   {
@@ -9475,7 +9482,7 @@
    "name": "tests/integration/targets/s3_object/tasks/main.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "c7568cf168c02a65bef0d921cea02304fd568fa6cd93175395bed359e6a14cf7",
+   "chksum_sha256": "697d66379fe4c4b33f82b1f7ac363f1e25331480201701b23d28494165346043",
    "format": 1
   },
   {
@@ -9503,7 +9510,7 @@
    "name": "tests/integration/targets/s3_object/aliases",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "da6542f9ffbf6dfd96214cc7e7c08e8bd4662a5479a21ad1b3f79ad2b163c9ad",
+   "chksum_sha256": "e217807ba499d974106cc2132230a411f7564e6c337b0a731a6301c5a1d69619",
    "format": 1
   },
   {
@@ -10284,6 +10291,13 @@
    "format": 1
   },
   {
+   "name": "tests/unit/module_utils/iam/test_iam_resource_transforms.py",
+   "ftype": "file",
+   "chksum_type": "sha256",
+   "chksum_sha256": "9ba95e45f5d2c2502a8ae6ea6dacc35e340f931a4d4d7fde2064ba0f89018ed0",
+   "format": 1
+  },
+  {
    "name": "tests/unit/module_utils/iam/test_validate_iam_identifiers.py",
    "ftype": "file",
    "chksum_type": "sha256",
@@ -10452,6 +10466,13 @@
    "format": 1
   },
   {
+   "name": "tests/unit/module_utils/transformation/test_boto3_resource_to_ansible_dict.py",
+   "ftype": "file",
+   "chksum_type": "sha256",
+   "chksum_sha256": "8b27e0ccb712e9bf43897b4226b99318c42e27f344f660326d13699bf1b45c45",
+   "format": 1
+  },
+  {
    "name": "tests/unit/module_utils/transformation/test_map_complex_type.py",
    "ftype": "file",
    "chksum_type": "sha256",
@@ -10630,7 +10651,7 @@
    "name": "tests/unit/plugin_utils/inventory/test_inventory_base.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "4668d08e6f30a2aae02c0b27174dc759f4ec554d7207bcf33f879e9dee67720e",
+   "chksum_sha256": "ebae64f9db5ec8444c35b5d41127f1a5191ed10cd34acb6c89d0e5de2879b33d",
    "format": 1
   },
   {
@@ -10693,7 +10714,7 @@
    "name": "tests/unit/plugins/inventory/test_aws_ec2.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "cbb0ce6de6b22c4d62588d230353de215a4ccb273838b4870c17da8548ad3f16",
+   "chksum_sha256": "8556d8258e0d0aaeadd02898d1198152c478fa23677ff51990a0e1420f99e482",
    "format": 1
   },
   {
@@ -11659,7 +11680,7 @@
    "name": "CHANGELOG.rst",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "b3a5af02bc807a9248c3820f9f07c6ce0fbf5f75f22613ae3e79a795d34165fc",
+   "chksum_sha256": "f60899f9e09f217d9c8963676ddad7d070ce9233e0f32c02b96ad1839ec3cd9f",
    "format": 1
   },
   {