Skip to content

Commit

Permalink
s3-lifecycle: fix remove rule with empty prefix
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
clwluvw committed Aug 8, 2022
1 parent 68d2f1f commit c306c9c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 3 deletions.
6 changes: 3 additions & 3 deletions plugins/modules/s3_lifecycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
25 changes: 25 additions & 0 deletions tests/integration/targets/s3_lifecycle/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c306c9c

Please sign in to comment.