address comments

Author: carole-lavillonniere

Makefile

@@ -21,7 +21,7 @@ test:
 test-integration: $(BUILD_DIR)/$(BINARY_NAME)
 	@JUNIT=""; [ -n "$$CREATE_JUNIT_REPORT" ] && JUNIT="--junitfile ../../test-integration-results.xml"; \
 	if [ "$$(uname)" = "Darwin" ]; then \
-		cd test/integration && KEYRING=file go run gotest.tools/gotestsum@latest --format testdox $$JUNIT -- -count=1 ./...; \
+		cd test/integration && LOCALSTACK_KEYRING=file go run gotest.tools/gotestsum@latest --format testdox $$JUNIT -- -count=1 ./...; \
 	else \
 		cd test/integration && go run gotest.tools/gotestsum@latest --format testdox $$JUNIT -- -count=1 ./...; \
 	fi

env.example

@@ -8,4 +8,4 @@ export LOCALSTACK_API_ENDPOINT=https://api.staging.aws.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
+# export LOCALSTACK_KEYRING=file

internal/auth/auth_test.go

@@ -7,15 +7,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/localstack/lstk/internal/env"
 	"github.com/localstack/lstk/internal/output"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 )
 
 func TestMain(m *testing.M) {
 	_ = os.Unsetenv("LOCALSTACK_AUTH_TOKEN")
-	env.Init()
 	m.Run()
 }
 

internal/auth/token_storage.go

@@ -45,7 +45,7 @@ func newAuthTokenStorage() (*authTokenStorage, error) {
 		},
 	}
 
-	// Force file backend if KEYRING env var is set to "file"
+	// Force file backend if LOCALSTACK_KEYRING env var is set to "file"
 	if env.Vars.Keyring == "file" {
 		keyringConfig.AllowedBackends = []keyring.BackendType{keyring.FileBackend}
 	}

internal/env/env.go

@@ -13,7 +13,7 @@ type Env struct {
 	Keyring     string
 }
 
-var Vars *Env
+var Vars = &Env{}
 
 // Init initializes environment variable configuration
 func Init() {

test/integration/main_test.go

@@ -61,7 +61,7 @@ func TestMain(m *testing.M) {
 		},
 	}
 
-	// Force file backend if KEYRING env var is set to "file"
+	// Force file backend if LOCALSTACK_KEYRING env var is set to "file"
 	if env.Get(env.Keyring) == "file" {
 		keyringConfig.AllowedBackends = []keyring.BackendType{keyring.FileBackend}
 	}