Merge "Use log module to determine current log level"

pkg/bootstrap/isogen/command.go

@@ -71,7 +71,7 @@ func GenerateBootstrapIso(settings *environment.AirshipCTLSettings) error {
 		return err
 	}
 
-	err = generateBootstrapIso(docBundle, builder, cfg, settings.Debug)
+	err = generateBootstrapIso(docBundle, builder, cfg, log.DebugEnabled())
 	if err != nil {
 		return err
 	}

pkg/clusterctl/client/executor.go

@@ -61,7 +61,7 @@ func NewExecutor(cfg ifc.ExecutorConfig) (ifc.Executor, error) {
 	if err != nil {
 		return nil, err
 	}
-	client, err := NewClient(tgtPath, cfg.AirshipSettings.Debug, options)
+	client, err := NewClient(tgtPath, log.DebugEnabled(), options)
 	if err != nil {
 		return nil, err
 	}

pkg/clusterctl/cmd/command.go

@@ -20,6 +20,7 @@ import (
 	"opendev.org/airship/airshipctl/pkg/config"
 	"opendev.org/airship/airshipctl/pkg/document"
 	"opendev.org/airship/airshipctl/pkg/environment"
+	"opendev.org/airship/airshipctl/pkg/log"
 )
 
 // Command adds a layer to clusterctl interface with airshipctl context
@@ -48,7 +49,7 @@ func NewCommand(rs *environment.AirshipCTLSettings) (*Command, error) {
 	if err != nil {
 		return nil, err
 	}
-	client, err := client.NewClient(root, rs.Debug, options)
+	client, err := client.NewClient(root, log.DebugEnabled(), options)
 	if err != nil {
 		return nil, err
 	}

pkg/log/log.go

@@ -31,6 +31,11 @@ func Init(debugFlag bool, out io.Writer) {
 	airshipLog.SetOutput(out)
 }
 
+// DebugEnabled returns whether the debug level is set
+func DebugEnabled() bool {
+	return debug
+}
+
 // Debug is a wrapper for log.Debug
 func Debug(v ...interface{}) {
 	if debug {

pkg/phase/phase.go

@@ -175,7 +175,7 @@ func (p *Cmd) Exec(name string) error {
 			return
 		}
 		executor.Run(runCh, ifc.RunOptions{
-			Debug:  p.Debug,
+			Debug:  log.DebugEnabled(),
 			DryRun: p.DryRun,
 		})
 	}()