Commit6e4508e

authored

chore: assume template versions without tf values to be empty (#18479)

1 parentfae30a0 commit6e4508eCopy full SHA for 6e4508e

File tree

+18

-1

lines changed

+18

-1

lines changed

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@ package dynamicparameters`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+"database/sql"`
`5`	`6`	`"io/fs"`
`6`	`7`	`"log/slog"`
`7`	`8`	`"sync"`
	`9`	`+"time"`
`8`	`10`
`9`	`11`	`"github.com/google/uuid"`
`10`	`12`	`"golang.org/x/sync/errgroup"`
`@@ -105,9 +107,24 @@ func (r *loader) loadData(ctx context.Context, db database.Store) error {`
`105`	`107`
`106`	`108`	`ifr.terraformValues==nil {`
`107`	`109`	`values,err:=db.GetTemplateVersionTerraformValues(ctx,r.templateVersion.ID)`
`108`		`-iferr!=nil {`
	`110`	`+iferr!=nil&&!xerrors.Is(err,sql.ErrNoRows){`
`109`	`111`	`returnxerrors.Errorf("template version terraform values: %w",err)`
`110`	`112`	`}`
	`113`	`+`
	`114`	`+ifxerrors.Is(err,sql.ErrNoRows) {`
	`115`	`+// If the row does not exist, return zero values.`
	`116`	`+//`
	`117`	`+// Older template versions (prior to dynamic parameters) will be missing`
	`118`	`+// this row, and we can assume the 'ProvisionerdVersion' "" (unknown).`
	`119`	`+values= database.TemplateVersionTerraformValue{`
	`120`	`+TemplateVersionID:r.templateVersionID,`
	`121`	`+UpdatedAt: time.Time{},`
	`122`	`+CachedPlan:nil,`
	`123`	`+CachedModuleFiles: uuid.NullUUID{},`
	`124`	`+ProvisionerdVersion:"",`
	`125`	`+}`
	`126`	`+}`
	`127`	`+`
`111`	`128`	`r.terraformValues=&values`
`112`	`129`	`}`
`113`	`130`

Comments

(0)