Merge pull request #4 from regro/api

feat: generalize args so can use as api

Author: beckermr

conda_forge_feedstock_ops/container_utils.py

@@ -33,8 +33,8 @@ def get_default_container_name():
 class ContainerRuntimeError(RuntimeError):
     """An error raised when running a container fails."""
 
-    def __init__(self, *, error, name, cmd, returncode, traceback=None):
-        self.name = name
+    def __init__(self, *, error, args, cmd, returncode, traceback=None):
+        self.args = args
         self.cmd = cmd
         self.returncode = returncode
         self.traceback = traceback
@@ -87,8 +87,16 @@ def get_default_container_run_args(
     )
 
 
+def get_default_log_level_args(logger):
+    log_level_str = str(logging.getLevelName(logger.getEffectiveLevel())).lower()
+    logger.debug("computed effective logging level: %s", log_level_str)
+    return [
+        "--log-level",
+        log_level_str,
+    ]
+
+
 def run_container_operation(
-    name: str,
     args: Iterable[str],
     json_loads: Callable = json.loads,
     tmpfs_size_mb: int = DEFAULT_CONTAINER_TMPFS_SIZE_MB,
@@ -100,8 +108,6 @@ def run_container_operation(
 
     Parameters
     ----------
-    name
-        The name of the operation.
     args
         The arguments to pass to the container.
     json_loads
@@ -131,18 +137,11 @@ def run_container_operation(
     else:
         mnt_args = []
 
-    log_level_str = str(logging.getLevelName(logger.getEffectiveLevel())).lower()
-    logger.debug("computed effective logging level: %s", log_level_str)
-
     cmd = [
         *get_default_container_run_args(tmpfs_size_mb=tmpfs_size_mb),
         *mnt_args,
         get_default_container_name(),
-        "conda-forge-feedstock-ops-container",
-        name,
         *args,
-        "--log-level",
-        log_level_str,
     ]
     res = subprocess.run(
         cmd,
@@ -153,10 +152,10 @@ def run_container_operation(
     # we handle this ourselves to customize the error message
     if res.returncode != 0:
         raise ContainerRuntimeError(
-            error=f"Error running {name} in container - return code {res.returncode}:"
+            error=f"Error running '{' '.join(args)}' in container - return code {res.returncode}:"
             f"\ncmd: {pprint.pformat(cmd)}"
             f"\noutput: {pprint.pformat(res.stdout)}",
-            name=name,
+            args=args,
             cmd=pprint.pformat(cmd),
             returncode=res.returncode,
         )
@@ -165,10 +164,10 @@ def run_container_operation(
         ret = json_loads(res.stdout)
     except json.JSONDecodeError:
         raise ContainerRuntimeError(
-            error=f"Error running {name} in container - JSON could not parse stdout:"
+            error=f"Error running '{' '.join(args)}' in container - JSON could not parse stdout:"
             f"\ncmd: {pprint.pformat(cmd)}"
             f"\noutput: {pprint.pformat(res.stdout)}",
-            name=name,
+            args=args,
             cmd=pprint.pformat(cmd),
             returncode=res.returncode,
         )
@@ -182,8 +181,8 @@ def run_container_operation(
             .decode("unicode_escape")
         )
         raise ContainerRuntimeError(
-            error=f"Error running {name} in container - error {ret['error'].split('(')[0]} raised:\n{ret_str}",
-            name=name,
+            error=f"Error running '{' '.join(args)}' in container - error {ret['error'].split('(')[0]} raised:\n{ret_str}",
+            args=args,
             cmd=pprint.pformat(cmd),
             returncode=res.returncode,
             traceback=ret["traceback"]

conda_forge_feedstock_ops/rerender.py

@@ -8,7 +8,10 @@
 import time
 from threading import Event, Thread
 
-from conda_forge_feedstock_ops.container_utils import run_container_operation
+from conda_forge_feedstock_ops.container_utils import (
+    get_default_log_level_args,
+    run_container_operation,
+)
 from conda_forge_feedstock_ops.os_utils import (
     chmod_plus_rwX,
     get_user_execute_permissions,
@@ -74,7 +77,10 @@ def rerender_containerized(feedstock_dir, timeout=None):
     str
         The commit message for the rerender. If None, the rerender didn't change anything.
     """
-    args = []
+    args = [
+        "conda-forge-feedstock-ops-container",
+        "rerender",
+    ] + get_default_log_level_args(logger)
 
     if timeout is not None:
         args += ["--timeout", str(timeout)]
@@ -106,7 +112,6 @@ def rerender_containerized(feedstock_dir, timeout=None):
         )
 
         data = run_container_operation(
-            "rerender",
             args,
             mount_readonly=False,
             mount_dir=tmpdir,