fix: add Close() to RenderCache interface for proper cleanup

Callum Styan · claude · Callum Styan · commit 85bbae697a44 · 2025-12-11T04:02:35.000Z
The renderCache field in StoreReconciler was using the concrete type *RenderCacheImpl instead of the RenderCache interface, preventing proper cleanup of cache goroutines. Changes: - Add Close() method to RenderCache interface - Implement Close() as no-op in noopRenderCache - Update StoreReconciler.renderCache to use interface type - Update wsbuilder.Builder.renderCache to use interface type - Remove unnecessary nil check in reconciler Stop() method This ensures all render cache cleanup goroutines are properly stopped when reconcilers are stopped, fixing goleak test failures. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
diff --git a/coderd/dynamicparameters/render.go b/coderd/dynamicparameters/render.go
@@ -39,6 +39,7 @@ var ErrTemplateVersionNotReady = xerrors.New("template version job not finished"
 type RenderCache interface {
 	get(templateVersionID, ownerID uuid.UUID, parameters map[string]string) (*preview.Output, bool)
 	put(templateVersionID, ownerID uuid.UUID, parameters map[string]string, output *preview.Output)
+	Close()
 }
 
 // noopRenderCache is a no-op implementation of RenderCache that doesn't cache anything.
@@ -52,6 +53,10 @@ func (noopRenderCache) put(uuid.UUID, uuid.UUID, map[string]string, *preview.Out
 	// no-op
 }
 
+func (noopRenderCache) Close() {
+	// no-op
+}
+
 // 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
 // the cached objects to render the template version's parameters.
diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go
@@ -89,7 +89,7 @@ type Builder struct {
 	workspaceTags                        *map[string]string
 
 	// renderCache caches template rendering results
-	renderCache *dynamicparameters.RenderCacheImpl
+	renderCache dynamicparameters.RenderCache
 
 	prebuiltWorkspaceBuildStage  sdkproto.PrebuiltWorkspaceBuildStage
 	verifyNoLegacyParametersOnce bool
@@ -258,7 +258,7 @@ func (b Builder) TemplateVersionPresetID(id uuid.UUID) Builder {
 
 // RenderCache sets the render cache to use for template rendering.
 // This allows multiple workspace builds to share cached render results.
-func (b Builder) RenderCache(cache *dynamicparameters.RenderCacheImpl) Builder {
+func (b Builder) RenderCache(cache dynamicparameters.RenderCache) Builder {
 	// nolint: revive
 	b.renderCache = cache
 	return b
diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go
@@ -61,7 +61,7 @@ type StoreReconciler struct {
 	reconciliationDuration prometheus.Histogram
 
 	// renderCache caches template rendering results to avoid expensive re-parsing
-	renderCache *dynamicparameters.RenderCacheImpl
+	renderCache dynamicparameters.RenderCache
 }
 
 var _ prebuilds.ReconciliationOrchestrator = &StoreReconciler{}
@@ -294,9 +294,7 @@ func (c *StoreReconciler) Stop(ctx context.Context, cause error) {
 	}
 
 	// Close the render cache to stop its cleanup goroutine
-	if c.renderCache != nil {
-		c.renderCache.Close()
-	}
+	c.renderCache.Close()
 }
 
 // ReconcileAll will attempt to resolve the desired vs actual state of all templates which have presets with prebuilds configured.

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ type StoreReconciler struct {`
`61`	`61`	`reconciliationDuration prometheus.Histogram`
`62`	`62`
`63`	`63`	`// renderCache caches template rendering results to avoid expensive re-parsing`
`64`		`- renderCache *dynamicparameters.RenderCacheImpl`
	`64`	`+ renderCache dynamicparameters.RenderCache`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`var _ prebuilds.ReconciliationOrchestrator = &StoreReconciler{}`
`@@ -294,9 +294,7 @@ func (c *StoreReconciler) Stop(ctx context.Context, cause error) {`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`// Close the render cache to stop its cleanup goroutine`
`297`		`- if c.renderCache != nil {`
`298`		`- c.renderCache.Close()`
`299`		`- }`
	`297`	`+ c.renderCache.Close()`
`300`	`298`	`}`
`301`	`299`
`302`	`300`	`// ReconcileAll will attempt to resolve the desired vs actual state of all templates which have presets with prebuilds configured.`