comments

Emyrk · Emyrk · commit e8f1d2dbe14f · 2025-06-18T14:12:23.000-05:00
diff --git a/coderd/dynamicparameters/render.go b/coderd/dynamicparameters/render.go
@@ -45,6 +45,10 @@ type Loader struct {
 	terraformValues *database.TemplateVersionTerraformValue
 }
 
+// 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,
@@ -127,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
@@ -152,7 +156,7 @@ func (r *Loader) dynamicRenderer(ctx context.Context, db database.Store, cache *
 		plan = r.terraformValues.CachedPlan
 	}
 
-	return &DynamicRenderer{
+	return &dynamicRenderer{
 		data:        r,
 		templateFS:  templateFS,
 		db:          db,
@@ -167,7 +171,7 @@ func (r *Loader) dynamicRenderer(ctx context.Context, db database.Store, cache *
 	}, nil
 }
 
-type DynamicRenderer struct {
+type dynamicRenderer struct {
 	db         database.Store
 	data       *Loader
 	templateFS fs.FS
@@ -180,7 +184,7 @@ type DynamicRenderer struct {
 	close func()
 }
 
-func (r *DynamicRenderer) Render(ctx context.Context, ownerID uuid.UUID, values map[string]string) (*preview.Output, hcl.Diagnostics) {
+func (r *dynamicRenderer) Render(ctx context.Context, ownerID uuid.UUID, values map[string]string) (*preview.Output, hcl.Diagnostics) {
 	// Always start with the cached error, if we have one.
 	ownerErr := r.ownerErrors[ownerID]
 	if ownerErr == nil {
@@ -210,7 +214,7 @@ func (r *DynamicRenderer) Render(ctx context.Context, ownerID uuid.UUID, values
 	return preview.Preview(ctx, input, r.templateFS)
 }
 
-func (r *DynamicRenderer) getWorkspaceOwnerData(ctx context.Context, ownerID uuid.UUID) error {
+func (r *dynamicRenderer) getWorkspaceOwnerData(ctx context.Context, ownerID uuid.UUID) error {
 	if r.currentOwner != nil && r.currentOwner.ID == ownerID.String() {
 		return nil // already fetched
 	}
@@ -318,7 +322,7 @@ func (r *DynamicRenderer) getWorkspaceOwnerData(ctx context.Context, ownerID uui
 	return nil
 }
 
-func (r *DynamicRenderer) Close() {
+func (r *dynamicRenderer) Close() {
 	r.once.Do(r.close)
 }
 
diff --git a/coderd/dynamicparameters/static.go b/coderd/dynamicparameters/static.go
@@ -16,11 +16,11 @@ import (
 	"github.com/coder/terraform-provider-coder/v2/provider"
 )
 
-type StaticRender struct {
+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)
@@ -101,12 +101,12 @@ func (r *Loader) staticRender(ctx context.Context, db database.Store) (*StaticRe
 		params = append(params, param)
 	}
 
-	return &StaticRender{
+	return &staticRender{
 		staticParams: params,
 	}, nil
 }
 
-func (r *StaticRender) Render(_ context.Context, _ uuid.UUID, values map[string]string) (*preview.Output, hcl.Diagnostics) {
+func (r *staticRender) Render(_ context.Context, _ uuid.UUID, values map[string]string) (*preview.Output, hcl.Diagnostics) {
 	params := r.staticParams
 	for i := range params {
 		param := &params[i]
@@ -131,4 +131,4 @@ func (r *StaticRender) Render(_ context.Context, _ uuid.UUID, values map[string]
 		}
 }
 
-func (*StaticRender) Close() {}
+func (*staticRender) Close() {}

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ import (`
`16`	`16`	`"github.com/coder/terraform-provider-coder/v2/provider"`
`17`	`17`	`)`
`18`	`18`
`19`		`-type StaticRender struct {`
	`19`	`+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)`
`@@ -101,12 +101,12 @@ func (r Loader) staticRender(ctx context.Context, db database.Store) (StaticRe`
`101`	`101`	`params = append(params, param)`
`102`	`102`	`}`
`103`	`103`
`104`		`- return &StaticRender{`
	`104`	`+ return &staticRender{`
`105`	`105`	`staticParams: params,`
`106`	`106`	`}, nil`
`107`	`107`	`}`
`108`	`108`
`109`		`-func (r StaticRender) Render(_ context.Context, _ uuid.UUID, values map[string]string) (preview.Output, hcl.Diagnostics) {`
	`109`	`+func (r staticRender) Render(_ context.Context, _ uuid.UUID, values map[string]string) (preview.Output, hcl.Diagnostics) {`
`110`	`110`	`params := r.staticParams`
`111`	`111`	`for i := range params {`
`112`	`112`	`param := &params[i]`
`@@ -131,4 +131,4 @@ func (r *StaticRender) Render(_ context.Context, _ uuid.UUID, values map[string]`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`-func (*StaticRender) Close() {}`
	`134`	`+func (*staticRender) Close() {}`