sanity check lint rules

sreya · sreya · commit 744693f23bef · 2024-11-25T23:51:58.000Z
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -30,7 +30,6 @@ import (
 
 	"cdr.dev/slog"
 
-	"github.com/coder/coder/v2/agent/agentexec"
 	"github.com/coder/coder/v2/agent/usershell"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/pty"
@@ -726,10 +725,11 @@ func (s *Server) CreateCommand(ctx context.Context, script string, env []string)
 		}
 	}
 
-	cmd, err := agentexec.PTYCommandContext(ctx, name, args...)
-	if err != nil {
-		return nil, xerrors.Errorf("pty command context: %w", err)
-	}
+	// cmd, err := agentexec.PTYCommandContext(ctx, name, args...)
+	// if err != nil {
+	// 	return nil, xerrors.Errorf("pty command context: %w", err)
+	// }
+	cmd := pty.CommandContext(ctx, name, args...)
 	cmd.Dir = s.config.WorkingDirectory()
 
 	// If the metadata directory doesn't exist, we run the command
diff --git a/agent/reconnectingpty/screen.go b/agent/reconnectingpty/screen.go
@@ -9,6 +9,7 @@ import (
 	"io"
 	"net"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -333,21 +334,21 @@ func (rpty *screenReconnectingPTY) sendCommand(ctx context.Context, command stri
 	run := func() (bool, error) {
 		var stdout bytes.Buffer
 		//nolint:gosec
-		cmd, err := agentexec.CommandContext(ctx, "screen",
+		cmd := exec.CommandContext(ctx, "screen",
 			// -x targets an attached session.
 			"-x", rpty.id,
 			// -c is the flag for the config file.
 			"-c", rpty.configFile,
 			// -X runs a command in the matching session.
 			"-X", command,
 		)
-		if err != nil {
-			return false, xerrors.Errorf("command context: %w", err)
-		}
+		// if err != nil {
+		// 	return false, xerrors.Errorf("command context: %w", err)
+		// }
 		cmd.Env = append(rpty.command.Env, "TERM=xterm-256color")
 		cmd.Dir = rpty.command.Dir
 		cmd.Stdout = &stdout
-		err = cmd.Run()
+		err := cmd.Run()
 		if err == nil {
 			return true, nil
 		}
