From 5913c2ece76921d86d89858bdf1231feb8a3d579 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 7 Mar 2024 11:44:18 +0000 Subject: [PATCH 1/2] feat(coderd/database/dbfake): allow specifying fileID --- coderd/database/dbfake/dbfake.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go index ea49c78065657..e2ed2c77aef2e 100644 --- a/coderd/database/dbfake/dbfake.go +++ b/coderd/database/dbfake/dbfake.go @@ -274,6 +274,7 @@ type TemplateVersionBuilder struct { t testing.TB db database.Store seed database.TemplateVersion + fileID uuid.UUID ps pubsub.Pubsub resources []*sdkproto.Resource params []database.TemplateVersionParameter @@ -296,6 +297,12 @@ func (t TemplateVersionBuilder) Seed(v database.TemplateVersion) TemplateVersion return t } +func (t TemplateVersionBuilder) FileID(fid uuid.UUID) TemplateVersionBuilder { + // nolint: revive // returns modified struct + t.fileID = fid + return t +} + func (t TemplateVersionBuilder) Pubsub(ps pubsub.Pubsub) TemplateVersionBuilder { // nolint: revive // returns modified struct t.ps = ps @@ -321,6 +328,8 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse { t.seed.ID = takeFirst(t.seed.ID, uuid.New()) t.seed.CreatedBy = takeFirst(t.seed.CreatedBy, uuid.New()) + t.fileID = takeFirst(t.fileID, uuid.New()) + var resp TemplateVersionResponse if t.seed.TemplateID.UUID == uuid.Nil { resp.Template = dbgen.Template(t.t, t.db, database.Template{ @@ -361,6 +370,7 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse { Time: dbtime.Now(), Valid: true, }, + FileID: t.fileID, }) t.seed.JobID = job.ID From 8cff9e9f05df21518e7f3eb293ef0cb7d02ddb8f Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 7 Mar 2024 11:53:23 +0000 Subject: [PATCH 2/2] fixup! feat(coderd/database/dbfake): allow specifying fileID --- coderd/database/dbfake/dbfake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go index e2ed2c77aef2e..1e9a3408e8571 100644 --- a/coderd/database/dbfake/dbfake.go +++ b/coderd/database/dbfake/dbfake.go @@ -327,7 +327,7 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse { t.seed.OrganizationID = takeFirst(t.seed.OrganizationID, uuid.New()) t.seed.ID = takeFirst(t.seed.ID, uuid.New()) t.seed.CreatedBy = takeFirst(t.seed.CreatedBy, uuid.New()) - + // nolint: revive t.fileID = takeFirst(t.fileID, uuid.New()) var resp TemplateVersionResponse