From d6d9b994d46bdd11bdc17f215a4138558b626457 Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis.bilenko@databricks.com>
Date: Fri, 24 Jan 2025 10:47:12 +0100
Subject: [PATCH] acc: only print non-zero exit codes in errcode function
 (#2222)

Reduce noise in the output and matches how "Exit code" is handled for
the whole script.
---
 acceptance/bundle/paths/fallback/output.txt       | 2 --
 acceptance/bundle/paths/nominal/output.txt        | 2 --
 acceptance/bundle/variables/arg-repeat/output.txt | 2 --
 acceptance/script.prepare                         | 4 +++-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/acceptance/bundle/paths/fallback/output.txt b/acceptance/bundle/paths/fallback/output.txt
index f694610d2..63121f3d7 100644
--- a/acceptance/bundle/paths/fallback/output.txt
+++ b/acceptance/bundle/paths/fallback/output.txt
@@ -1,8 +1,6 @@
 
 >>> $CLI bundle validate -t development -o json
 
-Exit code: 0
-
 >>> $CLI bundle validate -t error
 Error: notebook this value is overridden not found. Local notebook references are expected
 to contain one of the following file extensions: [.py, .r, .scala, .sql, .ipynb]
diff --git a/acceptance/bundle/paths/nominal/output.txt b/acceptance/bundle/paths/nominal/output.txt
index 189170335..1badcdec6 100644
--- a/acceptance/bundle/paths/nominal/output.txt
+++ b/acceptance/bundle/paths/nominal/output.txt
@@ -1,8 +1,6 @@
 
 >>> $CLI bundle validate -t development -o json
 
-Exit code: 0
-
 >>> $CLI bundle validate -t error
 Error: notebook this value is overridden not found. Local notebook references are expected
 to contain one of the following file extensions: [.py, .r, .scala, .sql, .ipynb]
diff --git a/acceptance/bundle/variables/arg-repeat/output.txt b/acceptance/bundle/variables/arg-repeat/output.txt
index 48bd2033f..2f9de1a3c 100644
--- a/acceptance/bundle/variables/arg-repeat/output.txt
+++ b/acceptance/bundle/variables/arg-repeat/output.txt
@@ -1,7 +1,5 @@
 
 >>> errcode $CLI bundle validate --var a=one -o json
-
-Exit code: 0
 {
   "a": {
     "default": "hello",
diff --git a/acceptance/script.prepare b/acceptance/script.prepare
index 0567e433a..87910654d 100644
--- a/acceptance/script.prepare
+++ b/acceptance/script.prepare
@@ -6,7 +6,9 @@ errcode() {
     local exit_code=$?
     # Re-enable 'set -e' if it was previously set
     set -e
-    >&2 printf "\nExit code: $exit_code\n"
+    if [ $exit_code -ne 0 ]; then
+        >&2 printf "\nExit code: $exit_code\n"
+    fi
 }
 
 trace() {