fix more stuff

sreya · sreya · commit 9ae5514ff4a6 · 2025-03-26T05:31:28.000Z
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
@@ -1,27 +1,18 @@
 package main
 
 import (
-	"fmt"
-	"os"
 	_ "time/tzdata"
 
-	tea "github.com/charmbracelet/bubbletea"
-
-	"github.com/coder/coder/v2/agent/agentexec"
 	_ "github.com/coder/coder/v2/buildinfo/resources"
 	"github.com/coder/coder/v2/cli"
 )
 
 func main() {
 	panic("hey")
-	if len(os.Args) > 1 && os.Args[1] == "agent-exec" {
-		err := agentexec.CLI()
-		_, _ = fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
+
 	// This preserves backwards compatibility with an init function that is causing grief for
 	// web terminals using agent-exec + screen. See https://github.com/coder/coder/pull/15817
-	tea.InitTerminal()
+
 	var rootCmd cli.RootCmd
 	rootCmd.RunWithSubcommands(rootCmd.AGPL())
 }
diff --git a/coderd/apikey.go b/coderd/apikey.go
@@ -257,12 +257,12 @@ func (api *API) tokens(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var userIds []uuid.UUID
+	var userIDs []uuid.UUID
 	for _, key := range keys {
-		userIds = append(userIds, key.UserID)
+		userIDs = append(userIDs, key.UserID)
 	}
 
-	users, _ := api.Database.GetUsersByIDs(ctx, userIds)
+	users, _ := api.Database.GetUsersByIDs(ctx, userIDs)
 	usersByID := map[uuid.UUID]database.User{}
 	for _, user := range users {
 		usersByID[user.ID] = user
diff --git a/coderd/apikey/apikey_test.go b/coderd/apikey/apikey_test.go
@@ -173,4 +173,4 @@ func TestGenerate(t *testing.T) {
 			}
 		})
 	}
-}
+}
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1421,7 +1421,7 @@ func New(options *Options) *API {
 		// global variable here.
 		r.Get("/swagger/*", globalHTTPSwaggerHandler)
 	} else {
-		swaggerDisabled := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		swaggerDisabled := http.HandlerFunc(func(rw http.ResponseWriter, _ *http.Request) {
 			httpapi.Write(context.Background(), rw, http.StatusNotFound, codersdk.Response{
 				Message: "Swagger documentation is disabled.",
 			})
diff --git a/coderd/workspaceupdates.go b/coderd/workspaceupdates.go
@@ -70,10 +70,9 @@ func (s *sub) handleEvent(ctx context.Context, event wspubsub.WorkspaceEvent, er
 	default:
 		if err == nil {
 			return
-		} else {
-			// Always attempt an update if the pubsub lost connection
-			s.logger.Warn(ctx, "failed to handle workspace event", slog.Error(err))
 		}
+		// Always attempt an update if the pubsub lost connection
+		s.logger.Warn(ctx, "failed to handle workspace event", slog.Error(err))
 	}
 
 	// Use context containing actor
diff --git a/enterprise/coderd/notifications.go b/enterprise/coderd/notifications.go
@@ -75,7 +75,7 @@ func (api *API) updateNotificationTemplateMethod(rw http.ResponseWriter, r *http
 
 	err := api.Database.InTx(func(tx database.Store) error {
 		var err error
-		template, err = api.Database.UpdateNotificationTemplateMethodByID(r.Context(), database.UpdateNotificationTemplateMethodByIDParams{
+		template, err = tx.UpdateNotificationTemplateMethodByID(r.Context(), database.UpdateNotificationTemplateMethodByIDParams{
 			ID:     template.ID,
 			Method: nm,
 		})
diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go
@@ -398,13 +398,13 @@ func New(ctx context.Context, opts *Options) (*Server, error) {
 		r.Route("/derp", func(r chi.Router) {
 			r.Get("/", derpHandler.ServeHTTP)
 			// This is used when UDP is blocked, and latency must be checked via HTTP(s).
-			r.Get("/latency-check", func(w http.ResponseWriter, r *http.Request) {
+			r.Get("/latency-check", func(w http.ResponseWriter, _ *http.Request) {
 				w.WriteHeader(http.StatusOK)
 			})
 		})
 	} else {
 		r.Route("/derp", func(r chi.Router) {
-			r.HandleFunc("/*", func(rw http.ResponseWriter, r *http.Request) {
+			r.HandleFunc("/*", func(rw http.ResponseWriter, _ *http.Request) {
 				httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 					Message: "DERP is disabled on this proxy.",
 				})
@@ -413,7 +413,7 @@ func New(ctx context.Context, opts *Options) (*Server, error) {
 	}
 
 	r.Get("/api/v2/buildinfo", s.buildInfo)
-	r.Get("/healthz", func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte("OK")) })
+	r.Get("/healthz", func(w http.ResponseWriter, _ *http.Request) { _, _ = w.Write([]byte("OK")) })
 	// TODO: @emyrk should this be authenticated or debounced?
 	r.Get("/healthz-report", s.healthReport)
 	r.NotFound(func(rw http.ResponseWriter, r *http.Request) {
diff --git a/scripts/testidp/main.go b/scripts/testidp/main.go
@@ -38,7 +38,7 @@ func main() {
 	flag.Parse()
 
 	// This is just a way to run tests outside go test
-	testing.Main(func(pat, str string) (bool, error) {
+	testing.Main(func(_, _ string) (bool, error) {
 		return true, nil
 	}, []testing.InternalTest{
 		{

Original file line number	Diff line number	Diff line change
`@@ -257,12 +257,12 @@ func (api API) tokens(rw http.ResponseWriter, r http.Request) {`
`257`	`257`	`return`
`258`	`258`	`}`
`259`	`259`
`260`		`- var userIds []uuid.UUID`
	`260`	`+ var userIDs []uuid.UUID`
`261`	`261`	`for _, key := range keys {`
`262`		`- userIds = append(userIds, key.UserID)`
	`262`	`+ userIDs = append(userIDs, key.UserID)`
`263`	`263`	`}`
`264`	`264`
`265`		`- users, _ := api.Database.GetUsersByIDs(ctx, userIds)`
	`265`	`+ users, _ := api.Database.GetUsersByIDs(ctx, userIDs)`
`266`	`266`	`usersByID := map[uuid.UUID]database.User{}`
`267`	`267`	`for _, user := range users {`
`268`	`268`	`usersByID[user.ID] = user`
Original file line number	Diff line number	Diff line change
`@@ -173,4 +173,4 @@ func TestGenerate(t *testing.T) {`
`173`	`173`	`}`
`174`	`174`	`})`
`175`	`175`	`}`
`176`		`-}`
	`176`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,9 @@ func (s *sub) handleEvent(ctx context.Context, event wspubsub.WorkspaceEvent, er`
`70`	`70`	`default:`
`71`	`71`	`if err == nil {`
`72`	`72`	`return`
`73`		`- } else {`
`74`		`- // Always attempt an update if the pubsub lost connection`
`75`		`- s.logger.Warn(ctx, "failed to handle workspace event", slog.Error(err))`
`76`	`73`	`}`
	`74`	`+ // Always attempt an update if the pubsub lost connection`
	`75`	`+ s.logger.Warn(ctx, "failed to handle workspace event", slog.Error(err))`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`// Use context containing actor`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func main() {`
`38`	`38`	`flag.Parse()`
`39`	`39`
`40`	`40`	`// This is just a way to run tests outside go test`
`41`		`- testing.Main(func(pat, str string) (bool, error) {`
	`41`	`+ testing.Main(func(_, _ string) (bool, error) {`
`42`	`42`	`return true, nil`
`43`	`43`	`}, []testing.InternalTest{`
`44`	`44`	`{`