Make bundle validate subcommand respect verbosity (#3795) (#3812)

* Make bundle validate subcommand respect verbosity

This makes the bundle validate subcommand respect the verbosity level
by setting it directly in the logger that's actually used, and not in
the global logger as was done previously.

Closes: #3793

* add unit test

Co-authored-by: Austin Macdonald <[email protected]>

Co-authored-by: Juan Osorio Robles <[email protected]>

Author: asmacdo

changelog/fragments/bundle-validate-verbose.yaml

@@ -0,0 +1,4 @@
+entries:
+  - description: Fixed debug logging in the `bundle validate` subcommand of `operator-sdk`
+    kind: "bugfix"
+    breaking: false

cmd/operator-sdk/bundle/validate.go

@@ -123,16 +123,11 @@ func makeValidateCmd() *cobra.Command {
 		Use:   "validate",
 		Short: "Validate an operator bundle",
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			if viper.GetBool(flags.VerboseOpt) {
-				log.SetLevel(log.DebugLevel)
-			}
-
 			// Always print non-output logs to stderr as to not pollute actual command output.
 			// Note that it allows the JSON result be redirected to the Stdout. E.g
 			// if we run the command with `| jq . > result.json` the command will print just the logs
 			// and the file will have only the JSON result.
-			logger := log.NewEntry(internal.NewLoggerTo(os.Stderr))
-
+			logger := createLogger(viper.GetBool(flags.VerboseOpt))
 			if err = c.validate(args); err != nil {
 				return fmt.Errorf("invalid command args: %v", err)
 			}
@@ -156,6 +151,15 @@ func makeValidateCmd() *cobra.Command {
 	return cmd
 }
 
+// createLogger creates a new logrus Entry that is optionally verbose.
+func createLogger(verbose bool) *log.Entry {
+	logger := log.NewEntry(internal.NewLoggerTo(os.Stderr))
+	if verbose {
+		logger.Logger.SetLevel(log.DebugLevel)
+	}
+	return logger
+}
+
 // validate verifies the command args
 func (c bundleValidateCmd) validate(args []string) error {
 	if len(args) != 1 {

cmd/operator-sdk/bundle/validate_test.go

@@ -18,6 +18,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/bundle/internal"
+	log "github.com/sirupsen/logrus"
 )
 
 var _ = Describe("Running a bundle validate command", func() {
@@ -38,6 +39,19 @@ var _ = Describe("Running a bundle validate command", func() {
 		})
 	})
 
+	Describe("Creating a logger", func() {
+		It("that is Info Level when not verbose", func() {
+			verbose := false
+			logger := createLogger(verbose)
+			Expect(logger.Logger.GetLevel()).To(Equal(log.InfoLevel))
+		})
+		It("that is Debug level if verbose", func() {
+			verbose := true
+			logger := createLogger(verbose)
+			Expect(logger.Logger.GetLevel()).To(Equal(log.DebugLevel))
+		})
+	})
+
 	Describe("validate", func() {
 		var cmd bundleValidateCmd
 		BeforeEach(func() {