fix: appease linter on darwin (#11154)

spikecurtis · web-flow · commit edeb9bb42abb · 2023-12-12T17:02:28.000+04:00
Fixing up some linting errors that show up on Darwin, but not in CI.
diff --git a/agent/agentproc/proc_other.go b/agent/agentproc/proc_other.go
@@ -7,18 +7,18 @@ import (
 	"github.com/spf13/afero"
 )
 
-func (p *Process) Niceness(sc Syscaller) (int, error) {
+func (*Process) Niceness(Syscaller) (int, error) {
 	return 0, errUnimplemented
 }
 
-func (p *Process) SetNiceness(sc Syscaller, score int) error {
+func (*Process) SetNiceness(Syscaller, int) error {
 	return errUnimplemented
 }
 
-func (p *Process) Cmd() string {
+func (*Process) Cmd() string {
 	return ""
 }
 
-func List(fs afero.Fs, syscaller Syscaller) ([]*Process, error) {
+func List(afero.Fs, Syscaller) ([]*Process, error) {
 	return nil, errUnimplemented
 }
diff --git a/agent/agentproc/syscaller.go b/agent/agentproc/syscaller.go
@@ -10,6 +10,7 @@ type Syscaller interface {
 	Kill(pid int32, sig syscall.Signal) error
 }
 
+// nolint: unused // used on some but no all platforms
 const defaultProcDir = "/proc"
 
 type Process struct {
diff --git a/agent/agentproc/syscaller_other.go b/agent/agentproc/syscaller_other.go
@@ -17,14 +17,14 @@ var errUnimplemented = xerrors.New("unimplemented")
 
 type nopSyscaller struct{}
 
-func (nopSyscaller) SetPriority(pid int32, priority int) error {
+func (nopSyscaller) SetPriority(int32, int) error {
 	return errUnimplemented
 }
 
-func (nopSyscaller) GetPriority(pid int32) (int, error) {
+func (nopSyscaller) GetPriority(int32) (int, error) {
 	return 0, errUnimplemented
 }
 
-func (nopSyscaller) Kill(pid int32, sig syscall.Signal) error {
+func (nopSyscaller) Kill(int32, syscall.Signal) error {
 	return errUnimplemented
 }
diff --git a/agent/agentssh/jetbrainstrack.go b/agent/agentssh/jetbrainstrack.go
@@ -4,10 +4,11 @@ import (
 	"strings"
 	"sync"
 
-	"cdr.dev/slog"
 	"github.com/gliderlabs/ssh"
 	"go.uber.org/atomic"
 	gossh "golang.org/x/crypto/ssh"
+
+	"cdr.dev/slog"
 )
 
 // localForwardChannelData is copied from the ssh package.
diff --git a/agent/agentssh/portinspection_unsupported.go b/agent/agentssh/portinspection_unsupported.go
@@ -2,7 +2,7 @@
 
 package agentssh
 
-func getListeningPortProcessCmdline(port uint32) (string, error) {
+func getListeningPortProcessCmdline(uint32) (string, error) {
 	// We are not worrying about other platforms at the moment because Gateway
 	// only supports Linux anyway.
 	return "", nil
diff --git a/agent/api.go b/agent/api.go
@@ -44,8 +44,11 @@ type listeningPortsHandler struct {
 	ignorePorts   map[int]string
 	cacheDuration time.Duration
 
-	mut   sync.Mutex
+	//nolint: unused  // used on some but not all platforms
+	mut sync.Mutex
+	//nolint: unused  // used on some but not all platforms
 	ports []codersdk.WorkspaceAgentListeningPort
+	//nolint: unused  // used on some but not all platforms
 	mtime time.Time
 }
 
diff --git a/agent/ports_unsupported.go b/agent/ports_unsupported.go
@@ -4,7 +4,7 @@ package agent
 
 import "github.com/coder/coder/v2/codersdk"
 
-func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
+func (*listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
 	// Can't scan for ports on non-linux or non-windows_amd64 systems at the
 	// moment. The UI will not show any "no ports found" message to the user, so
 	// the user won't suspect a thing.
diff --git a/agent/usershell/usershell_darwin.go b/agent/usershell/usershell_darwin.go
@@ -13,6 +13,10 @@ import (
 func Get(username string) (string, error) {
 	// This command will output "UserShell: /bin/zsh" if successful, we
 	// can ignore the error since we have fallback behavior.
+	if !filepath.IsLocal(username) {
+		return "", xerrors.Errorf("username is nonlocal path: %s", username)
+	}
+	//nolint: gosec // input checked above
 	out, _ := exec.Command("dscl", ".", "-read", filepath.Join("/Users", username), "UserShell").Output()
 	s, ok := strings.CutPrefix(string(out), "UserShell: ")
 	if ok {

Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,18 @@ import (`
`7`	`7`	`"github.com/spf13/afero"`
`8`	`8`	`)`
`9`	`9`
`10`		`-func (p *Process) Niceness(sc Syscaller) (int, error) {`
	`10`	`+func (*Process) Niceness(Syscaller) (int, error) {`
`11`	`11`	`return 0, errUnimplemented`
`12`	`12`	`}`
`13`	`13`
`14`		`-func (p *Process) SetNiceness(sc Syscaller, score int) error {`
	`14`	`+func (*Process) SetNiceness(Syscaller, int) error {`
`15`	`15`	`return errUnimplemented`
`16`	`16`	`}`
`17`	`17`
`18`		`-func (p *Process) Cmd() string {`
	`18`	`+func (*Process) Cmd() string {`
`19`	`19`	`return ""`
`20`	`20`	`}`
`21`	`21`
`22`		`-func List(fs afero.Fs, syscaller Syscaller) ([]*Process, error) {`
	`22`	`+func List(afero.Fs, Syscaller) ([]*Process, error) {`
`23`	`23`	`return nil, errUnimplemented`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ type Syscaller interface {`
`10`	`10`	`Kill(pid int32, sig syscall.Signal) error`
`11`	`11`	`}`
`12`	`12`
	`13`	`+// nolint: unused // used on some but no all platforms`
`13`	`14`	`const defaultProcDir = "/proc"`
`14`	`15`
`15`	`16`	`type Process struct {`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ var errUnimplemented = xerrors.New("unimplemented")`
`17`	`17`
`18`	`18`	`type nopSyscaller struct{}`
`19`	`19`
`20`		`-func (nopSyscaller) SetPriority(pid int32, priority int) error {`
	`20`	`+func (nopSyscaller) SetPriority(int32, int) error {`
`21`	`21`	`return errUnimplemented`
`22`	`22`	`}`
`23`	`23`
`24`		`-func (nopSyscaller) GetPriority(pid int32) (int, error) {`
	`24`	`+func (nopSyscaller) GetPriority(int32) (int, error) {`
`25`	`25`	`return 0, errUnimplemented`
`26`	`26`	`}`
`27`	`27`
`28`		`-func (nopSyscaller) Kill(pid int32, sig syscall.Signal) error {`
	`28`	`+func (nopSyscaller) Kill(int32, syscall.Signal) error {`
`29`	`29`	`return errUnimplemented`
`30`	`30`	`}`