Merge pull request #633 from posit-dev/worktree-dgoss-docker-exit-handling

Print Docker stderr in dgoss error output

Author: bschwedler

posit-bakery/posit_bakery/plugins/builtin/dgoss/errors.py

@@ -30,7 +30,12 @@ def __init__(
     def __str__(self) -> str:
         s = f"{self.message}\n"
         s += f"  - Exit code: {self.exit_code}\n"
-        s += f"  - Command output: \n{textwrap.indent(self.dump_stdout(), '      ')}\n"
+        stdout_dump = self.dump_stdout()
+        if stdout_dump:
+            s += f"  - Command output:\n{textwrap.indent(stdout_dump, '      ')}\n"
+        stderr_dump = self.dump_stderr(lines=50)
+        if stderr_dump:
+            s += f"  - Error output:\n{textwrap.indent(stderr_dump, '      ')}\n"
         s += f"  - Command executed: {' '.join(self.cmd)}\n"
         if self.metadata:
             s += "  - Metadata:\n"

posit-bakery/test/plugins/builtin/dgoss/test_suite.py

@@ -161,3 +161,27 @@ def fake_run(self, tasks, *, on_result=None):
         suite.run()
         assert captured["tasks"]
         assert all(t.timeout == 900 for t in captured["tasks"])  # default 900 from GossOptions
+
+
+class TestBakeryDGossError:
+    def test_str_includes_stderr_when_present(self):
+        err = BakeryDGossError(
+            message="dgoss execution failed for image 'test-image'",
+            tool_name="dgoss",
+            cmd=["dgoss", "run", "test-image"],
+            stdout=b"",
+            stderr=b"Error response from daemon: pull access denied",
+            exit_code=125,
+        )
+        assert "Error response from daemon" in str(err)
+
+    def test_str_omits_stderr_section_when_empty(self):
+        err = BakeryDGossError(
+            message="dgoss execution failed for image 'test-image'",
+            tool_name="dgoss",
+            cmd=["dgoss", "run", "test-image"],
+            stdout=b'{"summary": {}}',
+            stderr=b"",
+            exit_code=1,
+        )
+        assert "Error output" not in str(err)