Merge pull request #161 from opsmill/develop

Pre-release

Author: BeArchiTek

plugins/action/artifact_fetch.py

@@ -88,6 +88,13 @@ def run(self, tmp: Any | None = None, task_vars: Any | None = None) -> dict:
             Display().v("Fetch Artifacts")
             result = client.fetch_single_artifact(filters=filters)
 
+            # Better error handling
+            if not result:
+                return {
+                    "failed": True,
+                    "msg": f"Unable to find '{artifact_name}' for '{target_id}'.",
+                }
+
         except Exception as exp:
             raise_from(AnsibleError(str(exp)), exp)
 

plugins/action/query_graphql.py

@@ -90,8 +90,9 @@ def run(self, tmp: Any | None = None, task_vars: Any | None = None) -> dict:
                 branch=branch,
                 timeout=timeout,
                 validate_certs=validate_certs,
+                display=Display(),
             )
-            processor = InfrahubQueryProcessor(client=client)
+            processor = InfrahubQueryProcessor(client=client, display=Display())
             Display().v("Processing Query")
             response = processor.fetch_and_process(query=graphql_query, variables=graph_variables)
             results["data"] = response

plugins/lookup/lookup.py

@@ -98,6 +98,7 @@
 from ansible.errors import AnsibleError, AnsibleLookupError
 from ansible.module_utils.six import raise_from
 from ansible.plugins.lookup import LookupBase
+from ansible.utils.display import Display
 from ansible_collections.opsmill.infrahub.plugins.module_utils.infrahub_utils import (
     HAS_INFRAHUBCLIENT,
     InfrahubclientWrapper,
@@ -160,17 +161,17 @@ def run(
 
         results = {}
         try:
-            self.display().v("Initializing Infrahub Client")
+            Display().v("Initializing Infrahub Client")
             client = InfrahubclientWrapper(
                 api_endpoint=api_endpoint,
                 token=token,
                 branch=branch,
                 timeout=timeout,
                 validate_certs=validate_certs,
-                display=self.display,
+                display=Display(),
             )
-            processor = InfrahubQueryProcessor(client=client, display=self.display)
-            self.display().v("Processing Query")
+            processor = InfrahubQueryProcessor(client=client, display=Display())
+            Display().v("Processing Query")
             results = processor.fetch_and_process(query=graphql_query, variables=graph_variables)
 
         except Exception as exc: