Update direction

Author: gtsiolis

cmd/config.go

@@ -23,7 +23,7 @@ func newConfigCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
 func newConfigProfileCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
 	return &cobra.Command{
 		Use:     "profile",
-		Short:   "Set up the LocalStack AWS profile",
+		Short:   "Deprecated: use 'lstk setup aws' instead",
 		PreRunE: initConfig,
 		RunE: commandWithTelemetry("config profile", tel, func(cmd *cobra.Command, args []string) error {
 			appConfig, err := config.Get()

cmd/root.go

@@ -59,6 +59,7 @@ func NewRootCmd(cfg *env.Env, tel *telemetry.Client, logger log.Logger) *cobra.C
 		newLogoutCmd(cfg, tel, logger),
 		newStatusCmd(cfg, tel),
 		newLogsCmd(cfg, tel),
+		newSetupCmd(cfg, tel),
 		newConfigCmd(cfg, tel),
 		newUpdateCmd(cfg, tel),
 	)

cmd/setup.go

@@ -0,0 +1,42 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/localstack/lstk/internal/config"
+	"github.com/localstack/lstk/internal/env"
+	"github.com/localstack/lstk/internal/telemetry"
+	"github.com/localstack/lstk/internal/ui"
+	"github.com/spf13/cobra"
+)
+
+func newSetupCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "setup",
+		Short: "Set up emulator CLI integration",
+		Long:  "Set up emulator CLI integration (e.g., AWS profile, Azure config).",
+	}
+	cmd.AddCommand(newSetupAWSCmd(cfg, tel))
+	return cmd
+}
+
+func newSetupAWSCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
+	return &cobra.Command{
+		Use:     "aws",
+		Short:   "Set up the LocalStack AWS profile",
+		Long:    "Set up the LocalStack AWS profile in ~/.aws/config and ~/.aws/credentials for use with AWS CLI and SDKs.",
+		PreRunE: initConfig,
+		RunE: commandWithTelemetry("setup aws", tel, func(cmd *cobra.Command, args []string) error {
+			appConfig, err := config.Get()
+			if err != nil {
+				return fmt.Errorf("failed to get config: %w", err)
+			}
+
+			if !isInteractiveMode(cfg) {
+				return fmt.Errorf("setup aws requires an interactive terminal")
+			}
+
+			return ui.RunConfigProfile(cmd.Context(), appConfig.Containers, cfg.LocalStackHost)
+		}),
+	}
+}

internal/awsconfig/awsconfig.go

@@ -11,7 +11,6 @@ import (
 
 	"gopkg.in/ini.v1"
 
-	"github.com/localstack/lstk/internal/config"
 	"github.com/localstack/lstk/internal/endpoint"
 	"github.com/localstack/lstk/internal/output"
 )
@@ -221,9 +220,10 @@ func profilePresence() (configOK, credsOK bool, err error) {
 	return configOK, credsOK, nil
 }
 
-// NotifyIfMissing checks for the LocalStack AWS profile and emits a note when it is incomplete.
+// EnsureProfile checks for the LocalStack AWS profile and either emits a note when it is incomplete
+// or triggers the interactive setup flow.
 // resolvedHost must be a host:port string (e.g. "localhost.localstack.cloud:4566").
-func NotifyIfMissing(ctx context.Context, sink output.Sink, interactive bool, resolvedHost string) error {
+func EnsureProfile(ctx context.Context, sink output.Sink, interactive bool, resolvedHost string) error {
 	status, err := needsProfileSetup(resolvedHost)
 	if err != nil {
 		output.EmitWarning(sink, fmt.Sprintf("could not check AWS profile: %v", err))
@@ -246,27 +246,6 @@ 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/container/start.go

@@ -184,7 +184,7 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
 	// Maps emulator types to their post-start setup functions.
 	// Add an entry here to run setup for a new emulator type (e.g. Azure, Snowflake).
 	setups := map[config.EmulatorType]postStartSetupFunc{
-		config.EmulatorAWS: awsconfig.NotifyIfMissing,
+		config.EmulatorAWS: awsconfig.EnsureProfile,
 	}
 	return runPostStartSetups(ctx, sink, opts.Containers, interactive, opts.LocalStackHost, opts.WebAppURL, setups)
 }

internal/ui/run_awsconfig.go

@@ -3,55 +3,29 @@ package ui
 import (
 	"context"
 	"errors"
+	"fmt"
 	"os"
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/localstack/lstk/internal/awsconfig"
 	"github.com/localstack/lstk/internal/config"
+	"github.com/localstack/lstk/internal/endpoint"
 	"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
+	awsContainer := config.GetAWSContainer(containers)
+	if awsContainer == nil {
+		return fmt.Errorf("no aws emulator configured")
 	}
 
-	if app, ok := model.(App); ok && app.Err() != nil {
-		return output.NewSilentError(app.Err())
+	resolvedHost, dnsOK := endpoint.ResolveHost(awsContainer.Port, localStackHost)
+	if !dnsOK {
+		output.EmitNote(output.NewTUISink(programSender{}), `Could not resolve "localhost.localstack.cloud" - your system may have DNS rebind protection enabled. Using 127.0.0.1 as the endpoint.`)
 	}
 
-	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()
 
@@ -85,3 +59,4 @@ func RunAWSProfileSetup(parentCtx context.Context, resolvedHost string) error {
 
 	return nil
 }
+