Mar 24, 2025 · Mar 19, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.InsertTemplateVersionParameter(ctx, arg)
 }

 func (q *querier) InsertTemplateVersionTerraformValuesByJobID(ctx context.Context, arg database.InsertTemplateVersionTerraformValuesByJobIDParams) error {
 if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 return err
 }
 return q.db.InsertTemplateVersionTerraformValuesByJobID(ctx, arg)
 }

 func (q *querier) InsertTemplateVersionVariable(ctx context.Context, arg database.InsertTemplateVersionVariableParams) (database.TemplateVersionVariable, error) {
 if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 return database.TemplateVersionVariable{}, err
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 OrganizationID: t1.OrganizationID,
 }).Asserts(t1, policy.ActionRead, t1, policy.ActionCreate)
 }))
 s.Run("InsertTemplateVersionTerraformValuesByJobID", s.Subtest(func(db database.Store, check *expects) {
 o := dbgen.Organization(s.T(), db, database.Organization{})
 u := dbgen.User(s.T(), db, database.User{})
 _ = dbgen.OrganizationMember(s.T(), db, database.OrganizationMember{OrganizationID: o.ID, UserID: u.ID})
 t := dbgen.Template(s.T(), db, database.Template{OrganizationID: o.ID, CreatedBy: u.ID})
 job := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{OrganizationID: o.ID})
 _ = dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
 OrganizationID: o.ID,
 CreatedBy:      u.ID,
 JobID:          job.ID,
 TemplateID:     uuid.NullUUID{UUID: t.ID, Valid: true},
 })
 check.Args(database.InsertTemplateVersionTerraformValuesByJobIDParams{
 JobID:      job.ID,
 CachedPlan: []byte("{}"),
 }).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 }))
 s.Run("SoftDeleteTemplateByID", s.Subtest(func(db database.Store, check *expects) {
 dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
 t1 := dbgen.Template(s.T(), db, database.Template{})
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 q := &FakeQuerier{
 mutex: &sync.RWMutex{},
 data: &data{
 apiKeys:                   make([]database.APIKey, 0),
 auditLogs:                 make([]database.AuditLog, 0),
 customRoles:               make([]database.CustomRole, 0),
 dbcryptKeys:               make([]database.DBCryptKey, 0),
 externalAuthLinks:         make([]database.ExternalAuthLink, 0),
 files:                     make([]database.File, 0),
 gitSSHKey:                 make([]database.GitSSHKey, 0),
 groups:                    make([]database.Group, 0),
 groupMembers:              make([]database.GroupMemberTable, 0),
 licenses:                  make([]database.License, 0),
 locks:                     map[int64]struct{}{},
 notificationMessages:      make([]database.NotificationMessage, 0),
 notificationPreferences:   make([]database.NotificationPreference, 0),
 organizationMembers:       make([]database.OrganizationMember, 0),
 organizations:             make([]database.Organization, 0),
 inboxNotifications:        make([]database.InboxNotification, 0),
 parameterSchemas:          make([]database.ParameterSchema, 0),
 presets:                   make([]database.TemplateVersionPreset, 0),
 presetParameters:          make([]database.TemplateVersionPresetParameter, 0),
 provisionerDaemons:        make([]database.ProvisionerDaemon, 0),
 provisionerJobs:           make([]database.ProvisionerJob, 0),
 provisionerJobLogs:        make([]database.ProvisionerJobLog, 0),
 provisionerKeys:           make([]database.ProvisionerKey, 0),
 runtimeConfig:             map[string]string{},
 telemetryItems:            make([]database.TelemetryItem, 0),
 templateVersions:          make([]database.TemplateVersionTable, 0),
 templates:                 make([]database.TemplateTable, 0),
 users:                     make([]database.User, 0),
 userConfigs:               make([]database.UserConfig, 0),
 userStatusChanges:         make([]database.UserStatusChange, 0),
 workspaceAgents:           make([]database.WorkspaceAgent, 0),
 workspaceResources:        make([]database.WorkspaceResource, 0),
 workspaceModules:          make([]database.WorkspaceModule, 0),
 workspaceResourceMetadata: make([]database.WorkspaceResourceMetadatum, 0),
 workspaceAgentStats:       make([]database.WorkspaceAgentStat, 0),
 workspaceAgentLogs:        make([]database.WorkspaceAgentLog, 0),
 workspaceBuilds:           make([]database.WorkspaceBuild, 0),
 workspaceApps:             make([]database.WorkspaceApp, 0),
 workspaceAppAuditSessions: make([]database.WorkspaceAppAuditSession, 0),
 workspaces:                make([]database.WorkspaceTable, 0),
 workspaceProxies:          make([]database.WorkspaceProxy, 0),
 apiKeys:                        make([]database.APIKey, 0),
 auditLogs:                      make([]database.AuditLog, 0),
 customRoles:                    make([]database.CustomRole, 0),
 dbcryptKeys:                    make([]database.DBCryptKey, 0),
 externalAuthLinks:              make([]database.ExternalAuthLink, 0),
 files:                          make([]database.File, 0),
 gitSSHKey:                      make([]database.GitSSHKey, 0),
 groups:                         make([]database.Group, 0),
 groupMembers:                   make([]database.GroupMemberTable, 0),
 licenses:                       make([]database.License, 0),
 locks:                          map[int64]struct{}{},
 notificationMessages:           make([]database.NotificationMessage, 0),
 notificationPreferences:        make([]database.NotificationPreference, 0),
 organizationMembers:            make([]database.OrganizationMember, 0),
 organizations:                  make([]database.Organization, 0),
 inboxNotifications:             make([]database.InboxNotification, 0),
 parameterSchemas:               make([]database.ParameterSchema, 0),
 presets:                        make([]database.TemplateVersionPreset, 0),
 presetParameters:               make([]database.TemplateVersionPresetParameter, 0),
 provisionerDaemons:             make([]database.ProvisionerDaemon, 0),
 provisionerJobs:                make([]database.ProvisionerJob, 0),
 provisionerJobLogs:             make([]database.ProvisionerJobLog, 0),
 provisionerKeys:                make([]database.ProvisionerKey, 0),
 runtimeConfig:                  map[string]string{},
 telemetryItems:                 make([]database.TelemetryItem, 0),
 templateVersions:               make([]database.TemplateVersionTable, 0),
 templateVersionTerraformValues: make([]database.TemplateVersionTerraformValue, 0),
 templates:                      make([]database.TemplateTable, 0),
 users:                          make([]database.User, 0),
 userConfigs:                    make([]database.UserConfig, 0),
 userStatusChanges:              make([]database.UserStatusChange, 0),
 workspaceAgents:                make([]database.WorkspaceAgent, 0),
 workspaceResources:             make([]database.WorkspaceResource, 0),
 workspaceModules:               make([]database.WorkspaceModule, 0),
 workspaceResourceMetadata:      make([]database.WorkspaceResourceMetadatum, 0),
 workspaceAgentStats:            make([]database.WorkspaceAgentStat, 0),
 workspaceAgentLogs:             make([]database.WorkspaceAgentLog, 0),
 workspaceBuilds:                make([]database.WorkspaceBuild, 0),
 workspaceApps:                  make([]database.WorkspaceApp, 0),
 workspaceAppAuditSessions:      make([]database.WorkspaceAppAuditSession, 0),
 workspaces:                     make([]database.WorkspaceTable, 0),
 workspaceProxies:               make([]database.WorkspaceProxy, 0),
 },
 }
 // Always start with a default org. Matching migration 198.
 replicas                             []database.Replica
 templateVersions                     []database.TemplateVersionTable
 templateVersionParameters            []database.TemplateVersionParameter
 templateVersionTerraformValues       []database.TemplateVersionTerraformValue
 templateVersionVariables             []database.TemplateVersionVariable
 templateVersionWorkspaceTags         []database.TemplateVersionWorkspaceTag
 templates                            []database.TemplateTable
 return param, nil
 }

 func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(_ context.Context, arg database.InsertTemplateVersionTerraformValuesByJobIDParams) error {
 err := validateDatabaseType(arg)
 if err != nil {
 return err
 }

 q.mutex.Lock()
 defer q.mutex.Unlock()

 // Find the template version by the job_id
 templateVersion, ok := slice.Find(q.templateVersions, func(v database.TemplateVersionTable) bool {
 return v.JobID == arg.JobID
 })
 if !ok {
 return sql.ErrNoRows
 }

 if !json.Valid(arg.CachedPlan) {
 return xerrors.Errorf("cached plan must be valid json, received %q", string(arg.CachedPlan))
 }

 // Insert the new row
 row := database.TemplateVersionTerraformValue{
 TemplateVersionID: templateVersion.ID,
 CachedPlan:        arg.CachedPlan,
 UpdatedAt:         arg.UpdatedAt,
 }
 q.templateVersionTerraformValues = append(q.templateVersionTerraformValues, row)
 return nil
 }

 func (q *FakeQuerier) InsertTemplateVersionVariable(_ context.Context, arg database.InsertTemplateVersionVariableParams) (database.TemplateVersionVariable, error) {
 if err := validateDatabaseType(arg); err != nil {
 return database.TemplateVersionVariable{}, err
diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/foreign_key_constraint.go b/coderd/database/foreign_key_constraint.go
diff --git a/coderd/database/migrations/000306_template_version_terraform_values.down.sql b/coderd/database/migrations/000306_template_version_terraform_values.down.sql
 drop table template_version_terraform_values;
diff --git a/coderd/database/migrations/000306_template_version_terraform_values.up.sql b/coderd/database/migrations/000306_template_version_terraform_values.up.sql
 create table template_version_terraform_values (
 template_version_id uuid not null unique references template_versions(id) on delete cascade,
 updated_at timestamptz not null default now(),
 cached_plan jsonb not null
 );
diff --git a/coderd/database/migrations/testdata/fixtures/000306_add_terraform_plans.up.sql b/coderd/database/migrations/testdata/fixtures/000306_add_terraform_plans.up.sql
 insert into
 template_version_terraform_values (
 template_version_id,
 cached_plan,
 updated_at
 )
 select
 id,
 '{}',
 now()
 from
 template_versions;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversionterraformvalues.sql b/coderd/database/queries/templateversionterraformvalues.sql
 -- name: InsertTemplateVersionTerraformValuesByJobID :exec
 INSERT INTO
 template_version_terraform_values (
 template_version_id,
 cached_plan,
 updated_at
 )
 VALUES
 (
 (select id from template_versions where job_id = @job_id),
 @cached_plan,
 @updated_at
 );
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3320,6 +3320,13 @@ func (q *querier) InsertTemplateVersionParameter(ctx context.Context, arg databa
		return q.db.InsertTemplateVersionParameter(ctx, arg)
		}

		func (q *querier) InsertTemplateVersionTerraformValuesByJobID(ctx context.Context, arg database.InsertTemplateVersionTerraformValuesByJobIDParams) error {
aslilac marked this conversation as resolved. Show resolvedHide resolved
		if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
		return err
		}
		return q.db.InsertTemplateVersionTerraformValuesByJobID(ctx, arg)
		}

		func (q *querier) InsertTemplateVersionVariable(ctx context.Context, arg database.InsertTemplateVersionVariableParams) (database.TemplateVersionVariable, error) {
		if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
		return database.TemplateVersionVariable{}, err
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1261,6 +1261,23 @@ func (s *MethodTestSuite) TestTemplate() {
		OrganizationID: t1.OrganizationID,
		}).Asserts(t1, policy.ActionRead, t1, policy.ActionCreate)
		}))
		s.Run("InsertTemplateVersionTerraformValuesByJobID", s.Subtest(func(db database.Store, check *expects) {
		o := dbgen.Organization(s.T(), db, database.Organization{})
		u := dbgen.User(s.T(), db, database.User{})
		_ = dbgen.OrganizationMember(s.T(), db, database.OrganizationMember{OrganizationID: o.ID, UserID: u.ID})
		t := dbgen.Template(s.T(), db, database.Template{OrganizationID: o.ID, CreatedBy: u.ID})
		job := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{OrganizationID: o.ID})
		_ = dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
		OrganizationID: o.ID,
		CreatedBy: u.ID,
		JobID: job.ID,
		TemplateID: uuid.NullUUID{UUID: t.ID, Valid: true},
		})
		check.Args(database.InsertTemplateVersionTerraformValuesByJobIDParams{
		JobID: job.ID,
		CachedPlan: []byte("{}"),
		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
		}))
		s.Run("SoftDeleteTemplateByID", s.Subtest(func(db database.Store, check *expects) {
		dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
		t1 := dbgen.Template(s.T(), db, database.Template{})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,47 +54,48 @@ func New() database.Store {
		q := &FakeQuerier{
		mutex: &sync.RWMutex{},
		data: &data{
		apiKeys: make([]database.APIKey, 0),
		auditLogs: make([]database.AuditLog, 0),
		customRoles: make([]database.CustomRole, 0),
		dbcryptKeys: make([]database.DBCryptKey, 0),
		externalAuthLinks: make([]database.ExternalAuthLink, 0),
		files: make([]database.File, 0),
		gitSSHKey: make([]database.GitSSHKey, 0),
		groups: make([]database.Group, 0),
		groupMembers: make([]database.GroupMemberTable, 0),
		licenses: make([]database.License, 0),
		locks: map[int64]struct{}{},
		notificationMessages: make([]database.NotificationMessage, 0),
		notificationPreferences: make([]database.NotificationPreference, 0),
		organizationMembers: make([]database.OrganizationMember, 0),
		organizations: make([]database.Organization, 0),
		inboxNotifications: make([]database.InboxNotification, 0),
		parameterSchemas: make([]database.ParameterSchema, 0),
		presets: make([]database.TemplateVersionPreset, 0),
		presetParameters: make([]database.TemplateVersionPresetParameter, 0),
		provisionerDaemons: make([]database.ProvisionerDaemon, 0),
		provisionerJobs: make([]database.ProvisionerJob, 0),
		provisionerJobLogs: make([]database.ProvisionerJobLog, 0),
		provisionerKeys: make([]database.ProvisionerKey, 0),
		runtimeConfig: map[string]string{},
		telemetryItems: make([]database.TelemetryItem, 0),
		templateVersions: make([]database.TemplateVersionTable, 0),
		templates: make([]database.TemplateTable, 0),
		users: make([]database.User, 0),
		userConfigs: make([]database.UserConfig, 0),
		userStatusChanges: make([]database.UserStatusChange, 0),
		workspaceAgents: make([]database.WorkspaceAgent, 0),
		workspaceResources: make([]database.WorkspaceResource, 0),
		workspaceModules: make([]database.WorkspaceModule, 0),
		workspaceResourceMetadata: make([]database.WorkspaceResourceMetadatum, 0),
		workspaceAgentStats: make([]database.WorkspaceAgentStat, 0),
		workspaceAgentLogs: make([]database.WorkspaceAgentLog, 0),
		workspaceBuilds: make([]database.WorkspaceBuild, 0),
		workspaceApps: make([]database.WorkspaceApp, 0),
		workspaceAppAuditSessions: make([]database.WorkspaceAppAuditSession, 0),
		workspaces: make([]database.WorkspaceTable, 0),
		workspaceProxies: make([]database.WorkspaceProxy, 0),
		apiKeys: make([]database.APIKey, 0),
		auditLogs: make([]database.AuditLog, 0),
		customRoles: make([]database.CustomRole, 0),
		dbcryptKeys: make([]database.DBCryptKey, 0),
		externalAuthLinks: make([]database.ExternalAuthLink, 0),
		files: make([]database.File, 0),
		gitSSHKey: make([]database.GitSSHKey, 0),
		groups: make([]database.Group, 0),
		groupMembers: make([]database.GroupMemberTable, 0),
		licenses: make([]database.License, 0),
		locks: map[int64]struct{}{},
		notificationMessages: make([]database.NotificationMessage, 0),
		notificationPreferences: make([]database.NotificationPreference, 0),
		organizationMembers: make([]database.OrganizationMember, 0),
		organizations: make([]database.Organization, 0),
		inboxNotifications: make([]database.InboxNotification, 0),
		parameterSchemas: make([]database.ParameterSchema, 0),
		presets: make([]database.TemplateVersionPreset, 0),
		presetParameters: make([]database.TemplateVersionPresetParameter, 0),
		provisionerDaemons: make([]database.ProvisionerDaemon, 0),
		provisionerJobs: make([]database.ProvisionerJob, 0),
		provisionerJobLogs: make([]database.ProvisionerJobLog, 0),
		provisionerKeys: make([]database.ProvisionerKey, 0),
		runtimeConfig: map[string]string{},
		telemetryItems: make([]database.TelemetryItem, 0),
		templateVersions: make([]database.TemplateVersionTable, 0),
		templateVersionTerraformValues: make([]database.TemplateVersionTerraformValue, 0),
		templates: make([]database.TemplateTable, 0),
		users: make([]database.User, 0),
		userConfigs: make([]database.UserConfig, 0),
		userStatusChanges: make([]database.UserStatusChange, 0),
		workspaceAgents: make([]database.WorkspaceAgent, 0),
		workspaceResources: make([]database.WorkspaceResource, 0),
		workspaceModules: make([]database.WorkspaceModule, 0),
		workspaceResourceMetadata: make([]database.WorkspaceResourceMetadatum, 0),
		workspaceAgentStats: make([]database.WorkspaceAgentStat, 0),
		workspaceAgentLogs: make([]database.WorkspaceAgentLog, 0),
		workspaceBuilds: make([]database.WorkspaceBuild, 0),
		workspaceApps: make([]database.WorkspaceApp, 0),
		workspaceAppAuditSessions: make([]database.WorkspaceAppAuditSession, 0),
		workspaces: make([]database.WorkspaceTable, 0),
		workspaceProxies: make([]database.WorkspaceProxy, 0),
		},
		}
		// Always start with a default org. Matching migration 198.
Expand DownExpand Up		@@ -222,6 +223,7 @@ type data struct {
		replicas []database.Replica
		templateVersions []database.TemplateVersionTable
		templateVersionParameters []database.TemplateVersionParameter
		templateVersionTerraformValues []database.TemplateVersionTerraformValue
		templateVersionVariables []database.TemplateVersionVariable
		templateVersionWorkspaceTags []database.TemplateVersionWorkspaceTag
		templates []database.TemplateTable
Expand DownExpand Up		@@ -8828,6 +8830,37 @@ func (q *FakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
		return param, nil
		}

		func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(_ context.Context, arg database.InsertTemplateVersionTerraformValuesByJobIDParams) error {
		err := validateDatabaseType(arg)
		if err != nil {
		return err
		}

		q.mutex.Lock()
		defer q.mutex.Unlock()

		// Find the template version by the job_id
		templateVersion, ok := slice.Find(q.templateVersions, func(v database.TemplateVersionTable) bool {
		return v.JobID == arg.JobID
		})
		if !ok {
		return sql.ErrNoRows
		}

		if !json.Valid(arg.CachedPlan) {
		return xerrors.Errorf("cached plan must be valid json, received %q", string(arg.CachedPlan))
		}

		// Insert the new row
		row := database.TemplateVersionTerraformValue{
		TemplateVersionID: templateVersion.ID,
		CachedPlan: arg.CachedPlan,
		UpdatedAt: arg.UpdatedAt,
		}
aslilac marked this conversation as resolved. Show resolvedHide resolved
		q.templateVersionTerraformValues = append(q.templateVersionTerraformValues, row)
		return nil
		}

		func (q *FakeQuerier) InsertTemplateVersionVariable(_ context.Context, arg database.InsertTemplateVersionVariableParams) (database.TemplateVersionVariable, error) {
		if err := validateDatabaseType(arg); err != nil {
		return database.TemplateVersionVariable{}, err
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		create table template_version_terraform_values (
		template_version_id uuid not null unique references template_versions(id) on delete cascade,
		updated_at timestamptz not null default now(),
		cached_plan jsonb not null
		);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,12 @@
		insert into
		template_version_terraform_values (
		template_version_id,
		cached_plan,
		updated_at
		)
		select
		id,
		'{}',
		now()
		from
		template_versions;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,13 @@
		-- name: InsertTemplateVersionTerraformValuesByJobID :exec
		INSERT INTO
		template_version_terraform_values (
		template_version_id,
		cached_plan,
		updated_at
		)
		VALUES
		(
		(select id from template_versions where job_id = @job_id),
		@cached_plan,
		@updated_at
		);