Use errdefs.IsNotFound for error checking in stop command

gtsiolis · gtsiolis · commit 1f8e3ebe0654 · 2026-02-11T21:45:01.000+02:00
diff --git a/internal/container/stop.go b/internal/container/stop.go
@@ -3,8 +3,8 @@ package container
 import (
 	"context"
 	"fmt"
-	"strings"
 
+	"github.com/docker/docker/errdefs"
 	"github.com/localstack/lstk/internal/config"
 	"github.com/localstack/lstk/internal/runtime"
 )
@@ -33,11 +33,8 @@ type StopError struct {
 }
 
 func (e *StopError) Error() string {
-	msg := e.Err.Error()
-
-	if strings.Contains(msg, "No such container") || strings.Contains(msg, "not found") {
+	if errdefs.IsNotFound(e.Err) {
 		return fmt.Sprintf("%s is not running", e.Name)
 	}
-
-	return fmt.Sprintf("Failed to stop %s\n%s", e.Name, msg)
+	return fmt.Sprintf("Failed to stop %s\n%s", e.Name, e.Err.Error())
 }

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package container`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`		`- "strings"`
`7`	`6`
	`7`	`+ "github.com/docker/docker/errdefs"`
`8`	`8`	`"github.com/localstack/lstk/internal/config"`
`9`	`9`	`"github.com/localstack/lstk/internal/runtime"`
`10`	`10`	`)`
`@@ -33,11 +33,8 @@ type StopError struct {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (e *StopError) Error() string {`
`36`		`- msg := e.Err.Error()`
`37`		`-`
`38`		`- if strings.Contains(msg, "No such container") \|\| strings.Contains(msg, "not found") {`
	`36`	`+ if errdefs.IsNotFound(e.Err) {`
`39`	`37`	`return fmt.Sprintf("%s is not running", e.Name)`
`40`	`38`	`}`
`41`		`-`
`42`		`- return fmt.Sprintf("Failed to stop %s\n%s", e.Name, msg)`
	`39`	`+ return fmt.Sprintf("Failed to stop %s\n%s", e.Name, e.Err.Error())`
`43`	`40`	`}`