[1.9.0] zos_apf remove try expect pass to better exception handling (#…

…1036)

* Removed except pass

* Added empty strings

* Added changelog

* Corrected changelog

* Modified if statement to honor current behavior

* Update 1036-apf-try-except.yml

* Update 1036-apf-try-except.yml

changelogs/fragments/1036-apf-try-except.yml

@@ -0,0 +1,4 @@
+minor_changes:
+  - zos_apf - Improves exception handling if there is a failure
+    parsing the command response when operation selected is list.
+    (https://github.com/ansible-collections/ibm_zos_core/pull/1036).

plugins/modules/zos_apf.py

@@ -520,29 +520,27 @@ def main():
     operRc = ret.rc
     result['stderr'] = operErr
     result['rc'] = operRc
+    result['stdout'] = operOut
     if operation == 'list':
-        try:
-            dsRx = ""
-            volRx = ""
-            if library:
-                dsRx = re.compile(library)
-            if volume:
-                volRx = re.compile(volume)
-            if sms:
-                sms = "*SMS*"
-            if dsRx or volRx or sms:
+        if not library:
+            library = ""
+        if not volume:
+            volume = ""
+        if sms:
+            sms = "*SMS*"
+        if library or volume or sms:
+            try:
                 data = json.loads(operOut)
-                operOut = ""
-                for d in data[2:]:
-                    ds = d.get('ds')
-                    vol = d.get('vol')
-                    if (dsRx and dsRx.match(ds)) or (volRx and volRx.match(vol)) or (sms and sms == vol):
-                        operOut = operOut + "{0} {1}\n".format(vol, ds)
-        except Exception:
-            pass
-
-    result['stdout'] = operOut
-
+            except json.JSONDecodeError:
+                module.exit_json(**result)
+            for d in data[2:]:
+                ds = d.get('ds')
+                vol = d.get('vol')
+                try:
+                    if (library and re.match(library, ds)) or (volume and re.match(volume, vol)) or (sms and sms == vol):
+                        result['stdout'] = "{0} {1}\n".format(vol, ds)
+                except re.error:
+                    module.exit_json(**result)
     module.exit_json(**result)