Inline host env filtering, remove unnecessary abstraction

Author: gtsiolis

internal/container/start.go

@@ -96,7 +96,12 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
 
 	tel := opts.Telemetry
 
-	hostEnv := collectHostEnv()
+	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 {
@@ -230,16 +235,6 @@ func emitPostStartPointers(sink output.Sink, resolvedHost, webAppURL string) {
 	output.EmitSecondary(sink, tips[rand.IntN(len(tips))])
 }
 
-func collectHostEnv() []string {
-	var env []string
-	for _, e := range os.Environ() {
-		if strings.HasPrefix(e, "CI=") || (strings.HasPrefix(e, "LOCALSTACK_") && !strings.HasPrefix(e, "LOCALSTACK_AUTH_TOKEN=")) {
-			env = append(env, e)
-		}
-	}
-	return env
-}
-
 func pullImages(ctx context.Context, rt runtime.Runtime, sink output.Sink, tel *telemetry.Client, containers []runtime.ContainerConfig) (map[string]bool, error) {
 	pulled := make(map[string]bool, len(containers))
 	for _, c := range containers {

internal/container/start_test.go

@@ -5,8 +5,6 @@ import (
 	"context"
 	"errors"
 	"io"
-	"os"
-	"strings"
 	"testing"
 
 	"github.com/localstack/lstk/internal/log"
@@ -67,59 +65,3 @@ func TestServicePortRange_ReturnsExpectedPorts(t *testing.T) {
 	assert.Equal(t, "4559", ports[50].HostPort)
 }
 
-func TestCollectHostEnv_ForwardsCIVariable(t *testing.T) {
-	tests := []struct {
-		name    string
-		setup   func(t *testing.T)
-		wantCI  bool
-		ciValue string
-	}{
-		{
-			name:    "CI=true",
-			setup:   func(t *testing.T) { t.Setenv("CI", "true") },
-			wantCI:  true,
-			ciValue: "true",
-		},
-		{
-			name:    "CI=1",
-			setup:   func(t *testing.T) { t.Setenv("CI", "1") },
-			wantCI:  true,
-			ciValue: "1",
-		},
-		{
-			name:    "CI=false",
-			setup:   func(t *testing.T) { t.Setenv("CI", "false") },
-			wantCI:  true,
-			ciValue: "false",
-		},
-		{
-			name: "CI unset",
-			setup: func(t *testing.T) {
-				original, wasSet := os.LookupEnv("CI")
-				require.NoError(t, os.Unsetenv("CI"))
-				t.Cleanup(func() {
-					if wasSet {
-						require.NoError(t, os.Setenv("CI", original))
-					}
-				})
-			},
-			wantCI: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.setup(t)
-
-			env := collectHostEnv()
-
-			if tt.wantCI {
-				assert.Contains(t, env, "CI="+tt.ciValue, "CI environment variable should be forwarded")
-			} else {
-				for _, e := range env {
-					assert.False(t, strings.HasPrefix(e, "CI="), "CI should not be forwarded when unset")
-				}
-			}
-		})
-	}
-}