address PR comments

johnstcn · johnstcn · commit 3d63badaa91e · 2025-04-17T13:00:47.000+01:00
diff --git a/agent/agentcontainers/containers_dockercli.go b/agent/agentcontainers/containers_dockercli.go
@@ -310,24 +310,20 @@ func (dcl *DockerCLILister) List(ctx context.Context) (codersdk.WorkspaceAgentLi
 // runDockerInspect is a helper function that runs `docker inspect` on the given
 // container IDs and returns the parsed output.
 // The stderr output is also returned for logging purposes.
-func runDockerInspect(ctx context.Context, execer agentexec.Execer, ids ...string) (stdout, stderr []byte, retErr error) {
+func runDockerInspect(ctx context.Context, execer agentexec.Execer, ids ...string) (stdout, stderr []byte, err error) {
 	var stdoutBuf, stderrBuf bytes.Buffer
 	cmd := execer.CommandContext(ctx, "docker", append([]string{"inspect"}, ids...)...)
 	cmd.Stdout = &stdoutBuf
 	cmd.Stderr = &stderrBuf
-	err := cmd.Run()
+	err = cmd.Run()
 	stdout = bytes.TrimSpace(stdoutBuf.Bytes())
 	stderr = bytes.TrimSpace(stderrBuf.Bytes())
-	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.
-			retErr = nil
-		} else {
-			retErr = err
-		}
+	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
 	}
 
-	return stdout, stderr, retErr
+	return stdout, stderr, err
 }
 
 // To avoid a direct dependency on the Docker API, we use the docker CLI
diff --git a/agent/agentcontainers/devcontainercli_test.go b/agent/agentcontainers/devcontainercli_test.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -230,9 +229,6 @@ func TestDockerDevcontainerCLI(t *testing.T) {
 	if os.Getenv("CODER_TEST_USE_DOCKER") != "1" {
 		t.Skip("skipping Docker test; set CODER_TEST_USE_DOCKER=1 to run")
 	}
-	if runtime.GOOS != "linux" {
-		t.Skip("Skipping on non-Linux OS")
-	}
 	if _, err := exec.LookPath("devcontainer"); err != nil {
 		t.Fatal("this test requires the devcontainer CLI: npm install -g @devcontainers/cli")
 	}
