add env vars struct

Author: carole-lavillonniere

cmd/root.go

@@ -8,6 +8,7 @@ import (
 	"github.com/localstack/lstk/internal/api"
 	"github.com/localstack/lstk/internal/config"
 	"github.com/localstack/lstk/internal/container"
+	"github.com/localstack/lstk/internal/env"
 	"github.com/localstack/lstk/internal/output"
 	"github.com/localstack/lstk/internal/runtime"
 	"github.com/spf13/cobra"
@@ -18,6 +19,7 @@ var rootCmd = &cobra.Command{
 	Short: "LocalStack CLI",
 	Long:  "lstk is the command-line interface for LocalStack.",
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		env.Init()
 		return config.Init()
 	},
 	Run: func(cmd *cobra.Command, args []string) {

env.example

@@ -1,7 +1,11 @@
+# Authentication token (optional - will trigger device flow login if not set)
 export LOCALSTACK_AUTH_TOKEN=ls-...
 
-# Force file-based keyring backend (instead of system keychain)
-# export KEYRING=file
-#
+# API endpoint (defaults to https://api.localstack.cloud)
 export LOCALSTACK_API_ENDPOINT=https://api.staging.aws.localstack.cloud
+
+# Web app URL (defaults to https://app.localstack.cloud)
 export LOCALSTACK_WEB_APP_URL=https://app.staging.aws.localstack.cloud
+
+# Force file-based keyring backend instead of system keychain (optional)
+# export KEYRING=file

internal/api/client.go

@@ -7,8 +7,9 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"os"
 	"time"
+
+	"github.com/localstack/lstk/internal/env"
 )
 
 type PlatformAPI interface {
@@ -65,12 +66,8 @@ type PlatformClient struct {
 }
 
 func NewPlatformClient() *PlatformClient {
-	baseURL := os.Getenv("LOCALSTACK_API_ENDPOINT")
-	if baseURL == "" {
-		baseURL = "https://api.localstack.cloud"
-	}
 	return &PlatformClient{
-		baseURL:    baseURL,
+		baseURL:    env.Vars.APIEndpoint,
 		httpClient: &http.Client{Timeout: 30 * time.Second},
 	}
 }

internal/auth/auth.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 
 	"github.com/99designs/keyring"
 	"github.com/localstack/lstk/internal/api"
+	"github.com/localstack/lstk/internal/env"
 	"github.com/localstack/lstk/internal/output"
 )
 
@@ -35,7 +35,7 @@ func (a *Auth) GetToken(ctx context.Context) (string, error) {
 		return token, nil
 	}
 
-	if token := os.Getenv("LOCALSTACK_AUTH_TOKEN"); token != "" {
+	if token := env.Vars.AuthToken; token != "" {
 		return token, nil
 	}
 

internal/auth/login.go

@@ -11,11 +11,11 @@ import (
 	"os"
 
 	"github.com/localstack/lstk/internal/api"
+	"github.com/localstack/lstk/internal/env"
 	"github.com/localstack/lstk/internal/output"
 	"github.com/pkg/browser"
 )
 
-const webAppURL = "https://app.localstack.cloud"
 const loginCallbackURL = "127.0.0.1:45678"
 
 type LoginProvider interface {
@@ -121,11 +121,7 @@ func (b *browserLogin) Login(ctx context.Context) (string, error) {
 }
 
 func getWebAppURL() string {
-	// allows overriding the URL for testing
-	if url := os.Getenv("LOCALSTACK_WEB_APP_URL"); url != "" {
-		return url
-	}
-	return webAppURL
+	return env.Vars.WebAppURL
 }
 
 func (b *browserLogin) completeDeviceFlow(ctx context.Context, authReq *api.AuthRequest) (string, error) {

internal/auth/token_storage.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/99designs/keyring"
 	"github.com/localstack/lstk/internal/config"
+	"github.com/localstack/lstk/internal/env"
 )
 
 const (
@@ -45,7 +46,7 @@ func newAuthTokenStorage() (*authTokenStorage, error) {
 	}
 
 	// Force file backend if KEYRING env var is set to "file"
-	if os.Getenv("KEYRING") == "file" {
+	if env.Vars.Keyring == "file" {
 		keyringConfig.AllowedBackends = []keyring.BackendType{keyring.FileBackend}
 	}
 

internal/env/env.go

@@ -0,0 +1,33 @@
+package env
+
+import (
+	"strings"
+
+	"github.com/spf13/viper"
+)
+
+type Env struct {
+	AuthToken   string
+	APIEndpoint string
+	WebAppURL   string
+	Keyring     string
+}
+
+var Vars *Env
+
+// Init initializes environment variable configuration
+func Init() {
+	viper.SetEnvPrefix("LOCALSTACK")
+	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	viper.AutomaticEnv()
+
+	viper.SetDefault("api_endpoint", "https://api.localstack.cloud")
+	viper.SetDefault("web_app_url", "https://app.localstack.cloud")
+
+	Vars = &Env{
+		AuthToken:   viper.GetString("auth_token"),
+		APIEndpoint: viper.GetString("api_endpoint"),
+		WebAppURL:   viper.GetString("web_app_url"),
+		Keyring:     viper.GetString("keyring"),
+	}
+}

test/integration/main_test.go

@@ -81,6 +81,7 @@ func requireDocker(t *testing.T) {
 		t.Skip("Docker is not available")
 	}
 	// Skip Docker tests on Windows (GitHub Actions doesn't support Linux containers)
+	// Note: CI env var is not in config.GetEnv() as it's a standard CI environment variable
 	if runtime.GOOS == "windows" && os.Getenv("CI") != "" {
 		t.Skip("Docker tests not supported on Windows CI (nested virtualization not available)")
 	}