fix quiet flag (anchore#2081)

Signed-off-by: Alex Goodman <[email protected]>
GijsCalis · Aug 31, 2023 · 4119be2 · 4119be2
1 parent 2e151a2
commit 4119be2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/cmd/syft/cli/cli.go b/cmd/syft/cli/cli.go
@@ -29,7 +29,7 @@ func New(id clio.Identification) clio.Application {
 			// select a UI based on the logging configuration and state of stdin (if stdin is a tty)
 			func(cfg clio.Config) ([]clio.UI, error) {
 				noUI := ui.None(cfg.Log.Quiet)
-				if !cfg.Log.AllowUI(os.Stdin) {
+				if !cfg.Log.AllowUI(os.Stdin) || cfg.Log.Quiet {
 					return []clio.UI{noUI}, nil
 				}
 

diff --git a/test/cli/packages_cmd_test.go b/test/cli/packages_cmd_test.go
@@ -36,6 +36,24 @@ func TestPackagesCmdFlags(t *testing.T) {
 				assertSuccessfulReturnCode,
 			},
 		},
+		{
+			name: "quiet-flag-with-logger",
+			args: []string{"packages", "-qvv", "-o", "json", coverageImage},
+			assertions: []traitAssertion{
+				assertJsonReport,
+				assertNoStderr,
+				assertSuccessfulReturnCode,
+			},
+		},
+		{
+			name: "quiet-flag-with-tui",
+			args: []string{"packages", "-q", "-o", "json", coverageImage},
+			assertions: []traitAssertion{
+				assertJsonReport,
+				assertNoStderr,
+				assertSuccessfulReturnCode,
+			},
+		},
 		{
 			name: "multiple-output-flags",
 			args: []string{"packages", "-o", "table", "-o", "json=" + tmp + ".tmp/multiple-output-flag-test.json", coverageImage},

diff --git a/test/cli/trait_assertions_test.go b/test/cli/trait_assertions_test.go
@@ -83,6 +83,13 @@ func assertNotInOutput(data string) traitAssertion {
 	}
 }
 
+func assertNoStderr(tb testing.TB, _, stderr string, _ int) {
+	tb.Helper()
+	if len(stderr) > 0 {
+		tb.Errorf("expected stderr to be empty, but got %q", stderr)
+	}
+}
+
 func assertInOutput(data string) traitAssertion {
 	return func(tb testing.TB, stdout, stderr string, _ int) {
 		tb.Helper()