From 1e7162639c8a9748db2596b3fffc06702d62fcf7 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@gmail.com>
Date: Mon, 8 Jul 2024 12:12:38 +0200
Subject: [PATCH] osbuild add new `-q`, `--quiet` option

Current osbuild will always print some non output even
when run with `--monitor=JSONSeqMonitor` because of the
unconditional `print/sys.stdout.write()` in `main_cli.py`.

This commit adds a new `-q` option to silence this so that something
like osbuild-composer can run `osbuild -q --monitor=JSONSeqMonitor`
to get pure json-seq output during the build.

The use-case is to run `osbuild --monitor-fd` from e.g. bib and
osbuild-composer so that we get pure json from the monitor-fd
and anything that goes on std{out,err} can be logged as it is
most likely error output.
---
 osbuild/main_cli.py   |  6 ++++--
 test/run/test_noop.py | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/osbuild/main_cli.py b/osbuild/main_cli.py
index 3afd97c4a..c8a87bd48 100644
--- a/osbuild/main_cli.py
+++ b/osbuild/main_cli.py
@@ -103,6 +103,8 @@ def parse_arguments(sys_argv: List[str]) -> argparse.Namespace:
     # nargs='?' const='*' means `--break` is equivalent to `--break=*`
     parser.add_argument("--break", dest='debug_break', type=str, nargs='?', const='*',
                         help="open debug shell when executing stage. Accepts stage name or id or * (for all)")
+    parser.add_argument("--quiet", "-q", action="store_true",
+                        help="supress normal output")
 
     return parser.parse_args(sys_argv[1:])
 
@@ -162,7 +164,7 @@ def osbuild_cli() -> int:
 
     monitor_name = args.monitor
     if not monitor_name:
-        monitor_name = "NullMonitor" if args.json else "LogMonitor"
+        monitor_name = "NullMonitor" if (args.json or args.quiet) else "LogMonitor"
 
     try:
         with ObjectStore(args.store) as object_store:
@@ -201,7 +203,7 @@ def osbuild_cli() -> int:
                 r = fmt.output(manifest, r, object_store)
                 json.dump(r, sys.stdout)
                 sys.stdout.write("\n")
-            else:
+            elif not args.quiet:
                 if r["success"]:
                     for name, pl in manifest.pipelines.items():
                         print(f"{name + ':': <10}\t{pl.id}")
diff --git a/test/run/test_noop.py b/test/run/test_noop.py
index fb92a1233..dbee4b961 100644
--- a/test/run/test_noop.py
+++ b/test/run/test_noop.py
@@ -3,9 +3,11 @@
 #
 
 import json
+import os
 
 import pytest
 
+import osbuild.main_cli
 from .. import test
 
 
@@ -64,3 +66,20 @@ def test_noop2(osb):
 @pytest.mark.skipif(not test.TestBase.can_bind_mount(), reason="root-only")
 def test_noop_v2(osb, tmp_path, jsondata):
     osb.compile(jsondata, output_dir=tmp_path, exports=["noop"])
+
+
+def test_noop_cli(monkeypatch, capfd, tmp_path, jsondata):
+    fake_manifest = tmp_path / "manifest.json"
+    fake_manifest.write_text(jsondata)
+
+    monkeypatch.setattr("sys.argv", [
+        "arg0",
+        "--libdir=.", os.fspath(fake_manifest),
+        f"--store={tmp_path}",
+        "--quiet",
+    ])
+    ret_code = osbuild.main_cli.osbuild_cli()
+    assert ret_code == 0
+
+    captured = capfd.readouterr()
+    assert captured.out == ""