avoid disconnected error handling

johnstcn · johnstcn · commit 23bcd23268c9 · 2025-04-17T13:23:10.000+01:00
diff --git a/agent/agentcontainers/containers_dockercli.go b/agent/agentcontainers/containers_dockercli.go
@@ -318,12 +318,14 @@ func runDockerInspect(ctx context.Context, execer agentexec.Execer, ids ...strin
 	err = cmd.Run()
 	stdout = bytes.TrimSpace(stdoutBuf.Bytes())
 	stderr = bytes.TrimSpace(stderrBuf.Bytes())
-	if err != nil && bytes.Contains(stderr, []byte("No such object:")) {
-		// This can happen if a container is deleted between the time we check for its existence and the time we inspect it.
-		return stdout, stderr, nil
+	if err != nil {
+		if bytes.Contains(stderr, []byte("No such object:")) {
+			// This can happen if a container is deleted between the time we check for its existence and the time we inspect it.
+			return stdout, stderr, nil
+		}
+		return stdout, stderr, err
 	}
-
-	return stdout, stderr, err
+	return stdout, stderr, nil
 }
 
 // To avoid a direct dependency on the Docker API, we use the docker CLI
