From d14f62a0c3b661a10c43f034e6c883b5c5a6b289 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Mon, 16 Jun 2025 12:14:41 +0000 Subject: [PATCH 1/3] queries --- coderd/database/queries/templateversions.sql | 5 +++-- coderd/database/queries/workspacebuilds.sql | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coderd/database/queries/templateversions.sql b/coderd/database/queries/templateversions.sql index 0436a7f9ba3b9..6798d4db5ff6f 100644 --- a/coderd/database/queries/templateversions.sql +++ b/coderd/database/queries/templateversions.sql @@ -88,10 +88,11 @@ INSERT INTO readme, job_id, created_by, - source_example_id + source_example_id, + has_ai_task ) VALUES - ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11); + ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12); -- name: UpdateTemplateVersionByID :exec UPDATE diff --git a/coderd/database/queries/workspacebuilds.sql b/coderd/database/queries/workspacebuilds.sql index 34ef639a1694b..b380e5423c21c 100644 --- a/coderd/database/queries/workspacebuilds.sql +++ b/coderd/database/queries/workspacebuilds.sql @@ -121,10 +121,11 @@ INSERT INTO deadline, max_deadline, reason, - template_version_preset_id + template_version_preset_id, + has_ai_task ) VALUES - ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14); + ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15); -- name: UpdateWorkspaceBuildCostByID :exec UPDATE From 37fdd4172c56ce7d55dbbed6a039b93d9fcfdd93 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Mon, 16 Jun 2025 12:15:22 +0000 Subject: [PATCH 2/3] make gen --- coderd/database/queries.sql.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 92c912a55705a..9a814a5b6dff8 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -11809,10 +11809,11 @@ INSERT INTO readme, job_id, created_by, - source_example_id + source_example_id, + has_ai_task ) VALUES - ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) + ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) ` type InsertTemplateVersionParams struct { @@ -11827,6 +11828,7 @@ type InsertTemplateVersionParams struct { JobID uuid.UUID `db:"job_id" json:"job_id"` CreatedBy uuid.UUID `db:"created_by" json:"created_by"` SourceExampleID sql.NullString `db:"source_example_id" json:"source_example_id"` + HasAITask bool `db:"has_ai_task" json:"has_ai_task"` } func (q *sqlQuerier) InsertTemplateVersion(ctx context.Context, arg InsertTemplateVersionParams) error { @@ -11842,6 +11844,7 @@ func (q *sqlQuerier) InsertTemplateVersion(ctx context.Context, arg InsertTempla arg.JobID, arg.CreatedBy, arg.SourceExampleID, + arg.HasAITask, ) return err } @@ -17521,10 +17524,11 @@ INSERT INTO deadline, max_deadline, reason, - template_version_preset_id + template_version_preset_id, + has_ai_task ) VALUES - ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) + ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15) ` type InsertWorkspaceBuildParams struct { @@ -17542,6 +17546,7 @@ type InsertWorkspaceBuildParams struct { MaxDeadline time.Time `db:"max_deadline" json:"max_deadline"` Reason BuildReason `db:"reason" json:"reason"` TemplateVersionPresetID uuid.NullUUID `db:"template_version_preset_id" json:"template_version_preset_id"` + HasAITask bool `db:"has_ai_task" json:"has_ai_task"` } func (q *sqlQuerier) InsertWorkspaceBuild(ctx context.Context, arg InsertWorkspaceBuildParams) error { @@ -17560,6 +17565,7 @@ func (q *sqlQuerier) InsertWorkspaceBuild(ctx context.Context, arg InsertWorkspa arg.MaxDeadline, arg.Reason, arg.TemplateVersionPresetID, + arg.HasAITask, ) return err } From b8f9d60c365b259e3ca79ee2761ddb6b8677247c Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Mon, 16 Jun 2025 12:18:36 +0000 Subject: [PATCH 3/3] dbgen --- coderd/database/dbgen/dbgen.go | 2 ++ coderd/database/dbmem/dbmem.go | 2 ++ coderd/templateversions.go | 3 +++ coderd/wsbuilder/wsbuilder.go | 3 +++ 4 files changed, 10 insertions(+) diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go index c85db83a2adc9..aabce08b717d7 100644 --- a/coderd/database/dbgen/dbgen.go +++ b/coderd/database/dbgen/dbgen.go @@ -369,6 +369,7 @@ func WorkspaceBuild(t testing.TB, db database.Store, orig database.WorkspaceBuil UUID: uuid.UUID{}, Valid: false, }), + HasAITask: orig.HasAITask, }) if err != nil { return err @@ -943,6 +944,7 @@ func TemplateVersion(t testing.TB, db database.Store, orig database.TemplateVers JobID: takeFirst(orig.JobID, uuid.New()), CreatedBy: takeFirst(orig.CreatedBy, uuid.New()), SourceExampleID: takeFirst(orig.SourceExampleID, sql.NullString{}), + HasAITask: orig.HasAITask, }) if err != nil { return err diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go index eba4b945f06e1..ab2dd923dab47 100644 --- a/coderd/database/dbmem/dbmem.go +++ b/coderd/database/dbmem/dbmem.go @@ -9382,6 +9382,7 @@ func (q *FakeQuerier) InsertTemplateVersion(_ context.Context, arg database.Inse JobID: arg.JobID, CreatedBy: arg.CreatedBy, SourceExampleID: arg.SourceExampleID, + HasAITask: arg.HasAITask, } q.templateVersions = append(q.templateVersions, version) return nil @@ -10061,6 +10062,7 @@ func (q *FakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.Inser MaxDeadline: arg.MaxDeadline, Reason: arg.Reason, TemplateVersionPresetID: arg.TemplateVersionPresetID, + HasAITask: arg.HasAITask, } q.workspaceBuilds = append(q.workspaceBuilds, workspaceBuild) return nil diff --git a/coderd/templateversions.go b/coderd/templateversions.go index d79f86f1f6626..23ce3eaebb4f8 100644 --- a/coderd/templateversions.go +++ b/coderd/templateversions.go @@ -1730,6 +1730,9 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht String: req.ExampleID, Valid: req.ExampleID != "", }, + // appease the exhaustruct linter + // TODO: set this to whether the template version defines a `coder_ai_task` tf resource + HasAITask: false, }) if err != nil { if database.IsUniqueViolation(err, database.UniqueTemplateVersionsTemplateIDNameKey) { diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go index 201ef0c53a307..8a6d04272830b 100644 --- a/coderd/wsbuilder/wsbuilder.go +++ b/coderd/wsbuilder/wsbuilder.go @@ -425,6 +425,9 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object UUID: b.templateVersionPresetID, Valid: b.templateVersionPresetID != uuid.Nil, }, + // appease the exhaustruct linter + // TODO: set this to whether the build included a `coder_ai_task` tf resource + HasAITask: false, }) if err != nil { code := http.StatusInternalServerError pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy