From f0b284929faf91a1802e2c7ce743606e5784ab20 Mon Sep 17 00:00:00 2001
From: Seena Fallah <seenafallah@gmail.com>
Date: Mon, 8 Aug 2022 11:11:30 +0200
Subject: [PATCH 1/2] s3-lifecycle: fix remove rule with empty prefix

In case of removing a lifecycle policy without a prefix, there will be no prefix key in the existing_rule filter

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
---
 plugins/modules/s3_lifecycle.py               |  6 ++---
 .../targets/s3_lifecycle/tasks/main.yml       | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py
index a9a5f5dbf65..9a2ea51e92f 100644
--- a/plugins/modules/s3_lifecycle.py
+++ b/plugins/modules/s3_lifecycle.py
@@ -345,9 +345,9 @@ def compare_and_update_configuration(client, module, current_lifecycle_rules, ru
     if current_lifecycle_rules:
         # If rule ID exists, use that for comparison otherwise compare based on prefix
         for existing_rule in current_lifecycle_rules:
-            if rule.get('ID') == existing_rule.get('ID') and rule['Filter']['Prefix'] != existing_rule.get('Filter', {}).get('Prefix', ''):
+            if rule.get('ID') == existing_rule.get('ID') and rule['Filter'].get('Prefix', '') != existing_rule.get('Filter', {}).get('Prefix', ''):
                 existing_rule.pop('ID')
-            elif rule_id is None and rule['Filter']['Prefix'] == existing_rule.get('Filter', {}).get('Prefix', ''):
+            elif rule_id is None and rule['Filter'].get('Prefix', '') == existing_rule.get('Filter', {}).get('Prefix', ''):
                 existing_rule.pop('ID')
             if rule.get('ID') == existing_rule.get('ID'):
                 changed_, appended_ = update_or_append_rule(rule, existing_rule, purge_transitions, lifecycle_configuration)
@@ -407,7 +407,7 @@ def compare_and_remove_rule(current_lifecycle_rules, rule_id=None, prefix=None):
                 lifecycle_configuration['Rules'].append(existing_rule)
     else:
         for existing_rule in current_lifecycle_rules:
-            if prefix == existing_rule['Filter']['Prefix']:
+            if prefix == existing_rule['Filter'].get('Prefix', ''):
                 # We're not keeping the rule (i.e. deleting) so mark as changed
                 changed = True
             else:
diff --git a/tests/integration/targets/s3_lifecycle/tasks/main.yml b/tests/integration/targets/s3_lifecycle/tasks/main.yml
index 4acc5c941f7..5caf18135ac 100644
--- a/tests/integration/targets/s3_lifecycle/tasks/main.yml
+++ b/tests/integration/targets/s3_lifecycle/tasks/main.yml
@@ -622,6 +622,31 @@
         that:
           - output is not changed
 
+    # Check create and delete lifecycle policy with an empty prefix
+    - name: example 8
+      s3_lifecycle:
+        name: "{{ bucket_name }}"
+        rule_id: empty-prefix
+        state: present
+        status: enabled
+        expiration_days: 30
+      register: output
+    - assert:
+        that:
+          - output is changed
+
+    - name: example 8 (idempotency)
+      s3_lifecycle:
+        name: "{{ bucket_name }}"
+        rule_id: empty-prefix
+        state: absent
+        status: enabled
+        expiration_days: 30
+      register: output
+    - assert:
+        that:
+          - output is changed
+
  # ============================================================
   always:
     - name: Ensure all buckets are deleted

From 615f9afef40fd40faa6a636e8059e6b6e63f5106 Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Mon, 8 Aug 2022 13:32:30 +0200
Subject: [PATCH 2/2] Add changelog and tweak test task names

---
 changelogs/fragments/1398-s3_lifecycle-no-prefix.yml  | 2 ++
 tests/integration/targets/s3_lifecycle/tasks/main.yml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/fragments/1398-s3_lifecycle-no-prefix.yml

diff --git a/changelogs/fragments/1398-s3_lifecycle-no-prefix.yml b/changelogs/fragments/1398-s3_lifecycle-no-prefix.yml
new file mode 100644
index 00000000000..8377e204b86
--- /dev/null
+++ b/changelogs/fragments/1398-s3_lifecycle-no-prefix.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- s3_lifecycle - fix bug when deleting rules with an empty prefix (https://github.com/ansible-collections/community.aws/pull/1398).
diff --git a/tests/integration/targets/s3_lifecycle/tasks/main.yml b/tests/integration/targets/s3_lifecycle/tasks/main.yml
index 5caf18135ac..4f0fd527860 100644
--- a/tests/integration/targets/s3_lifecycle/tasks/main.yml
+++ b/tests/integration/targets/s3_lifecycle/tasks/main.yml
@@ -623,7 +623,7 @@
           - output is not changed
 
     # Check create and delete lifecycle policy with an empty prefix
-    - name: example 8
+    - name: Create rule with no prefix
       s3_lifecycle:
         name: "{{ bucket_name }}"
         rule_id: empty-prefix
@@ -635,7 +635,7 @@
         that:
           - output is changed
 
-    - name: example 8 (idempotency)
+    - name: Delete rule with no prefix
       s3_lifecycle:
         name: "{{ bucket_name }}"
         rule_id: empty-prefix