fix: parse flags before prompting, do not prompt in flag parsing code (#2400)

* fix: parse flags before prompting, do not prompt in flag parsing code

* f

---------

Co-authored-by: Steven Crespo <screswk@gmail.com>

Author: emosbaugh

cmd/installer/cli/install.go

@@ -122,10 +122,10 @@ func InstallCmd(ctx context.Context, appSlug, appTitle string) *cobra.Command {
 			cancel() // Cancel context when command completes
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := verifyAndPrompt(ctx, appSlug, flags, prompts.New()); err != nil {
+			if err := preRunInstall(cmd, &flags, rc, ki); err != nil {
 				return err
 			}
-			if err := preRunInstall(cmd, &flags, rc, ki); err != nil {
+			if err := verifyAndPrompt(ctx, cmd, appSlug, &flags, prompts.New()); err != nil {
 				return err
 			}
 
@@ -435,13 +435,6 @@ func preRunInstallCommon(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimec
 		return err
 	}
 
-	// restore command doesn't have a password flag
-	if cmd.Flags().Lookup("admin-console-password") != nil {
-		if err := ensureAdminConsolePassword(flags); err != nil {
-			return err
-		}
-	}
-
 	rc.SetAdminConsolePort(flags.adminConsolePort)
 	ki.SetAdminConsolePort(flags.adminConsolePort)
 
@@ -812,7 +805,7 @@ func getAddonInstallOpts(flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig,
 	return opts, nil
 }
 
-func verifyAndPrompt(ctx context.Context, appSlug string, flags InstallCmdFlags, prompt prompts.Prompt) error {
+func verifyAndPrompt(ctx context.Context, cmd *cobra.Command, appSlug string, flags *InstallCmdFlags, prompt prompts.Prompt) error {
 	logrus.Debugf("checking if k0s is already installed")
 	err := verifyNoInstallation(appSlug, "reinstall")
 	if err != nil {
@@ -851,6 +844,13 @@ func verifyAndPrompt(ctx context.Context, appSlug string, flags InstallCmdFlags,
 		return err
 	}
 
+	// restore command doesn't have a password flag
+	if cmd.Flags().Lookup("admin-console-password") != nil {
+		if err := ensureAdminConsolePassword(flags); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 

cmd/installer/cli/install_runpreflights.go

@@ -32,20 +32,20 @@ func InstallRunPreflightsCmd(ctx context.Context, appSlug string) *cobra.Command
 		Use:    "run-preflights",
 		Short:  "Run install host preflights",
 		Hidden: true,
-		PreRunE: func(cmd *cobra.Command, args []string) error {
+		PostRun: func(cmd *cobra.Command, args []string) {
+			rc.Cleanup()
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := preRunInstall(cmd, &flags, rc, ki); err != nil {
 				return err
 			}
+			if err := verifyAndPrompt(ctx, cmd, appSlug, &flags, prompts.New()); err != nil {
+				return err
+			}
 
 			_ = rc.SetEnv()
 
-			return nil
-		},
-		PostRun: func(cmd *cobra.Command, args []string) {
-			rc.Cleanup()
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := runInstallRunPreflights(cmd.Context(), appSlug, flags, rc); err != nil {
+			if err := runInstallRunPreflights(cmd.Context(), flags, rc); err != nil {
 				return err
 			}
 
@@ -62,11 +62,7 @@ func InstallRunPreflightsCmd(ctx context.Context, appSlug string) *cobra.Command
 	return cmd
 }
 
-func runInstallRunPreflights(ctx context.Context, appSlug string, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig) error {
-	if err := verifyAndPrompt(ctx, appSlug, flags, prompts.New()); err != nil {
-		return err
-	}
-
+func runInstallRunPreflights(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig) error {
 	licenseBytes, err := os.ReadFile(flags.licenseFile)
 	if err != nil {
 		return fmt.Errorf("unable to read license file: %w", err)

cmd/installer/cli/restore.go

@@ -98,19 +98,16 @@ func RestoreCmd(ctx context.Context, appSlug, appTitle string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "restore",
 		Short: fmt.Sprintf("Restore %s from a backup", appTitle),
-		PreRunE: func(cmd *cobra.Command, args []string) error {
+		PostRun: func(cmd *cobra.Command, args []string) {
+			rc.Cleanup()
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := preRunInstall(cmd, &flags, rc, ki); err != nil {
 				return err
 			}
 
 			_ = rc.SetEnv()
 
-			return nil
-		},
-		PostRun: func(cmd *cobra.Command, args []string) {
-			rc.Cleanup()
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := runRestore(cmd.Context(), appSlug, appTitle, flags, rc, s3Store, skipStoreValidation); err != nil {
 				return err
 			}