Merge pull request #102 from fujiwara/fix/go-modernize

go fix (modernize)

Author: fujiwara

filter.go

@@ -60,7 +60,6 @@ func runInternalFilter(ctx context.Context, src io.Reader, title string) (string
 			}
 			var found []string
 			for _, item := range items {
-				item := item
 				if item == input {
 					found = []string{item}
 					break

format.go

@@ -175,12 +175,12 @@ func (t *taskFormatterJSON) AddTask(task types.Task) {
 func (t *taskFormatterJSON) Close() {
 }
 
-func MarshalJSONForAPI(v interface{}, query *gojq.Query) ([]byte, error) {
+func MarshalJSONForAPI(v any, query *gojq.Query) ([]byte, error) {
 	b, err := json.Marshal(v)
 	if err != nil {
 		return nil, err
 	}
-	m := map[string]interface{}{}
+	m := map[string]any{}
 	if err := json.Unmarshal(b, &m); err != nil {
 		return nil, err
 	}
@@ -206,8 +206,8 @@ func MarshalJSONForAPI(v interface{}, query *gojq.Query) ([]byte, error) {
 	}
 }
 
-func UnmarshalJSONForStruct(src []byte, v interface{}) error {
-	m := map[string]interface{}{}
+func UnmarshalJSONForStruct(src []byte, v any) error {
+	m := map[string]any{}
 	if err := json.Unmarshal(src, &m); err != nil {
 		return err
 	}
@@ -233,26 +233,26 @@ func jsonKeyForStruct(s string) string {
 	return strings.ToUpper(s[:1]) + s[1:]
 }
 
-func walkMap(m map[string]interface{}, fn func(string) string) {
+func walkMap(m map[string]any, fn func(string) string) {
 	for key, value := range m {
 		delete(m, key)
 		m[fn(key)] = value
 		switch value := value.(type) {
-		case map[string]interface{}:
+		case map[string]any:
 			walkMap(value, fn)
-		case []interface{}:
+		case []any:
 			walkArray(value, fn)
 		default:
 		}
 	}
 }
 
-func walkArray(a []interface{}, fn func(string) string) {
+func walkArray(a []any, fn func(string) string) {
 	for _, value := range a {
 		switch value := value.(type) {
-		case map[string]interface{}:
+		case map[string]any:
 			walkMap(value, fn)
-		case []interface{}:
+		case []any:
 			walkArray(value, fn)
 		default:
 		}

portforward.go

@@ -17,15 +17,15 @@ import (
 )
 
 type PortforwardOption struct {
-	ID          string  `help:"task ID"`
-	Container   string  `help:"container name"`
-	LocalPort   int     `help:"local port"`
-	RemotePort  int     `help:"remote port"`
-	RemoteHost  string  `help:"remote host"`
-	L           string  `name:"L" help:"short expression of local-port:remote-host:remote-port" short:"L"`
-	Family      *string `help:"task definition family name"`
-	Service     *string `help:"ECS service name"`
-	Public      bool    `help:"bind to all interfaces (0.0.0.0) instead of localhost only"`
+	ID         string  `help:"task ID"`
+	Container  string  `help:"container name"`
+	LocalPort  int     `help:"local port"`
+	RemotePort int     `help:"remote port"`
+	RemoteHost string  `help:"remote host"`
+	L          string  `name:"L" help:"short expression of local-port:remote-host:remote-port" short:"L"`
+	Family     *string `help:"task definition family name"`
+	Service    *string `help:"ECS service name"`
+	Public     bool    `help:"bind to all interfaces (0.0.0.0) instead of localhost only"`
 
 	stdout io.Writer
 	stderr io.Writer
@@ -129,14 +129,14 @@ func (app *Ecsta) RunPortforward(ctx context.Context, opt *PortforwardOption) er
 	if opt.Public {
 		slog.Warn("TCP proxy will bind to all interfaces (0.0.0.0) - ensure proper network security", "port", opt.LocalPort)
 		slog.Info("Session Manager Plugin will use port", "port", ssmLocalPort)
-		
+
 		// Start TCP proxy in background
 		go func() {
 			if err := app.startTCPProxyToLocalhost(ctx, "0.0.0.0", opt.LocalPort, ssmLocalPort); err != nil {
 				slog.Error("TCP proxy failed", "error", err)
 			}
 		}()
-		
+
 		// Wait a bit for proxy to start
 		time.Sleep(200 * time.Millisecond)
 	}
@@ -194,7 +194,7 @@ func (app *Ecsta) handleProxyConnection(ctx context.Context, clientConn net.Conn
 	// Start bidirectional copy with context cancellation
 	var wg sync.WaitGroup
 	done := make(chan struct{})
-	
+
 	wg.Add(2)
 
 	// Copy from client to backend
@@ -232,4 +232,3 @@ func (app *Ecsta) handleProxyConnection(ctx context.Context, clientConn net.Conn
 		wg.Wait()
 	}
 }
-

portforward_integration_test.go

@@ -26,9 +26,7 @@ func TestTCPProxyToLocalhost(t *testing.T) {
 	backendCtx, backendCancel := context.WithCancel(context.Background())
 	defer backendCancel()
 
-	backendWg.Add(1)
-	go func() {
-		defer backendWg.Done()
+	backendWg.Go(func() {
 		for {
 			select {
 			case <-backendCtx.Done():
@@ -63,7 +61,7 @@ func TestTCPProxyToLocalhost(t *testing.T) {
 				}
 			}(conn)
 		}
-	}()
+	})
 
 	// Get a different port for proxy frontend
 	proxyListener, err := net.Listen("tcp", "0.0.0.0:0")
@@ -79,14 +77,12 @@ func TestTCPProxyToLocalhost(t *testing.T) {
 	defer cancel()
 
 	var proxyWg sync.WaitGroup
-	proxyWg.Add(1)
-	go func() {
-		defer proxyWg.Done()
+	proxyWg.Go(func() {
 		err := app.startTCPProxyToLocalhost(ctx, "0.0.0.0", proxyPort, backendPort)
 		if err != nil && err != context.DeadlineExceeded && err != context.Canceled {
 			t.Logf("Proxy ended with: %v", err)
 		}
-	}()
+	})
 
 	// Wait a bit for proxy to start
 	time.Sleep(50 * time.Millisecond)
@@ -125,7 +121,7 @@ func TestTCPProxyToLocalhost(t *testing.T) {
 	// Cleanup: cancel contexts and wait for goroutines
 	cancel()
 	backendCancel()
-	
+
 	// Wait for goroutines to finish with timeout
 	done := make(chan struct{})
 	go func() {
@@ -192,11 +188,9 @@ func TestHandleProxyConnection(t *testing.T) {
 
 	// Start handleProxyConnection
 	var proxyWg sync.WaitGroup
-	proxyWg.Add(1)
-	go func() {
-		defer proxyWg.Done()
+	proxyWg.Go(func() {
 		app.handleProxyConnection(proxyCtx, serverConn, backendPort)
-	}()
+	})
 
 	// Test communication
 	testData := "test data"
@@ -233,4 +227,4 @@ func TestHandleProxyConnection(t *testing.T) {
 	case <-time.After(1 * time.Second):
 		t.Log("Warning: proxy goroutine did not finish within timeout")
 	}
-}
+}

portforward_test.go

@@ -109,4 +109,4 @@ func TestPortforwardOption_PublicFlagValidation(t *testing.T) {
 			}
 		})
 	}
-}
+}