chore: apply new line-length

ansible · Oct 27, 2023 · cceb76d · cceb76d
1 parent bce1a7e
commit cceb76d
Show file tree

Hide file tree

Showing 54 changed files with 464 additions and 1,648 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 exclude: "^docs/"
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.12.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort

diff --git a/ansible_rulebook/action/debug.py b/ansible_rulebook/action/debug.py
@@ -52,11 +52,7 @@ async def __call__(self):
         elif "var" in self.action_args:
             key = self.action_args.get("var")
             try:
-                print(
-                    dpath.get(
-                        self.helper.control.variables, key, separator="."
-                    )
-                )
+                print(dpath.get(self.helper.control.variables, key, separator="."))
             except KeyError:
                 logger.error("Key %s not found in variable pool", key)
                 raise

diff --git a/ansible_rulebook/action/helper.py b/ansible_rulebook/action/helper.py
@@ -112,9 +112,7 @@ def get_events(self) -> Dict:
 
     def embellish_internal_event(self, event: Dict) -> Dict:
         """Insert metadata for every internally generated event"""
-        return insert_meta(
-            event, **{"source_name": self.action, "source_type": "internal"}
-        )
+        return insert_meta(event, **{"source_name": self.action, "source_type": "internal"})
 
     def set_action(self, action) -> None:
         self.action = action

diff --git a/ansible_rulebook/action/print_event.py b/ansible_rulebook/action/print_event.py
@@ -36,9 +36,7 @@ async def __call__(self):
         if "pretty" in self.action_args:
             print_fn = pprint
 
-        var_name = (
-            "events" if "events" in self.helper.control.variables else "event"
-        )
+        var_name = "events" if "events" in self.helper.control.variables else "event"
 
         print_fn(self.helper.control.variables[var_name])
         sys.stdout.flush()

diff --git a/ansible_rulebook/action/run_job_template.py b/ansible_rulebook/action/run_job_template.py
@@ -20,10 +20,7 @@
 from drools import ruleset as lang
 
 from ansible_rulebook.conf import settings
-from ansible_rulebook.exception import (
-    ControllerApiException,
-    JobTemplateNotFoundException,
-)
+from ansible_rulebook.exception import ControllerApiException, JobTemplateNotFoundException
 from ansible_rulebook.job_template_runner import job_template_runner
 from ansible_rulebook.util import run_at
 
@@ -61,9 +58,7 @@ async def __call__(self):
             self.helper.metadata.rule,
         )
 
-        self.job_args["extra_vars"] = self.helper.collect_extra_vars(
-            self.job_args.get("extra_vars", {})
-        )
+        self.job_args["extra_vars"] = self.helper.collect_extra_vars(self.job_args.get("extra_vars", {}))
         await self._job_start_event()
         await self._run()
 
@@ -119,9 +114,7 @@ async def _post_process(self) -> None:
         post_events = self.action_args.get("post_events", False)
 
         if set_facts or post_events:
-            ruleset = self.action_args.get(
-                "ruleset", self.helper.metadata.rule_set
-            )
+            ruleset = self.action_args.get("ruleset", self.helper.metadata.rule_set)
             logger.debug("set_facts")
             facts = self.controller_job.get("artifacts", {})
             if facts:

diff --git a/ansible_rulebook/action/run_playbook.py b/ansible_rulebook/action/run_playbook.py
@@ -24,11 +24,7 @@
 import yaml
 from drools import ruleset as lang
 
-from ansible_rulebook.collection import (
-    find_playbook,
-    has_playbook,
-    split_collection_name,
-)
+from ansible_rulebook.collection import find_playbook, has_playbook, split_collection_name
 from ansible_rulebook.conf import settings
 from ansible_rulebook.exception import (
     MissingArtifactKeyException,
@@ -68,10 +64,7 @@ def __init__(self, metadata: Metadata, control: Control, **action_args):
 
     async def __call__(self):
         try:
-            logger.info(
-                f"ruleset: {self.helper.metadata.rule_set}, "
-                f"rule: {self.helper.metadata.rule}"
-            )
+            logger.info(f"ruleset: {self.helper.metadata.rule_set}, " f"rule: {self.helper.metadata.rule}")
             logger.debug("private data dir %s", self.private_data_dir)
             await self._pre_process()
             await self._job_start_event()
@@ -106,9 +99,7 @@ async def _run(self):
             if i > 0:
                 if delay > 0:
                     await asyncio.sleep(delay)
-                logger.info(
-                    "Previous run_playbook failed. Retry %d of %d", i, retries
-                )
+                logger.info("Previous run_playbook failed. Retry %d of %d", i, retries)
 
             await Runner(
                 self.private_data_dir,
@@ -128,9 +119,7 @@ def _runner_args(self):
         return {"playbook": self.name, "inventory": self.inventory}
 
     async def _pre_process(self) -> None:
-        playbook_extra_vars = self.helper.collect_extra_vars(
-            self.action_args.get("extra_vars", {})
-        )
+        playbook_extra_vars = self.helper.collect_extra_vars(self.action_args.get("extra_vars", {}))
 
         env_dir = os.path.join(self.private_data_dir, "env")
         inventory_dir = os.path.join(self.private_data_dir, "inventory")
@@ -143,19 +132,13 @@ async def _pre_process(self) -> None:
 
         if self.helper.control.inventory:
             create_inventory(inventory_dir, self.helper.control.inventory)
-            self.inventory = os.path.join(
-                inventory_dir, os.path.basename(self.helper.control.inventory)
-            )
+            self.inventory = os.path.join(inventory_dir, os.path.basename(self.helper.control.inventory))
         os.mkdir(project_dir)
 
-        logger.debug(
-            "project_data_file: %s", self.helper.control.project_data_file
-        )
+        logger.debug("project_data_file: %s", self.helper.control.project_data_file)
         if self.helper.control.project_data_file:
             if os.path.exists(self.helper.control.project_data_file):
-                await self._untar_project(
-                    project_dir, self.helper.control.project_data_file
-                )
+                await self._untar_project(project_dir, self.helper.control.project_data_file)
                 return
         self._copy_playbook_files(project_dir)
 
@@ -177,10 +160,7 @@ def _copy_playbook_files(self, project_dir):
                     os.path.join(project_dir, self.name),
                 )
             else:
-                msg = (
-                    f"Could not find a playbook for {self.name} "
-                    f"from {os.getcwd()}"
-                )
+                msg = f"Could not find a playbook for {self.name} " f"from {os.getcwd()}"
                 logger.error(msg)
                 raise PlaybookNotFoundException(msg)
 
@@ -210,22 +190,17 @@ async def _post_process(self):
         if rc == 0 and (set_facts or post_events):
             logger.debug("set_facts")
             fact_folder = self._get_latest_artifact("fact_cache", False)
-            ruleset = self.action_args.get(
-                "ruleset", self.helper.metadata.rule_set
-            )
+            ruleset = self.action_args.get("ruleset", self.helper.metadata.rule_set)
             for host_facts in glob.glob(os.path.join(fact_folder, "*")):
                 with open(host_facts) as file_handle:
                     fact = json.loads(file_handle.read())
                 if self.output_key:
                     if self.output_key not in fact:
                         logger.error(
-                            "The artifacts from the ansible-runner "
-                            "does not have key %s",
+                            "The artifacts from the ansible-runner " "does not have key %s",
                             self.output_key,
                         )
-                        raise MissingArtifactKeyException(
-                            f"Missing key: {self.output_key} in artifacts"
-                        )
+                        raise MissingArtifactKeyException(f"Missing key: {self.output_key} in artifacts")
                     fact = fact[self.output_key]
                 fact = self.helper.embellish_internal_event(fact)
                 logger.debug("fact %s", fact)
@@ -235,9 +210,7 @@ async def _post_process(self):
                     lang.post(ruleset, fact)
 
     def _get_latest_artifact(self, component: str, content: bool = True):
-        files = glob.glob(
-            os.path.join(self.private_data_dir, "artifacts", "*", component)
-        )
+        files = glob.glob(os.path.join(self.private_data_dir, "artifacts", "*", component))
         files.sort(key=os.path.getmtime, reverse=True)
         if not files:
             raise PlaybookStatusNotFoundException(f"No {component} file found")

diff --git a/ansible_rulebook/action/run_workflow_template.py b/ansible_rulebook/action/run_workflow_template.py
@@ -20,10 +20,7 @@
 from drools import ruleset as lang
 
 from ansible_rulebook.conf import settings
-from ansible_rulebook.exception import (
-    ControllerApiException,
-    WorkflowJobTemplateNotFoundException,
-)
+from ansible_rulebook.exception import ControllerApiException, WorkflowJobTemplateNotFoundException
 from ansible_rulebook.job_template_runner import job_template_runner
 from ansible_rulebook.util import run_at
 
@@ -61,9 +58,7 @@ async def __call__(self):
             self.helper.metadata.rule,
         )
 
-        self.job_args["extra_vars"] = self.helper.collect_extra_vars(
-            self.job_args.get("extra_vars", {})
-        )
+        self.job_args["extra_vars"] = self.helper.collect_extra_vars(self.job_args.get("extra_vars", {}))
         await self._job_start_event()
         await self._run()
 
@@ -79,17 +74,14 @@ async def _run(self):
                     if delay > 0:
                         await asyncio.sleep(delay)
                     logger.info(
-                        "Previous run_workflow_template failed. "
-                        "Retry %d of %d",
+                        "Previous run_workflow_template failed. " "Retry %d of %d",
                         i,
                         retries,
                     )
-                controller_job = (
-                    await job_template_runner.run_workflow_job_template(
-                        self.name,
-                        self.organization,
-                        self.job_args,
-                    )
+                controller_job = await job_template_runner.run_workflow_job_template(
+                    self.name,
+                    self.organization,
+                    self.job_args,
                 )
                 if controller_job["status"] != "failed":
                     break
@@ -125,9 +117,7 @@ async def _post_process(self) -> None:
         post_events = self.action_args.get("post_events", False)
 
         if set_facts or post_events:
-            ruleset = self.action_args.get(
-                "ruleset", self.helper.metadata.rule_set
-            )
+            ruleset = self.action_args.get("ruleset", self.helper.metadata.rule_set)
             logger.debug("set_facts")
             facts = self.controller_job.get("artifacts", {})
             if facts:

diff --git a/ansible_rulebook/action/runner.py b/ansible_rulebook/action/runner.py
@@ -102,9 +102,7 @@ def cancel_callback():
                     ),
                 )
             except CancelledError:
-                logger.debug(
-                    "Ansible Runner Thread Pool executor task cancelled"
-                )
+                logger.debug("Ansible Runner Thread Pool executor task cancelled")
                 shutdown = True
                 raise
             finally:

diff --git a/ansible_rulebook/action/shutdown.py b/ansible_rulebook/action/shutdown.py
@@ -54,6 +54,4 @@ async def __call__(self):
                 message,
             )
         )
-        raise ShutdownException(
-            ShutdownMessage(message=message, delay=delay, kind=kind)
-        )
+        raise ShutdownException(ShutdownMessage(message=message, delay=delay, kind=kind))