Merge pull request #384 from nix-community/buildbot-effects

 buildbot-effects: don't print program arguments by default

Author: Mic92

bin/buildbot-effects

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import sys
 from pathlib import Path
-sys.path.append(str(Path(__file__).parent.parent))
+sys.path.append(str(Path(__file__).parent.parent / "buildbot_effects"))
 
 from buildbot_effects.cli import main
 

buildbot_effects/buildbot_effects/__init__.py

@@ -22,9 +22,9 @@ def run(
     stdin: int | IO[str] | None = None,
     stdout: int | IO[str] | None = None,
     stderr: int | IO[str] | None = None,
-    verbose: bool = True,
+    debug: bool = True,
 ) -> subprocess.CompletedProcess[str]:
-    if verbose:
+    if debug:
         print("$", shlex.join(cmd), file=sys.stderr)
     return subprocess.run(
         cmd,
@@ -36,9 +36,9 @@ def run(
     )
 
 
-def git_command(args: list[str], path: Path) -> str:
+def git_command(args: list[str], path: Path, debug: bool = False) -> str:
     cmd = ["git", "-C", str(path), *args]
-    proc = run(cmd, stdout=subprocess.PIPE)
+    proc = run(cmd, stdout=subprocess.PIPE, debug=debug)
     return proc.stdout.strip()
 
 
@@ -121,7 +121,7 @@ def list_effects(opts: EffectsOptions) -> list[str]:
         "--expr",
         f"builtins.attrNames ({effect_function(opts)})",
     )
-    proc = run(cmd, stdout=subprocess.PIPE)
+    proc = run(cmd, stdout=subprocess.PIPE, debug=opts.debug)
     return json.loads(proc.stdout)
 
 
@@ -131,11 +131,11 @@ def instantiate_effects(effect: str, opts: EffectsOptions) -> str:
         "--expr",
         f"(({effect_function(opts)}).{effect}).run or []",
     ]
-    proc = run(cmd, stdout=subprocess.PIPE)
+    proc = run(cmd, stdout=subprocess.PIPE, debug=opts.debug)
     return proc.stdout.rstrip()
 
 
-def parse_derivation(path: str) -> dict[str, Any]:
+def parse_derivation(path: str, debug: bool = False) -> dict[str, Any]:
     cmd = [
         "nix",
         "--extra-experimental-features",
@@ -144,7 +144,7 @@ def parse_derivation(path: str) -> dict[str, Any]:
         "show",
         f"{path}^*",
     ]
-    proc = run(cmd, stdout=subprocess.PIPE)
+    proc = run(cmd, stdout=subprocess.PIPE, debug=debug)
     return json.loads(proc.stdout)
 
 
@@ -176,6 +176,7 @@ def run_effects(
     drv_path: str,
     drv: dict[str, Any],
     secrets: dict[str, Any] | None = None,
+    debug: bool = False,
 ) -> None:
     if secrets is None:
         secrets = {}
@@ -257,7 +258,8 @@ def run_effects(
         bubblewrap_cmd.append("--")
         bubblewrap_cmd.extend(sandboxed_cmd)
         with pipe() as (r_file, w_file):
-            print("$", shlex.join(bubblewrap_cmd), file=sys.stderr)
+            if debug:
+                print("$", shlex.join(bubblewrap_cmd), file=sys.stderr)
             proc = subprocess.Popen(
                 bubblewrap_cmd,
                 text=True,

buildbot_effects/buildbot_effects/cli.py

@@ -56,6 +56,12 @@ def parse_args() -> tuple[argparse.Namespace, EffectsOptions]:
         default=Path(),
         help="Path to the repository",
     )
+    parser.add_argument(
+        "--debug",
+        default=False,
+        action="store_true",
+        help="Enable debug mode (may leak secrets such as GITHUB_TOKEN)",
+    )
     subparser = parser.add_subparsers(
         dest="command",
         required=True,
@@ -88,6 +94,7 @@ def parse_args() -> tuple[argparse.Namespace, EffectsOptions]:
         rev=args.rev,
         repo=args.repo,
         path=args.path.resolve(),
+        debug=args.debug,
     )
     return args, opts
 

buildbot_effects/buildbot_effects/options.py

@@ -11,3 +11,4 @@ class EffectsOptions:
     branch: str | None = None
     url: str | None = None
     tag: str | None = None
+    debug: bool = False

buildbot_nix/buildbot_nix/__init__.py

@@ -1112,6 +1112,7 @@ def nix_eval_config(
             # TODO: support other branches?
             doStepIf=lambda c: c.build.getProperty("branch", "")
             == project.default_branch,
+            logEnviron=False,
         )
     )
 
@@ -1439,6 +1440,7 @@ def buildbot_effects_config(
                     util.Property("command"),
                     # fmt: on
                 ],
+                logEnviron=False,
             ),
         ],
         withSecrets=secrets_list,