linting

Emyrk · Emyrk · commit ea4aa7dc57c4 · 2025-06-18T14:09:31.000-05:00
diff --git a/coderd/dynamicparameters/render.go b/coderd/dynamicparameters/render.go
@@ -31,7 +31,7 @@ type Renderer interface {
 	Close()
 }
 
-var ErrorTemplateVersionNotReady = xerrors.New("template version job not finished")
+var ErrTemplateVersionNotReady = xerrors.New("template version job not finished")
 
 // Loader is used to load the necessary coder objects for rendering a template
 // version's parameters. The output is a Renderer, which is the object that uses
@@ -91,7 +91,7 @@ func (r *Loader) Load(ctx context.Context, db database.Store) error {
 	}
 
 	if !r.job.CompletedAt.Valid {
-		return ErrorTemplateVersionNotReady
+		return ErrTemplateVersionNotReady
 	}
 
 	if r.terraformValues == nil {
@@ -131,7 +131,9 @@ func (r *Loader) Renderer(ctx context.Context, db database.Store, cache *files.C
 // Renderer caches all the necessary files when rendering a template version's
 // parameters. It must be closed after use to release the cached files.
 func (r *Loader) dynamicRenderer(ctx context.Context, db database.Store, cache *files.Cache) (*DynamicRenderer, error) {
-	// If they can read the template version, then they can read the file.
+	// If they can read the template version, then they can read the file for
+	// parameter loading purposes.
+	//nolint:gocritic
 	fileCtx := dbauthz.AsFileReader(ctx)
 	templateFS, err := cache.Acquire(fileCtx, r.job.FileID)
 	if err != nil {
@@ -174,9 +176,8 @@ type DynamicRenderer struct {
 	templateFS fs.FS
 	plan       json.RawMessage
 
-	ownerErrors    map[uuid.UUID]error
-	currentOwner   *previewtypes.WorkspaceOwner
-	currentOwnerID uuid.UUID
+	ownerErrors  map[uuid.UUID]error
+	currentOwner *previewtypes.WorkspaceOwner
 
 	once  sync.Once
 	close func()
diff --git a/coderd/dynamicparameters/static.go b/coderd/dynamicparameters/static.go
@@ -131,4 +131,4 @@ func (r *StaticRender) Render(_ context.Context, _ uuid.UUID, values map[string]
 		}
 }
 
-func (r *StaticRender) Close() {}
+func (*StaticRender) Close() {}
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -68,6 +68,7 @@ func (api *API) templateVersionDynamicParametersWebsocket(rw http.ResponseWriter
 	})(rw, r)
 }
 
+//nolint:revive // listen is a control flag
 func (api *API) templateVersionDynamicParameters(listen bool, initial codersdk.DynamicParametersRequest) func(rw http.ResponseWriter, r *http.Request) {
 	return func(rw http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
@@ -78,16 +79,16 @@ func (api *API) templateVersionDynamicParameters(listen bool, initial codersdk.D
 
 		err := loader.Load(ctx, api.Database)
 		if err != nil {
-
 			if httpapi.Is404Error(err) {
 				httpapi.ResourceNotFound(rw)
 				return
 			}
 
-			if xerrors.Is(err, dynamicparameters.ErrorTemplateVersionNotReady) {
+			if xerrors.Is(err, dynamicparameters.ErrTemplateVersionNotReady) {
 				httpapi.Write(ctx, rw, http.StatusTooEarly, codersdk.Response{
 					Message: "Template version job has not finished",
 				})
+				return
 			}
 
 			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{

Original file line number	Diff line number	Diff line change
`@@ -131,4 +131,4 @@ func (r *StaticRender) Render(_ context.Context, _ uuid.UUID, values map[string]`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`-func (r *StaticRender) Close() {}`
	`134`	`+func (*StaticRender) Close() {}`