Add timeout to container stop operations (#121)

gtsiolis · web-flow · commit f28e1c4a7dcb · 2026-03-17T17:09:20.000+01:00
diff --git a/internal/container/stop.go b/internal/container/stop.go
@@ -3,27 +3,36 @@ package container
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/localstack/lstk/internal/config"
 	"github.com/localstack/lstk/internal/output"
 	"github.com/localstack/lstk/internal/runtime"
 )
 
 func Stop(ctx context.Context, rt runtime.Runtime, sink output.Sink, containers []config.ContainerConfig) error {
+	const stopTimeout = 30 * time.Second
+
 	for _, c := range containers {
 		name := c.Name()
-		running, err := rt.IsRunning(ctx, name)
+
+		checkCtx, checkCancel := context.WithTimeout(ctx, 5*time.Second)
+		running, err := rt.IsRunning(checkCtx, name)
+		checkCancel()
 		if err != nil {
 			return fmt.Errorf("checking %s running: %w", name, err)
 		}
 		if !running {
 			return fmt.Errorf("LocalStack is not running")
 		}
 		output.EmitSpinnerStart(sink, "Stopping LocalStack...")
-		if err := rt.Stop(ctx, name); err != nil {
+		stopCtx, stopCancel := context.WithTimeout(ctx, stopTimeout)
+		if err := rt.Stop(stopCtx, name); err != nil {
+			stopCancel()
 			output.EmitSpinnerStop(sink)
 			return fmt.Errorf("failed to stop LocalStack: %w", err)
 		}
+		stopCancel()
 		output.EmitSpinnerStop(sink)
 		output.EmitSuccess(sink, "LocalStack stopped")
 	}
