feedback

Signed-off-by: Adrian Cole <[email protected]>

Author: codefromthecrypt

internal/infrastructure/host/proxy_infra.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"sync"
 
 	func_e "github.com/tetratelabs/func-e"
 	"github.com/tetratelabs/func-e/api"
@@ -34,16 +35,19 @@ type proxyContext struct {
 
 // Close implements the Manager interface.
 func (i *Infra) Close() error {
-	// Collect all proxy names first to avoid holding locks during stopEnvoy calls
-	var names []string
-	i.proxyContextMap.Range(func(key, value interface{}) bool {
-		names = append(names, key.(string))
+	var wg sync.WaitGroup
+
+	// Stop any Envoy subprocesses in parallel
+	i.proxyContextMap.Range(func(key, value any) bool {
+		wg.Add(1)
+		go func(name string) {
+			defer wg.Done()
+			i.stopEnvoy(name)
+		}(key.(string))
 		return true
 	})
 
-	for _, name := range names {
-		i.stopEnvoy(name)
-	}
+	wg.Wait()
 	return nil
 }
 

internal/infrastructure/host/proxy_infra_test.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"path"
 	"testing"
+	"testing/synctest"
 	"time"
 
 	"github.com/stretchr/testify/require"
@@ -155,9 +156,11 @@ func TestInfra_Close(t *testing.T) {
 	})
 	require.Equal(t, 3, count, "expected 3 proxies to be running")
 
-	// Close should stop all proxies
-	err = i.Close()
-	require.NoError(t, err)
+	// Close should stop all proxies and not leak goroutines
+	synctest.Test(t, func(t *testing.T) {
+		err := i.Close()
+		require.NoError(t, err)
+	})
 
 	// Verify all proxies are stopped
 	count = 0