address comments

carole-lavillonniere · carole-lavillonniere · commit 895fac8dc205 · 2026-03-04T08:56:17.000+01:00
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -57,6 +57,7 @@ Environment variables:
 - Do not remove comments added by someone else than yourself.
 - Errors returned by functions should always be checked unless in test files.
 - Terminology: in user-facing CLI/help/docs, prefer `emulator` over `container`/`runtime`; use `container`/`runtime` only for internal implementation details.
+- Avoid package-level global variables. Use constructor functions that return fresh instances and inject dependencies explicitly. This keeps packages testable in isolation and prevents shared mutable state between tests.
 
 # Testing
 
diff --git a/internal/auth/token_storage.go b/internal/auth/token_storage.go
@@ -32,7 +32,7 @@ type authTokenStorage struct {
 	ring keyring.Keyring
 }
 
-func NewTokenStorage(forceFileBackend bool) (AuthTokenStorage, error) {
+func NewTokenStorage(forceFileKeyring bool) (AuthTokenStorage, error) {
 	configDir, err := config.ConfigDir()
 	if err != nil {
 		return nil, err
@@ -46,7 +46,7 @@ func NewTokenStorage(forceFileBackend bool) (AuthTokenStorage, error) {
 		},
 	}
 
-	if forceFileBackend {
+	if forceFileKeyring {
 		keyringConfig.AllowedBackends = []keyring.BackendType{keyring.FileBackend}
 	}
 
diff --git a/internal/container/start.go b/internal/container/start.go
@@ -17,13 +17,13 @@ import (
 	"github.com/localstack/lstk/internal/runtime"
 )
 
-func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, platformClient api.PlatformAPI, authToken string, forceFileBackend bool, webAppURL string, interactive bool) error {
+func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, platformClient api.PlatformAPI, authToken string, forceFileKeyring bool, webAppURL string, interactive bool) error {
 	if err := rt.IsHealthy(ctx); err != nil {
 		rt.EmitUnhealthyError(sink, err)
 		return output.NewSilentError(fmt.Errorf("runtime not healthy: %w", err))
 	}
 
-	tokenStorage, err := auth.NewTokenStorage(forceFileBackend)
+	tokenStorage, err := auth.NewTokenStorage(forceFileKeyring)
 	if err != nil {
 		return fmt.Errorf("failed to initialize token storage: %w", err)
 	}
diff --git a/internal/ui/run.go b/internal/ui/run.go
@@ -26,7 +26,7 @@ func (s programSender) Send(msg any) {
 	s.p.Send(msg)
 }
 
-func Run(parentCtx context.Context, rt runtime.Runtime, version string, platformClient api.PlatformAPI, authToken string, forceFileBackend bool, webAppURL string) error {
+func Run(parentCtx context.Context, rt runtime.Runtime, version string, platformClient api.PlatformAPI, authToken string, forceFileKeyring bool, webAppURL string) error {
 	ctx, cancel := context.WithCancel(parentCtx)
 	defer cancel()
 
@@ -47,7 +47,7 @@ func Run(parentCtx context.Context, rt runtime.Runtime, version string, platform
 	go func() {
 		var err error
 		defer func() { runErrCh <- err }()
-		err = container.Start(ctx, rt, output.NewTUISink(programSender{p: p}), platformClient, authToken, forceFileBackend, webAppURL, true)
+		err = container.Start(ctx, rt, output.NewTUISink(programSender{p: p}), platformClient, authToken, forceFileKeyring, webAppURL, true)
 		if err != nil {
 			if errors.Is(err, context.Canceled) {
 				return
diff --git a/internal/ui/run_login.go b/internal/ui/run_login.go
@@ -11,7 +11,7 @@ import (
 	"github.com/localstack/lstk/internal/output"
 )
 
-func RunLogin(parentCtx context.Context, version string, platformClient api.PlatformAPI, authToken string, forceFileBackend bool, webAppURL string) error {
+func RunLogin(parentCtx context.Context, version string, platformClient api.PlatformAPI, authToken string, forceFileKeyring bool, webAppURL string) error {
 	ctx, cancel := context.WithCancel(parentCtx)
 	defer cancel()
 
@@ -20,7 +20,7 @@ func RunLogin(parentCtx context.Context, version string, platformClient api.Plat
 	runErrCh := make(chan error, 1)
 
 	go func() {
-		tokenStorage, err := auth.NewTokenStorage(forceFileBackend)
+		tokenStorage, err := auth.NewTokenStorage(forceFileKeyring)
 		if err != nil {
 			runErrCh <- err
 			p.Send(runErrMsg{err: err})
diff --git a/internal/ui/run_login_test.go b/internal/ui/run_login_test.go
@@ -181,10 +181,6 @@ func TestLoginFlow_DeviceFlowCancelWithCtrlC(t *testing.T) {
 	mockServer := createMockAPIServer(t, "", false)
 	defer mockServer.Close()
 
-	t.Setenv("LSTK_API_ENDPOINT", mockServer.URL)
-	t.Setenv("LOCALSTACK_AUTH_TOKEN", "")
-	env.Init()
-
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 
@@ -194,11 +190,11 @@ func TestLoginFlow_DeviceFlowCancelWithCtrlC(t *testing.T) {
 
 	tm := teatest.NewTestModel(t, NewApp("test", "", "", cancel), teatest.WithInitialTermSize(120, 40))
 	sender := testModelSender{tm: tm}
-	platformClient := api.NewPlatformClient()
+	platformClient := api.NewPlatformClient(mockServer.URL)
 
 	errCh := make(chan error, 1)
 	go func() {
-		a := auth.New(output.NewTUISink(sender), platformClient, mockStorage, true)
+		a := auth.New(output.NewTUISink(sender), platformClient, mockStorage, "", mockServer.URL, true)
 		_, err := a.GetToken(ctx)
 		errCh <- err
 		if err != nil && !errors.Is(err, context.Canceled) {
diff --git a/internal/ui/run_logout.go b/internal/ui/run_logout.go
@@ -11,7 +11,7 @@ import (
 	"github.com/localstack/lstk/internal/output"
 )
 
-func RunLogout(parentCtx context.Context, platformClient api.PlatformAPI, authToken string, forceFileBackend bool) error {
+func RunLogout(parentCtx context.Context, platformClient api.PlatformAPI, authToken string, forceFileKeyring bool) error {
 	_, cancel := context.WithCancel(parentCtx)
 	defer cancel()
 
@@ -20,7 +20,7 @@ func RunLogout(parentCtx context.Context, platformClient api.PlatformAPI, authTo
 	runErrCh := make(chan error, 1)
 
 	go func() {
-		tokenStorage, err := auth.NewTokenStorage(forceFileBackend)
+		tokenStorage, err := auth.NewTokenStorage(forceFileKeyring)
 		if err != nil {
 			runErrCh <- err
 			p.Send(runErrMsg{err: err})

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ type authTokenStorage struct {`
`32`	`32`	`ring keyring.Keyring`
`33`	`33`	`}`
`34`	`34`
`35`		`-func NewTokenStorage(forceFileBackend bool) (AuthTokenStorage, error) {`
	`35`	`+func NewTokenStorage(forceFileKeyring bool) (AuthTokenStorage, error) {`
`36`	`36`	`configDir, err := config.ConfigDir()`
`37`	`37`	`if err != nil {`
`38`	`38`	`return nil, err`
`@@ -46,7 +46,7 @@ func NewTokenStorage(forceFileBackend bool) (AuthTokenStorage, error) {`
`46`	`46`	`},`
`47`	`47`	`}`
`48`	`48`
`49`		`- if forceFileBackend {`
	`49`	`+ if forceFileKeyring {`
`50`	`50`	`keyringConfig.AllowedBackends = []keyring.BackendType{keyring.FileBackend}`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ import (`
`17`	`17`	`"github.com/localstack/lstk/internal/runtime"`
`18`	`18`	`)`
`19`	`19`
`20`		`-func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, platformClient api.PlatformAPI, authToken string, forceFileBackend bool, webAppURL string, interactive bool) error {`
	`20`	`+func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, platformClient api.PlatformAPI, authToken string, forceFileKeyring bool, webAppURL string, interactive bool) error {`
`21`	`21`	`if err := rt.IsHealthy(ctx); err != nil {`
`22`	`22`	`rt.EmitUnhealthyError(sink, err)`
`23`	`23`	`return output.NewSilentError(fmt.Errorf("runtime not healthy: %w", err))`
`24`	`24`	`}`
`25`	`25`
`26`		`- tokenStorage, err := auth.NewTokenStorage(forceFileBackend)`
	`26`	`+ tokenStorage, err := auth.NewTokenStorage(forceFileKeyring)`
`27`	`27`	`if err != nil {`
`28`	`28`	`return fmt.Errorf("failed to initialize token storage: %w", err)`
`29`	`29`	`}`