Refactor config profile command

Author: gtsiolis

cmd/config.go

@@ -4,11 +4,9 @@ import (
 	"fmt"
 
 	"github.com/localstack/lstk/internal/config"
-	"github.com/localstack/lstk/internal/ui"
 	"github.com/localstack/lstk/internal/env"
-	"github.com/localstack/lstk/internal/endpoint"
-	"github.com/localstack/lstk/internal/output"
 	"github.com/localstack/lstk/internal/telemetry"
+	"github.com/localstack/lstk/internal/ui"
 	"github.com/spf13/cobra"
 )
 
@@ -33,27 +31,11 @@ func newConfigProfileCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
 				return fmt.Errorf("failed to get config: %w", err)
 			}
 
-			var awsContainer *config.ContainerConfig
-			for i := range appConfig.Containers {
-				if appConfig.Containers[i].Type == config.EmulatorAWS {
-					awsContainer = &appConfig.Containers[i]
-					break
-				}
-			}
-			if awsContainer == nil {
-				return fmt.Errorf("no aws emulator configured")
-			}
-
-			resolvedHost, dnsOK := endpoint.ResolveHost(awsContainer.Port, cfg.LocalStackHost)
-			if !dnsOK {
-				output.EmitNote(output.NewPlainSink(cmd.OutOrStdout()), `Could not resolve "localhost.localstack.cloud" - your system may have DNS rebind protection enabled. Using 127.0.0.1 as the endpoint.`)
-			}
-
 			if !isInteractiveMode(cfg) {
 				return fmt.Errorf("config profile requires an interactive terminal")
 			}
 
-			return ui.RunAWSProfileSetup(cmd.Context(), resolvedHost)
+			return ui.RunConfigProfile(cmd.Context(), appConfig.Containers, cfg.LocalStackHost)
 		}),
 	}
 }

internal/awsconfig/awsconfig.go

@@ -11,6 +11,7 @@ import (
 
 	"gopkg.in/ini.v1"
 
+	"github.com/localstack/lstk/internal/config"
 	"github.com/localstack/lstk/internal/endpoint"
 	"github.com/localstack/lstk/internal/output"
 )
@@ -245,6 +246,27 @@ func NotifyIfMissing(ctx context.Context, sink output.Sink, interactive bool, re
 	return nil
 }
 
+// RunProfileSetup runs the AWS profile setup flow: resolves the host, checks DNS,
+// verifies interactive mode, and runs the TUI if all checks pass.
+// Returns an error if no AWS container is configured or if not running in interactive mode.
+func RunProfileSetup(ctx context.Context, sink output.Sink, containers []config.ContainerConfig, localStackHost string, interactive bool) error {
+	awsContainer := config.GetAWSContainer(containers)
+	if awsContainer == nil {
+		return fmt.Errorf("no aws emulator configured")
+	}
+
+	resolvedHost, dnsOK := endpoint.ResolveHost(awsContainer.Port, localStackHost)
+	if !dnsOK {
+		output.EmitNote(sink, `Could not resolve "localhost.localstack.cloud" - your system may have DNS rebind protection enabled. Using 127.0.0.1 as the endpoint.`)
+	}
+
+	if !interactive {
+		return fmt.Errorf("config profile requires an interactive terminal")
+	}
+
+	return Setup(ctx, sink, resolvedHost)
+}
+
 // Setup checks for the localstack AWS profile and prompts to create or update it if needed.
 // resolvedHost must be a host:port string (e.g. "localhost.localstack.cloud:4566").
 func Setup(ctx context.Context, sink output.Sink, resolvedHost string) error {

internal/config/containers.go

@@ -138,3 +138,14 @@ func (c *ContainerConfig) ProductName() (string, error) {
 	}
 	return productName, nil
 }
+
+// GetAWSContainer returns the AWS container config from the list of containers.
+// Returns nil if no AWS container is configured.
+func GetAWSContainer(containers []ContainerConfig) *ContainerConfig {
+	for i := range containers {
+		if containers[i].Type == EmulatorAWS {
+			return &containers[i]
+		}
+	}
+	return nil
+}

internal/ui/run_awsconfig.go

@@ -7,9 +7,50 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/localstack/lstk/internal/awsconfig"
+	"github.com/localstack/lstk/internal/config"
 	"github.com/localstack/lstk/internal/output"
 )
 
+// RunConfigProfile runs the AWS profile setup flow with TUI output.
+// It resolves the host from the AWS container config and runs the setup.
+func RunConfigProfile(parentCtx context.Context, containers []config.ContainerConfig, localStackHost string) error {
+	ctx, cancel := context.WithCancel(parentCtx)
+	defer cancel()
+
+	app := NewApp("", "", "", cancel, withoutHeader())
+	p := tea.NewProgram(app, tea.WithInput(os.Stdin), tea.WithOutput(os.Stdout))
+	runErrCh := make(chan error, 1)
+
+	go func() {
+		err := awsconfig.RunProfileSetup(ctx, output.NewTUISink(programSender{p: p}), containers, localStackHost, true)
+		runErrCh <- err
+		if err != nil && !errors.Is(err, context.Canceled) {
+			p.Send(runErrMsg{err: err})
+			return
+		}
+		p.Send(runDoneMsg{})
+	}()
+
+	model, err := p.Run()
+	if err != nil {
+		return err
+	}
+
+	if app, ok := model.(App); ok && app.Err() != nil {
+		return output.NewSilentError(app.Err())
+	}
+
+	runErr := <-runErrCh
+	if runErr != nil && !errors.Is(runErr, context.Canceled) {
+		return runErr
+	}
+
+	return nil
+}
+
+// RunAWSProfileSetup runs the AWS profile setup flow with TUI output.
+// resolvedHost must be a host:port string (e.g. "localhost.localstack.cloud:4566").
+// Deprecated: Use RunConfigProfile instead, which accepts container config and resolves the host.
 func RunAWSProfileSetup(parentCtx context.Context, resolvedHost string) error {
 	ctx, cancel := context.WithCancel(parentCtx)
 	defer cancel()