fix for multi-item purge (fix #111)

ansibleguy · Nov 22, 2024 · b10f62b · b10f62b
1 parent 9cbbb70
commit b10f62b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/plugins/module_utils/base/base.py b/plugins/module_utils/base/base.py
@@ -364,7 +364,7 @@ def _change_enabled_state(self) -> dict:
             'params': [getattr(self.i, self.i.EXIST_ATTR)[self.field_pk]],
         })
 
-    def _is_enabled(self, invert: bool) -> bool:
+    def is_enabled(self, invert: bool = False) -> bool:
         is_enabled = getattr(self.i, self.i.EXIST_ATTR)['enabled']
 
         if invert:
@@ -373,7 +373,7 @@ def _is_enabled(self, invert: bool) -> bool:
         return is_enabled
 
     def enable(self, invert: bool = False) -> dict:
-        if self.i.exists and not self._is_enabled(invert=invert):
+        if self.i.exists and not self.is_enabled(invert=invert):
             self.i.r['changed'] = True
             if not invert:
                 self.i.r['diff']['before'] = {'enabled': False}
@@ -387,7 +387,7 @@ def enable(self, invert: bool = False) -> dict:
                 return self._change_enabled_state()
 
     def disable(self, invert: bool = False) -> dict:
-        if self.i.exists and self._is_enabled(invert=invert):
+        if self.i.exists and self.is_enabled(invert=invert):
             self.i.r['changed'] = True
             if not invert:
                 self.i.r['diff']['before'] = {'enabled': True}

diff --git a/plugins/module_utils/helper/purge.py b/plugins/module_utils/helper/purge.py
@@ -11,10 +11,6 @@ def purge(
         result['diff']['before'][item_to_purge[diff_param]] = item_to_purge
         result['diff']['after'][item_to_purge[diff_param]] = None
 
-    else:
-        result['diff']['before'][item_to_purge[diff_param]] = {'enabled': True}
-        result['diff']['after'][item_to_purge[diff_param]] = {'enabled': False}
-
     if not module.check_mode:
         _obj = obj_func(item_to_purge)
         _obj.exists = True
@@ -23,7 +19,10 @@ def purge(
             _obj.delete()
 
         else:
-            _obj.b.disable()
+            if _obj.b.is_enabled():
+                result['diff']['before'][item_to_purge[diff_param]] = {'enabled': True}
+                result['diff']['after'][item_to_purge[diff_param]] = {'enabled': False}
+                _obj.b.disable()
 
 
 def check_purge_filter(module: AnsibleModule, item: dict) -> bool:

diff --git a/tests/alias_purge.yml b/tests/alias_purge.yml
@@ -43,9 +43,6 @@
           ANSIBLE_TEST_4_2:
         action: 'disable'
       register: opn11
-      failed_when: >
-        opn11.failed or
-        opn11.changed
       when: not ansible_check_mode
 
     - name: Simple purge