more updates

coder · sreya · Mar 26, 2025 · Mar 21, 2025 · Mar 21, 2025 · Mar 21, 2025
commit 2b19287d2f5e9a540a847d85d1497f8d21d479cc
diff --git a/agent/agent.go b/agent/agent.go
@@ -936,7 +936,7 @@ func (a *agent) run() (retErr error) {
 	connMan.startAgentAPI("send logs", gracefulShutdownBehaviorRemain,
 		func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
 			err := a.logSender.SendLoop(ctx, aAPI)
-			if xerrors.Is(err, agentsdk.LogLimitExceededError) {
+			if xerrors.Is(err, agentsdk.ErrLogLimitExceeded) {
 				// we don't want this error to tear down the API connection and propagate to the
 				// other routines that use the API.  The LogSender has already dropped a warning
 				// log, so just return nil here.

diff --git a/agent/apphealth.go b/agent/apphealth.go
@@ -167,8 +167,8 @@ func shouldStartTicker(app codersdk.WorkspaceApp) bool {
 	return app.Healthcheck.URL != "" && app.Healthcheck.Interval > 0 && app.Healthcheck.Threshold > 0
 }
 
-func healthChanged(old map[uuid.UUID]codersdk.WorkspaceAppHealth, new map[uuid.UUID]codersdk.WorkspaceAppHealth) bool {
-	for name, newValue := range new {
+func healthChanged(old map[uuid.UUID]codersdk.WorkspaceAppHealth, updated map[uuid.UUID]codersdk.WorkspaceAppHealth) bool {
+	for name, newValue := range updated {
 		oldValue, found := old[name]
 		if !found {
 			return true

diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go
@@ -371,7 +371,7 @@ func main() {
 				gitlabAuthed.Store(true)
 			}()
 			return cliui.ExternalAuth(inv.Context(), inv.Stdout, cliui.ExternalAuthOptions{
-				Fetch: func(ctx context.Context) ([]codersdk.TemplateVersionExternalAuth, error) {
+				Fetch: func(_ context.Context) ([]codersdk.TemplateVersionExternalAuth, error) {
 					count.Add(1)
 					return []codersdk.TemplateVersionExternalAuth{{
 						ID:              "github",

diff --git a/coderd/notifications/dispatch/smtp.go b/coderd/notifications/dispatch/smtp.go
@@ -34,10 +34,10 @@ import (
 )
 
 var (
-	ValidationNoFromAddressErr = xerrors.New("'from' address not defined")
-	ValidationNoToAddressErr   = xerrors.New("'to' address(es) not defined")
-	ValidationNoSmarthostErr   = xerrors.New("'smarthost' address not defined")
-	ValidationNoHelloErr       = xerrors.New("'hello' not defined")
+	ErrValidationNoFromAddress = xerrors.New("'from' address not defined")
+	ErrValidationNoToAddress   = xerrors.New("'to' address(es) not defined")
+	ErrValidationNoSmarthost   = xerrors.New("'smarthost' address not defined")
+	ErrValidationNoHello       = xerrors.New("'hello' not defined")
 
 	//go:embed smtp/html.gotmpl
 	htmlTemplate string
@@ -493,7 +493,7 @@ func (*SMTPHandler) validateFromAddr(from string) (string, error) {
 		return "", xerrors.Errorf("parse 'from' address: %w", err)
 	}
 	if len(addrs) != 1 {
-		return "", ValidationNoFromAddressErr
+		return "", ErrValidationNoFromAddress
 	}
 	return from, nil
 }
@@ -505,7 +505,7 @@ func (s *SMTPHandler) validateToAddrs(to string) ([]string, error) {
 	}
 	if len(addrs) == 0 {
 		s.log.Warn(context.Background(), "no valid 'to' address(es) defined; some may be invalid", slog.F("defined", to))
-		return nil, ValidationNoToAddressErr
+		return nil, ErrValidationNoToAddress
 	}
 
 	var out []string
@@ -522,7 +522,7 @@ func (s *SMTPHandler) validateToAddrs(to string) ([]string, error) {
 func (s *SMTPHandler) smarthost() (string, string, error) {
 	smarthost := strings.TrimSpace(string(s.cfg.Smarthost))
 	if smarthost == "" {
-		return "", "", ValidationNoSmarthostErr
+		return "", "", ErrValidationNoSmarthost
 	}
 
 	host, port, err := net.SplitHostPort(string(s.cfg.Smarthost))
@@ -538,7 +538,7 @@ func (s *SMTPHandler) smarthost() (string, string, error) {
 func (s *SMTPHandler) hello() (string, error) {
 	val := s.cfg.Hello.String()
 	if val == "" {
-		return "", ValidationNoHelloErr
+		return "", ErrValidationNoHello
 	}
 	return val, nil
 }

diff --git a/coderd/workspaceapps/db.go b/coderd/workspaceapps/db.go
@@ -120,7 +120,7 @@ func (p *DBTokenProvider) Issue(ctx context.Context, rw http.ResponseWriter, r *
 		// (later on) fails and the user is not authenticated, they will be
 		// redirected to the login page or app auth endpoint using code below.
 		Optional: true,
-		SessionTokenFunc: func(r *http.Request) string {
+		SessionTokenFunc: func(_ *http.Request) string {
 			return issueReq.SessionToken
 		},
 	})
@@ -132,13 +132,14 @@ func (p *DBTokenProvider) Issue(ctx context.Context, rw http.ResponseWriter, r *
 
 	// Lookup workspace app details from DB.
 	dbReq, err := appReq.getDatabase(dangerousSystemCtx, p.Database)
-	if xerrors.Is(err, sql.ErrNoRows) {
+	switch {
+	case xerrors.Is(err, sql.ErrNoRows):
 		WriteWorkspaceApp404(p.Logger, p.DashboardURL, rw, r, &appReq, nil, err.Error())
 		return nil, "", false
-	} else if xerrors.Is(err, errWorkspaceStopped) {
+	case xerrors.Is(err, errWorkspaceStopped):
 		WriteWorkspaceOffline(p.Logger, p.DashboardURL, rw, r, &appReq)
 		return nil, "", false
-	} else if err != nil {
+	case err != nil:
 		WriteWorkspaceApp500(p.Logger, p.DashboardURL, rw, r, &appReq, err, "get app details from database")
 		return nil, "", false
 	}

diff --git a/coderd/workspaceapps/proxy.go b/coderd/workspaceapps/proxy.go
@@ -45,7 +45,7 @@ const (
 	// login page.
 	// It is important that this URL can never match a valid app hostname.
 	//
-	// DEPRECATED: we no longer use this, but we still redirect from it to the
+	// Deprecated: we no longer use this, but we still redirect from it to the
 	// main login page.
 	appLogoutHostname = "coder-logout"
 )

diff --git a/codersdk/agentsdk/logs.go b/codersdk/agentsdk/logs.go
@@ -355,7 +355,7 @@ func (l *LogSender) Flush(src uuid.UUID) {
 	// the map.
 }
 
-var LogLimitExceededError = xerrors.New("Log limit exceeded")
+var ErrLogLimitExceeded = xerrors.New("Log limit exceeded")
 
 // SendLoop sends any pending logs until it hits an error or the context is canceled.  It does not
 // retry as it is expected that a higher layer retries establishing connection to the agent API and
@@ -365,7 +365,7 @@ func (l *LogSender) SendLoop(ctx context.Context, dest LogDest) error {
 	defer l.L.Unlock()
 	if l.exceededLogLimit {
 		l.logger.Debug(ctx, "aborting SendLoop because log limit is already exceeded")
-		return LogLimitExceededError
+		return ErrLogLimitExceeded
 	}
 
 	ctxDone := false
@@ -438,7 +438,7 @@ func (l *LogSender) SendLoop(ctx context.Context, dest LogDest) error {
 			// no point in keeping anything we have queued around, server will not accept them
 			l.queues = make(map[uuid.UUID]*logQueue)
 			l.Broadcast() // might unblock WaitUntilEmpty
-			return LogLimitExceededError
+			return ErrLogLimitExceeded
 		}
 
 		// Since elsewhere we only append to the logs, here we can remove them

diff --git a/codersdk/agentsdk/logs_internal_test.go b/codersdk/agentsdk/logs_internal_test.go
@@ -157,7 +157,7 @@ func TestLogSender_LogLimitExceeded(t *testing.T) {
 		&proto.BatchCreateLogsResponse{LogLimitExceeded: true})
 
 	err := testutil.RequireRecvCtx(ctx, t, loopErr)
-	require.ErrorIs(t, err, LogLimitExceededError)
+	require.ErrorIs(t, err, ErrLogLimitExceeded)
 
 	// Should also unblock WaitUntilEmpty
 	err = testutil.RequireRecvCtx(ctx, t, empty)
@@ -180,7 +180,7 @@ func TestLogSender_LogLimitExceeded(t *testing.T) {
 		loopErr <- err
 	}()
 	err = testutil.RequireRecvCtx(ctx, t, loopErr)
-	require.ErrorIs(t, err, LogLimitExceededError)
+	require.ErrorIs(t, err, ErrLogLimitExceeded)
 }
 
 func TestLogSender_SkipHugeLog(t *testing.T) {

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -397,7 +397,7 @@ type DeploymentValues struct {
 	Config      serpent.YAMLConfigPath `json:"config,omitempty" typescript:",notnull"`
 	WriteConfig serpent.Bool           `json:"write_config,omitempty" typescript:",notnull"`
 
-	// DEPRECATED: Use HTTPAddress or TLS.Address instead.
+	// Deprecated: Use HTTPAddress or TLS.Address instead.
 	Address serpent.HostPort `json:"address,omitempty" typescript:",notnull"`
 }
 

diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -102,17 +102,17 @@ func validateBuildParameter(richParameter TemplateVersionParameter, buildParamet
 		return nil
 	}
 
-	var min, max int
+	var minVal, maxVal int
 	if richParameter.ValidationMin != nil {
-		min = int(*richParameter.ValidationMin)
+		minVal = int(*richParameter.ValidationMin)
 	}
 	if richParameter.ValidationMax != nil {
-		max = int(*richParameter.ValidationMax)
+		maxVal = int(*richParameter.ValidationMax)
 	}
 
 	validation := &provider.Validation{
-		Min:         min,
-		Max:         max,
+		Min:         minVal,
+		Max:         maxVal,
 		MinDisabled: richParameter.ValidationMin == nil,
 		MaxDisabled: richParameter.ValidationMax == nil,
 		Regex:       richParameter.ValidationRegex,

diff --git a/codersdk/templatevariables.go b/codersdk/templatevariables.go
@@ -121,15 +121,16 @@ func parseVariableValuesFromHCL(content []byte) ([]VariableValue, error) {
 		}
 
 		ctyType := ctyValue.Type()
-		if ctyType.Equals(cty.String) {
+		switch {
+		case ctyType.Equals(cty.String):
 			stringData[attribute.Name] = ctyValue.AsString()
-		} else if ctyType.Equals(cty.Number) {
+		case ctyType.Equals(cty.Number):
 			stringData[attribute.Name] = ctyValue.AsBigFloat().String()
-		} else if ctyType.IsTupleType() {
+		case ctyType.IsTupleType():
 			// In case of tuples, Coder only supports the list(string) type.
 			var items []string
 			var err error
-			_ = ctyValue.ForEachElement(func(key, val cty.Value) (stop bool) {
+			_ = ctyValue.ForEachElement(func(_, val cty.Value) (stop bool) {
 				if !val.Type().Equals(cty.String) {
 					err = xerrors.Errorf("unsupported tuple item type: %s ", val.GoString())
 					return true
@@ -146,7 +147,7 @@ func parseVariableValuesFromHCL(content []byte) ([]VariableValue, error) {
 				return nil, err
 			}
 			stringData[attribute.Name] = string(m)
-		} else {
+		default:
 			return nil, xerrors.Errorf("unsupported value type (name: %s): %s", attribute.Name, ctyType.GoString())
 		}
 	}

diff --git a/enterprise/audit/filter.go b/enterprise/audit/filter.go
@@ -29,7 +29,7 @@ type Filter interface {
 
 // DefaultFilter is the default filter used when exporting audit logs. It allows
 // storage and exporting for all audit logs.
-var DefaultFilter Filter = FilterFunc(func(ctx context.Context, alog database.AuditLog) (FilterDecision, error) {
+var DefaultFilter Filter = FilterFunc(func(_ context.Context, alog database.AuditLog) (FilterDecision, error) {
 	// Store and export all audit logs for now.
 	return FilterDecisionStore | FilterDecisionExport, nil
 })

diff --git a/scripts/apitypings/main.go b/scripts/apitypings/main.go
@@ -116,7 +116,7 @@ func TypeMappings(gen *guts.GoParser) error {
 // 'serpent.Struct' overrides the json.Marshal to use the underlying type,
 // so the typescript type should be the underlying type.
 func FixSerpentStruct(gen *guts.Typescript) {
-	gen.ForEach(func(key string, originalNode bindings.Node) {
+	gen.ForEach(func(_ string, originalNode bindings.Node) {
 		isInterface, ok := originalNode.(*bindings.Interface)
 		if ok && isInterface.Name.Ref() == "SerpentStruct" {
 			// replace it with