Forward LOCALSTACK_* env variables from host to emulator container

Author: gtsiolis

internal/container/start.go

@@ -96,6 +96,13 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
 
 	tel := opts.Telemetry
 
+	var hostEnv []string
+	for _, e := range os.Environ() {
+		if strings.HasPrefix(e, "CI=") || (strings.HasPrefix(e, "LOCALSTACK_") && !strings.HasPrefix(e, "LOCALSTACK_AUTH_TOKEN=")) {
+			hostEnv = append(hostEnv, e)
+		}
+	}
+
 	containers := make([]runtime.ContainerConfig, len(opts.Containers))
 	for i, c := range opts.Containers {
 		image, err := c.Image()
@@ -128,10 +135,7 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
 			"MAIN_CONTAINER_NAME="+containerName,
 		)
 
-		// Forward CI environment variable if set on the host
-		if ci := os.Getenv("CI"); ci != "" {
-			env = append(env, "CI="+ci)
-		}
+		env = append(env, hostEnv...)
 
 		var binds []runtime.BindMount
 		if socketPath := rt.SocketPath(); socketPath != "" {

internal/container/start_test.go

@@ -68,26 +68,21 @@ func TestServicePortRange_ReturnsExpectedPorts(t *testing.T) {
 }
 
 func TestForwardCIEnvVariable(t *testing.T) {
-	originalCI := os.Getenv("CI")
-	defer os.Setenv("CI", originalCI)
-
 	tests := []struct {
-		name       string
-		ciValue    string
-		wantCI     bool
-		wantCIVals []string
+		name    string
+		ciValue string
+		wantCI  bool
 	}{
-		{"CI=true", "true", true, []string{"true"}},
-		{"CI=1", "1", true, []string{"1"}},
-		{"CI=false", "false", true, []string{"false"}},
-		{"CI unset", "", false, nil},
+		{"CI=true", "true", true},
+		{"CI=1", "1", true},
+		{"CI=false", "false", true},
+		{"CI unset", "", false},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			os.Setenv("CI", tt.ciValue)
+			t.Setenv("CI", tt.ciValue)
 
-			// Simulate the env building logic from start.go:136-139
 			env := []string{"LOCALSTACK_AUTH_TOKEN=test"}
 			if ci := os.Getenv("CI"); ci != "" {
 				env = append(env, "CI="+ci)

test/integration/start_test.go

@@ -207,7 +207,7 @@ func TestStartCommandSetsUpContainerCorrectly(t *testing.T) {
 	t.Run("http health endpoint", func(t *testing.T) {
 		resp, err := http.Get("http://localhost.localstack.cloud:4566/_localstack/health")
 		require.NoError(t, err)
-		defer resp.Body.Close()
+		defer func() { _ = resp.Body.Close() }()
 		assert.Equal(t, http.StatusOK, resp.StatusCode)
 	})
 
@@ -221,7 +221,7 @@ func TestStartCommandSetsUpContainerCorrectly(t *testing.T) {
 		}
 		resp, err := client.Get("https://localhost.localstack.cloud/_localstack/health")
 		require.NoError(t, err)
-		defer resp.Body.Close()
+		defer func() { _ = resp.Body.Close() }()
 		assert.Equal(t, http.StatusOK, resp.StatusCode)
 	})
 }