fix: bubbletea output for ci

konstructio · Nov 12, 2024 · 4a202f2 · 4a202f2
1 parent 49fe9d1
commit 4a202f2
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 13 deletions.
diff --git a/cmd/akamai/command.go b/cmd/akamai/command.go
@@ -128,6 +128,7 @@ func RootCredentials() *cobra.Command {
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "copy the ArgoCD password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "copy the kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "copy the vault password to the clipboard (optional)")
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
 
 	return authCmd
 }
diff --git a/cmd/aws/command.go b/cmd/aws/command.go
@@ -136,5 +136,7 @@ func RootCredentials() *cobra.Command {
 		RunE:  common.GetRootCredentials,
 	}
 
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
+
 	return authCmd
 }
diff --git a/cmd/azure/command.go b/cmd/azure/command.go
@@ -137,6 +137,7 @@ func RootCredentials() *cobra.Command {
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "copy the argocd password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "copy the kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "copy the vault password to the clipboard (optional)")
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
 
 	return authCmd
 }
diff --git a/cmd/civo/command.go b/cmd/civo/command.go
@@ -154,6 +154,7 @@ func RootCredentials() *cobra.Command {
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "Copy the ArgoCD password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "Copy the Kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "Copy the Vault password to the clipboard (optional)")
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
 
 	return authCmd
 }
diff --git a/cmd/digitalocean/command.go b/cmd/digitalocean/command.go
@@ -133,6 +133,7 @@ func RootCredentials() *cobra.Command {
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "copy the ArgoCD password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "copy the kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "copy the vault password to the clipboard (optional)")
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
 
 	return authCmd
 }
diff --git a/cmd/google/command.go b/cmd/google/command.go
@@ -139,6 +139,7 @@ func RootCredentials() *cobra.Command {
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "copy the ArgoCD password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "copy the kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "copy the vault password to the clipboard (optional)")
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
 
 	return authCmd
 }
diff --git a/cmd/k3s/command.go b/cmd/k3s/command.go
@@ -136,6 +136,7 @@ func RootCredentials() *cobra.Command {
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "copy the ArgoCD password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "copy the kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "copy the vault password to the clipboard (optional)")
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
 
 	return authCmd
 }
diff --git a/cmd/launch.go b/cmd/launch.go
@@ -15,6 +15,7 @@ import (
 
 // additionalHelmFlags can optionally pass user-supplied flags to helm
 var additionalHelmFlags []string
+var ciFlag bool
 
 func LaunchCommand() *cobra.Command {
 	launchCommand := &cobra.Command{
@@ -103,5 +104,7 @@ func launchDeleteCluster() *cobra.Command {
 		},
 	}
 
+	launchDeleteClusterCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
+
 	return launchDeleteClusterCmd
 }
diff --git a/cmd/vultr/command.go b/cmd/vultr/command.go
@@ -133,6 +133,7 @@ func RootCredentials() *cobra.Command {
 	authCmd.Flags().BoolVar(&copyArgoCDPasswordToClipboardFlag, "argocd", false, "Copy the ArgoCD password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyKbotPasswordToClipboardFlag, "kbot", false, "Copy the kbot password to the clipboard (optional)")
 	authCmd.Flags().BoolVar(&copyVaultPasswordToClipboardFlag, "vault", false, "Copy the vault password to the clipboard (optional)")
+	authCmd.Flags().BoolVar(&ciFlag, "ci", false, "if running kubefirst in ci, set this flag to disable interactive features")
 
 	return authCmd
 }
diff --git a/internal/progress/command.go b/internal/progress/command.go
@@ -31,6 +31,7 @@ func GetClusterInterval(clusterName string) tea.Cmd {
 func AddSuccesMessage(cluster types.Cluster) tea.Cmd {
 	return tea.Tick(0, func(_ time.Time) tea.Msg {
 		successMessage := DisplaySuccessMessage(cluster)
+		printLine(successMessage.message)
 
 		return successMessage
 	})

diff --git a/internal/progress/progress.go b/internal/progress/progress.go
@@ -8,34 +8,31 @@ package progress
 
 import (
 	"fmt"
+	"os"
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/konstructio/kubefirst-api/pkg/types"
 	"github.com/spf13/viper"
 )
 
 var (
-	Progress        *tea.Program
-	CanRunBubbleTea bool
+	Progress      *tea.Program
+	isCiExecution bool
 )
 
-//nolint:revive // will be removed after refactoring
 func NewModel() progressModel {
 	return progressModel{
 		isProvisioned: false,
 	}
 }
 
-func DiableBubbleTeaExecution() {
-	CanRunBubbleTea = false
-}
-
 // Bubbletea functions
-func InitializeProgressTerminal() {
-	if CanRunBubbleTea {
+func InitializeProgressTerminal(isCi bool) {
+	isCiExecution = isCi
+	if !isCiExecution {
 		Progress = tea.NewProgram(NewModel())
 	} else {
-		Progress = tea.NewProgram(NewModel(), tea.WithoutRenderer())
+		Progress = tea.NewProgram(NewModel(), tea.WithOutput(os.Stdout), tea.WithoutRenderer())
 	}
 }
 
@@ -54,10 +51,12 @@ func (m progressModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 
 	case headerMsg:
+		printLine(msg.message)
 		m.header = msg.message
 		return m, nil
 
 	case addStep:
+		printLine(msg.message)
 		m.nextStep = msg.message
 		return m, nil
 
@@ -67,10 +66,12 @@ func (m progressModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return m, nil
 
 	case errorMsg:
+		printLine(msg.message)
 		m.error = msg.message
 		return m, tea.Quit
 
 	case successMsg:
+		printLine(msg.message)
 		m.successMessage = msg.message + "\n\n"
 		return m, tea.Quit
 
@@ -86,6 +87,7 @@ func (m progressModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 		if m.provisioningCluster.Status == "error" {
 			errorMessage := createErrorLog(m.provisioningCluster.LastCondition)
+			printLine(errorMessage.message)
 			m.error = errorMessage.message
 			return m, tea.Quit
 		}
@@ -129,3 +131,9 @@ func (m progressModel) View() string {
 
 	return m.successMessage
 }
+
+func printLine(message string) {
+	if isCiExecution {
+		fmt.Fprintln(os.Stdout, message)
+	}
+}
diff --git a/main.go b/main.go
@@ -25,7 +25,8 @@ import (
 func main() {
 	argsWithProg := os.Args
 
-	bubbleTeaBlacklist := []string{"completion", "help", "--help", "-h", "quota", "logs", "--ci"}
+	bubbleTeaBlacklist := []string{"completion", "help", "--help", "-h", "quota", "logs"}
+	isCiExecution := slices.Contains(argsWithProg, "--ci")
 	canRunBubbleTea := true
 
 	for _, arg := range argsWithProg {
@@ -134,7 +135,7 @@ func main() {
 	}
 
 	if canRunBubbleTea {
-		progress.InitializeProgressTerminal()
+		progress.InitializeProgressTerminal(isCiExecution)
 
 		go func() {
 			cmd.Execute()
@@ -143,6 +144,5 @@ func main() {
 		progress.Progress.Run()
 	} else {
 		cmd.Execute()
-		progress.DiableBubbleTeaExecution()
 	}
 }