fix delete records without TTL (ansible-collections#801)

fix delete records without TTL SUMMARY Closes ansible-collections#800 ISSUE TYPE Bugfix Pull Request COMPONENT NAME route53 Reviewed-by: Mark Chappell <None> Reviewed-by: Felix Fontein <None> Reviewed-by: Tiger Kaovilai <[email protected]> Reviewed-by: Markus Bergholz <[email protected]> Reviewed-by: None <None> This commit was initially merged in https://github.com/ansible-collections/community.aws See: ansible-collections/community.aws@472776e
alinabuzachis · Sep 21, 2022 · ffd0336 · ffd0336
1 parent 5dc5e30
commit ffd0336
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/plugins/modules/route53.py b/plugins/modules/route53.py
@@ -69,7 +69,6 @@
   value:
     description:
       - The new value when creating a DNS record.  YAML lists or multiple comma-spaced values are allowed for non-alias records.
-      - When deleting a record all values for the record must be specified or Route 53 will not delete it.
     type: list
     elements: str
   overwrite:
@@ -513,8 +512,6 @@ def main():
         required_if=(
             ('state', 'present', ['value']),
             ('state', 'create', ['value']),
-            ('state', 'absent', ['value']),
-            ('state', 'delete', ['value']),
         ),
         # failover, region and weight are mutually exclusive
         mutually_exclusive=[
@@ -607,6 +604,10 @@ def main():
         'HealthCheckId': health_check_in,
         'SetIdentifier': identifier_in,
     })
+    if command_in == 'delete' and aws_record is not None:
+        resource_record_set['TTL'] = aws_record.get('TTL')
+        if not resource_record_set['ResourceRecords']:
+            resource_record_set['ResourceRecords'] = aws_record.get('ResourceRecords')
 
     if alias_in:
         resource_record_set['AliasTarget'] = dict(

diff --git a/tests/integration/targets/route53/tasks/main.yml b/tests/integration/targets/route53/tasks/main.yml
@@ -388,6 +388,45 @@
         - wc_a_record is changed
         - wc_a_record.diff.after == {}
 
+  - name: create a record with different TTL
+    community.aws.route53:
+      state: present
+      zone: '{{ zone_one }}'
+      record: 'localhost.{{ zone_one }}'
+      type: A
+      value: 127.0.0.1
+      ttl: 30
+    register: ttl30
+  - name: check return values
+    assert:
+      that:
+        - ttl30.diff.resource_record_sets[0].ttl == 30
+        - ttl30 is changed
+
+  - name: delete previous record without mention ttl and value
+    community.aws.route53:
+      state: absent
+      zone: '{{ zone_one }}'
+      record: 'localhost.{{ zone_one }}'
+      type: A
+    register: ttl30
+  - name: check if record is deleted
+    assert:
+      that:
+        - ttl30 is changed
+
+  - name: immutable delete previous record without mention ttl and value
+    community.aws.route53:
+      state: absent
+      zone: '{{ zone_one }}'
+      record: 'localhost.{{ zone_one }}'
+      type: A
+    register: ttl30
+  - name: check if record was deleted
+    assert:
+      that:
+        - ttl30 is not changed
+
   # Tests on zone two (private zone)
   - name: Create A record using zone fqdn
     route53: