Merge pull request #70 from AdvH039/verbose-flag-set-logLvl

Verbose flag controls log level

Author: blanquicet

cmd/check-apiserver-connectivity.go

@@ -41,7 +41,7 @@ func connCheckCmdRun(cmd *cobra.Command, args []string) error {
 	// command will try to contact the API server to get the Kubernetes version
 	// it is running. Use only the return value of the command, tough.
 	command := "kubectl --kubeconfig /var/lib/kubelet/kubeconfig version > /dev/null; echo -n $?"
-	res, err := utils.RunCommand(cmd.Context(), cred, vm, &command, commonFlags.Verbose, nil, utils.OutputTruncateTail)
+	res, err := utils.RunCommand(cmd.Context(), cred, vm, &command, nil, utils.OutputTruncateTail)
 	if err != nil {
 		return fmt.Errorf("failed to run command that checks connectivity: %w", err)
 	}

cmd/config.go

@@ -68,6 +68,10 @@ var importCmd = importCmdCommand()
 
 func init() {
 	utils.AddCommonFlags(configCmd, &commonFlags)
+
+	if commonFlags.Verbose {
+		logrus.SetLevel(logrus.DebugLevel)
+	}
 	rootCmd.AddCommand(configCmd)
 
 	configCmd.AddCommand(showConfigCmd, useNodeCmd, unsetCurrentNodeCmd, unsetNodeCmd, unsetAllCmd, setNodeCmd, importCmd)

cmd/run-command.go

@@ -69,7 +69,7 @@ func runCommandCmdRun(cmd *cobra.Command, args []string) error {
 		outputTruncate = utils.OutputTruncateHead
 	}
 
-	res, err := utils.RunCommand(cmd.Context(), cred, vm, &command, commonFlags.Verbose, &timeout, outputTruncate)
+	res, err := utils.RunCommand(cmd.Context(), cred, vm, &command, &timeout, outputTruncate)
 	if err != nil {
 		return fmt.Errorf("running command: %w", err)
 	}

cmd/utils/vmss.go

@@ -223,7 +223,6 @@ func RunCommand(
 	cred azcore.TokenCredential,
 	vm *VirtualMachineScaleSetVM,
 	command *string,
-	verbose bool,
 	timeout *int,
 	outputTruncate OutputTruncate,
 ) (
@@ -257,11 +256,8 @@ func RunCommand(
 		Script:    script,
 	}
 
-	if verbose {
-		b, _ := json.MarshalIndent(vm, "", "  ")
-		fmt.Printf("Command: %s\nVirtual Machine Scale Set VM:\n%s\n\n", *command, string(b))
-	}
-
+	b, _ := json.MarshalIndent(vm, "", "  ")
+	log.Debugf("Command: %s\nVirtual Machine Scale Set VM:\n%s\n\n", *command, string(b))
 	s := make(chan os.Signal, 1)
 	signal.Notify(s, os.Interrupt, syscall.SIGTERM)
 	go func() {
@@ -289,11 +285,8 @@ func RunCommand(
 		return nil, fmt.Errorf("polling command response: %w", err)
 	}
 
-	if verbose {
-		b, _ := json.MarshalIndent(res, "", "  ")
-		fmt.Printf("\nResponse:\n%s\n", string(b))
-	}
-
+	b, _ = json.MarshalIndent(res, "", "  ")
+	log.Debugf("\nResponse:\n%s\n", string(b))
 	// TODO: Is it possible to have multiple values after using PollUntilDone()?
 	if len(res.Value) == 0 || res.Value[0] == nil {
 		return nil, errors.New("no response received after command execution")