feat: improve Consul installation UX with better progress messages and confirmation flow

Author: CodeMonkeyCybersecurity

cmd/create/consul.go

@@ -5,6 +5,7 @@ package create
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/CodeMonkeyCybersecurity/eos/pkg/consul"
 	"github.com/CodeMonkeyCybersecurity/eos/pkg/eos_cli"
@@ -18,7 +19,7 @@ import (
 
 var CreateConsulCmd = &cobra.Command{
 	Use:   "consul",
-	Short: "Install and configure HashiCorp Consul directly (without )",
+	Short: "Install and configure HashiCorp Consul using native methods",
 	Long: `Install and configure HashiCorp Consul using native installation methods.
 
 This command installs Consul directly without using configuration management tools,
@@ -101,11 +102,17 @@ func runCreateConsul(rc *eos_io.RuntimeContext, cmd *cobra.Command, args []strin
 		logger.Info("Defaulting to server mode (neither --server nor --client specified)")
 	}
 
-	// Warn about destructive operations
+	// Warn about destructive operations with explicit confirmation
 	if consulClean {
 		logger.Warn("--clean flag specified: This will DELETE all existing Consul data")
-		logger.Info("terminal prompt: Press Enter to continue or Ctrl+C to cancel...")
-		fmt.Scanln() // Wait for user confirmation
+		logger.Info("terminal prompt: Type 'yes' to confirm or Ctrl+C to cancel: ")
+
+		var confirmation string
+		fmt.Scanln(&confirmation)
+		if strings.ToLower(strings.TrimSpace(confirmation)) != "yes" {
+			return eos_err.NewUserError("clean install cancelled by user (did not type 'yes')")
+		}
+		logger.Info("Clean install confirmed")
 	}
 
 	logger.Info("Starting native Consul installation",
@@ -144,13 +151,17 @@ func runCreateConsul(rc *eos_io.RuntimeContext, cmd *cobra.Command, args []strin
 		return fmt.Errorf("consul installation failed: %w", err)
 	}
 
-	logger.Info("terminal prompt:  Consul installation completed successfully!")
-	logger.Info(fmt.Sprintf("terminal prompt: Web UI available at: http://<server-ip>:%d", shared.PortConsul))
+	// CRITICAL: Success message is printed AFTER Install() returns successfully
+	// Install() includes verification, so if we reach here, Consul is actually working
 	logger.Info("terminal prompt: ")
-	logger.Info("terminal prompt: Next steps:")
-	logger.Info("terminal prompt: 1. Check status: consul members")
-	logger.Info("terminal prompt: 2. View logs: journalctl -u consul -f")
-	logger.Info(fmt.Sprintf("terminal prompt: 3. Access UI: http://localhost:%d/ui", shared.PortConsul))
+	logger.Info("terminal prompt: ✓ Consul installation completed successfully!")
+	logger.Info("terminal prompt: ")
+	logger.Info(fmt.Sprintf("terminal prompt: Web UI: http://<server-ip>:%d/ui", shared.PortConsul))
+	logger.Info("terminal prompt: ")
+	logger.Info("terminal prompt: Quick Start:")
+	logger.Info("terminal prompt:   consul members              # View cluster members")
+	logger.Info("terminal prompt:   journalctl -u consul -f     # View live logs")
+	logger.Info(fmt.Sprintf("terminal prompt:   curl http://localhost:%d/v1/agent/self  # Test API", shared.PortConsul))
 
 	return nil
 }

pkg/consul/install.go

@@ -145,7 +145,7 @@ func (ci *ConsulInstaller) Install() error {
 	}()
 
 	// Phase 1: ASSESS - Check if already installed
-	ci.progress.Update("[16%] Checking current Consul status")
+	ci.progress.Update("[16%] Checking if Consul is already installed and running...")
 	shouldInstall, err := ci.assess()
 	if err != nil {
 		return fmt.Errorf("assessment failed: %w", err)
@@ -160,34 +160,38 @@ func (ci *ConsulInstaller) Install() error {
 	}
 
 	// Phase 2: Prerequisites
-	ci.progress.Update("[33%] Validating prerequisites")
+	ci.progress.Update("[33%] Checking system requirements (memory, disk, ports)...")
 	if err := ci.validatePrerequisites(); err != nil {
 		return fmt.Errorf("prerequisite validation failed: %w", err)
 	}
 
 	// Phase 3: INTERVENE - Install
-	ci.progress.Update("[50%] Installing Consul binary")
+	if ci.config.UseRepository {
+		ci.progress.Update("[50%] Downloading and installing Consul from HashiCorp repository...")
+	} else {
+		ci.progress.Update("[50%] Downloading and installing Consul binary...")
+	}
 	if err := ci.installBinary(); err != nil {
 		return fmt.Errorf("binary installation failed: %w", err)
 	}
 	binaryInstalled = true
 
 	// Phase 4: Configure
-	ci.progress.Update("[66%] Configuring Consul")
+	ci.progress.Update("[66%] Generating and validating Consul configuration files...")
 	if err := ci.configure(); err != nil {
 		return fmt.Errorf("configuration failed: %w", err)
 	}
 	configCreated = true
 
 	// Phase 5: Setup Service
-	ci.progress.Update("[83%] Setting up systemd service")
+	ci.progress.Update("[83%] Creating systemd service and starting Consul...")
 	if err := ci.setupService(); err != nil {
 		return fmt.Errorf("service setup failed: %w", err)
 	}
 	serviceCreated = true
 
 	// Phase 6: EVALUATE - Verify
-	ci.progress.Update("[100%] Verifying installation")
+	ci.progress.Update("[100%] Waiting for Consul API to become ready...")
 	if err := ci.verify(); err != nil {
 		return fmt.Errorf("verification failed: %w", err)
 	}
@@ -243,10 +247,17 @@ func (ci *ConsulInstaller) rollbackPartialInstall(binaryInstalled, configCreated
 				zap.Error(err),
 				zap.String("output", output))
 		} else {
-			// CRITICAL: daemon-reload is async - systemd scans /etc/systemd/system/
-			// If we immediately delete files, systemd might see partial state
+			// CRITICAL: daemon-reload is async - poll systemd state instead of sleep
 			ci.logger.Debug("Waiting for daemon-reload to complete")
-			time.Sleep(500 * time.Millisecond)
+			deadline := time.Now().Add(2 * time.Second)
+			for time.Now().Before(deadline) {
+				// Check if systemd has processed the reload by querying unit state
+				if _, err := exec.Command("systemctl", "show", "-p", "LoadState", "consul").Output(); err == nil {
+					// If we can query the unit state, daemon-reload has processed
+					break
+				}
+				time.Sleep(100 * time.Millisecond)
+			}
 		}
 	}
 
@@ -897,9 +908,10 @@ func (ci *ConsulInstaller) setupService() error {
 
 			// Log progress every few attempts so user knows we're still checking
 			if attempt%3 == 0 {
-				ci.logger.Info("Still waiting for Consul to be ready",
+				ci.logger.Info("Waiting for Consul HTTP API to respond...",
 					zap.Int("attempt", attempt),
-					zap.Int("max_attempts", 15))
+					zap.Int("max_attempts", 15),
+					zap.String("checking", fmt.Sprintf("http://127.0.0.1:%d/v1/agent/self", shared.PortConsul)))
 			}
 		}
 	}