Revert "only use 1 function, not a 2 step"

Emyrk · Emyrk · commit c1902a77528e · 2025-06-20T08:49:51.000-05:00
This reverts commit 7b80138.
diff --git a/coderd/dynamicparameters/render.go b/coderd/dynamicparameters/render.go
@@ -33,10 +33,10 @@ type Renderer interface {
 
 var ErrTemplateVersionNotReady = xerrors.New("template version job not finished")
 
-// loader is used to load the necessary coder objects for rendering a template
+// 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.
-type loader struct {
+type Loader struct {
 	templateVersionID uuid.UUID
 
 	// cache of objects
@@ -45,44 +45,39 @@ type loader struct {
 	terraformValues *database.TemplateVersionTerraformValue
 }
 
-// Prepare is the entrypoint for this package. It loads the necessary objects &
-// files from the database and returns a Renderer that can be used to render the
-// template version's parameters.
-func Prepare(ctx context.Context, db database.Store, cache *files.Cache, versionID uuid.UUID, options ...func(r *loader)) (Renderer, error) {
-	l := &loader{
+// Prepare is the entrypoint for this package. It is broken into 2 steps to allow
+// prepopulating some of the existing data and saving some database queries.
+//
+// Usage: dynamicparameters.Prepare(...).Renderer(...)
+func Prepare(versionID uuid.UUID) *Loader {
+	return &Loader{
 		templateVersionID: versionID,
 	}
+}
 
-	for _, opt := range options {
-		opt(l)
+func (r *Loader) WithTemplateVersion(tv database.TemplateVersion) *Loader {
+	if tv.ID == r.templateVersionID {
+		r.templateVersion = &tv
 	}
 
-	return l.Renderer(ctx, db, cache)
+	return r
 }
 
-func WithTemplateVersion(tv database.TemplateVersion) func(r *loader) {
-	return func(r *loader) {
-		if tv.ID == r.templateVersionID {
-			r.templateVersion = &tv
-		}
-	}
-}
+func (r *Loader) WithProvisionerJob(job database.ProvisionerJob) *Loader {
+	r.job = &job
 
-func WithProvisionerJob(job database.ProvisionerJob) func(r *loader) {
-	return func(r *loader) {
-		r.job = &job
-	}
+	return r
 }
 
-func WithTerraformValues(values database.TemplateVersionTerraformValue) func(r *loader) {
-	return func(r *loader) {
-		if values.TemplateVersionID == r.templateVersionID {
-			r.terraformValues = &values
-		}
+func (r *Loader) WithTerraformValues(values database.TemplateVersionTerraformValue) *Loader {
+	if values.TemplateVersionID == r.templateVersionID {
+		r.terraformValues = &values
 	}
+
+	return r
 }
 
-func (r *loader) loadData(ctx context.Context, db database.Store) error {
+func (r *Loader) loadData(ctx context.Context, db database.Store) error {
 	if r.templateVersion == nil {
 		tv, err := db.GetTemplateVersionByID(ctx, r.templateVersionID)
 		if err != nil {
@@ -121,7 +116,7 @@ func (r *loader) loadData(ctx context.Context, db database.Store) error {
 // Static parameter rendering is required to support older template versions that
 // do not have the database state to support dynamic parameters. A constant
 // warning will be displayed for these template versions.
-func (r *loader) Renderer(ctx context.Context, db database.Store, cache *files.Cache) (Renderer, error) {
+func (r *Loader) Renderer(ctx context.Context, db database.Store, cache *files.Cache) (Renderer, error) {
 	err := r.loadData(ctx, db)
 	if err != nil {
 		return nil, xerrors.Errorf("load data: %w", err)
@@ -136,7 +131,7 @@ 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) {
+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 for
 	// parameter loading purposes.
 	//nolint:gocritic
@@ -176,7 +171,7 @@ func (r *loader) dynamicRenderer(ctx context.Context, db database.Store, cache *
 
 type dynamicRenderer struct {
 	db         database.Store
-	data       *loader
+	data       *Loader
 	templateFS fs.FS
 
 	ownerErrors  map[uuid.UUID]error
diff --git a/coderd/dynamicparameters/static.go b/coderd/dynamicparameters/static.go
@@ -20,7 +20,7 @@ type staticRender struct {
 	staticParams []previewtypes.Parameter
 }
 
-func (r *loader) staticRender(ctx context.Context, db database.Store) (*staticRender, error) {
+func (r *Loader) staticRender(ctx context.Context, db database.Store) (*staticRender, error) {
 	dbTemplateVersionParameters, err := db.GetTemplateVersionParameters(ctx, r.templateVersionID)
 	if err != nil {
 		return nil, xerrors.Errorf("template version parameters: %w", err)
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -79,9 +79,9 @@ func (api *API) templateVersionDynamicParameters(listen bool, initial codersdk.D
 		ctx := r.Context()
 		templateVersion := httpmw.TemplateVersionParam(r)
 
-		renderer, err := dynamicparameters.Prepare(ctx, api.Database, api.FileCache, templateVersion.ID,
-			dynamicparameters.WithTemplateVersion(templateVersion),
-		)
+		renderer, err := dynamicparameters.Prepare(templateVersion.ID).
+			WithTemplateVersion(templateVersion).
+			Renderer(ctx, api.Database, api.FileCache)
 		if err != nil {
 			if httpapi.Is404Error(err) {
 				httpapi.ResourceNotFound(rw)

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type staticRender struct {`
`20`	`20`	`staticParams []previewtypes.Parameter`
`21`	`21`	`}`
`22`	`22`
`23`		`-func (r loader) staticRender(ctx context.Context, db database.Store) (staticRender, error) {`
	`23`	`+func (r Loader) staticRender(ctx context.Context, db database.Store) (staticRender, error) {`
`24`	`24`	`dbTemplateVersionParameters, err := db.GetTemplateVersionParameters(ctx, r.templateVersionID)`
`25`	`25`	`if err != nil {`
`26`	`26`	`return nil, xerrors.Errorf("template version parameters: %w", err)`