From b64e40433a9cdf783e87ecbade77ee6d8f1f3b57 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 15 May 2025 17:45:22 -0500 Subject: [PATCH] chore: cherry-pick db migrations only 000320 (#17749) --- coderd/database/dump.sql | 6 +++++- coderd/database/foreign_key_constraint.go | 1 + .../migrations/000320_terraform_cached_modules.down.sql | 1 + .../migrations/000320_terraform_cached_modules.up.sql | 1 + coderd/database/models.go | 1 + coderd/database/queries.sql.go | 9 +++++++-- 6 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 coderd/database/migrations/000320_terraform_cached_modules.down.sql create mode 100644 coderd/database/migrations/000320_terraform_cached_modules.up.sql diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql index 61dec929f35c1..6d2df4b13cb88 100644 --- a/coderd/database/dump.sql +++ b/coderd/database/dump.sql @@ -1419,7 +1419,8 @@ CREATE TABLE template_version_presets ( CREATE TABLE template_version_terraform_values ( template_version_id uuid NOT NULL, updated_at timestamp with time zone DEFAULT now() NOT NULL, - cached_plan jsonb NOT NULL + cached_plan jsonb NOT NULL, + cached_module_files uuid ); CREATE TABLE template_version_variables ( @@ -2831,6 +2832,9 @@ ALTER TABLE ONLY template_version_preset_parameters ALTER TABLE ONLY template_version_presets ADD CONSTRAINT template_version_presets_template_version_id_fkey FOREIGN KEY (template_version_id) REFERENCES template_versions(id) ON DELETE CASCADE; +ALTER TABLE ONLY template_version_terraform_values + ADD CONSTRAINT template_version_terraform_values_cached_module_files_fkey FOREIGN KEY (cached_module_files) REFERENCES files(id); + ALTER TABLE ONLY template_version_terraform_values ADD CONSTRAINT template_version_terraform_values_template_version_id_fkey FOREIGN KEY (template_version_id) REFERENCES template_versions(id) ON DELETE CASCADE; diff --git a/coderd/database/foreign_key_constraint.go b/coderd/database/foreign_key_constraint.go index 3f5ce963e6fdb..78818daa1ae91 100644 --- a/coderd/database/foreign_key_constraint.go +++ b/coderd/database/foreign_key_constraint.go @@ -44,6 +44,7 @@ const ( ForeignKeyTemplateVersionParametersTemplateVersionID ForeignKeyConstraint = "template_version_parameters_template_version_id_fkey" // ALTER TABLE ONLY template_version_parameters ADD CONSTRAINT template_version_parameters_template_version_id_fkey FOREIGN KEY (template_version_id) REFERENCES template_versions(id) ON DELETE CASCADE; ForeignKeyTemplateVersionPresetParametTemplateVersionPresetID ForeignKeyConstraint = "template_version_preset_paramet_template_version_preset_id_fkey" // ALTER TABLE ONLY template_version_preset_parameters ADD CONSTRAINT template_version_preset_paramet_template_version_preset_id_fkey FOREIGN KEY (template_version_preset_id) REFERENCES template_version_presets(id) ON DELETE CASCADE; ForeignKeyTemplateVersionPresetsTemplateVersionID ForeignKeyConstraint = "template_version_presets_template_version_id_fkey" // ALTER TABLE ONLY template_version_presets ADD CONSTRAINT template_version_presets_template_version_id_fkey FOREIGN KEY (template_version_id) REFERENCES template_versions(id) ON DELETE CASCADE; + ForeignKeyTemplateVersionTerraformValuesCachedModuleFiles ForeignKeyConstraint = "template_version_terraform_values_cached_module_files_fkey" // ALTER TABLE ONLY template_version_terraform_values ADD CONSTRAINT template_version_terraform_values_cached_module_files_fkey FOREIGN KEY (cached_module_files) REFERENCES files(id); ForeignKeyTemplateVersionTerraformValuesTemplateVersionID ForeignKeyConstraint = "template_version_terraform_values_template_version_id_fkey" // ALTER TABLE ONLY template_version_terraform_values ADD CONSTRAINT template_version_terraform_values_template_version_id_fkey FOREIGN KEY (template_version_id) REFERENCES template_versions(id) ON DELETE CASCADE; ForeignKeyTemplateVersionVariablesTemplateVersionID ForeignKeyConstraint = "template_version_variables_template_version_id_fkey" // ALTER TABLE ONLY template_version_variables ADD CONSTRAINT template_version_variables_template_version_id_fkey FOREIGN KEY (template_version_id) REFERENCES template_versions(id) ON DELETE CASCADE; ForeignKeyTemplateVersionWorkspaceTagsTemplateVersionID ForeignKeyConstraint = "template_version_workspace_tags_template_version_id_fkey" // ALTER TABLE ONLY template_version_workspace_tags ADD CONSTRAINT template_version_workspace_tags_template_version_id_fkey FOREIGN KEY (template_version_id) REFERENCES template_versions(id) ON DELETE CASCADE; diff --git a/coderd/database/migrations/000320_terraform_cached_modules.down.sql b/coderd/database/migrations/000320_terraform_cached_modules.down.sql new file mode 100644 index 0000000000000..6894e43ca9a98 --- /dev/null +++ b/coderd/database/migrations/000320_terraform_cached_modules.down.sql @@ -0,0 +1 @@ +ALTER TABLE template_version_terraform_values DROP COLUMN cached_module_files; diff --git a/coderd/database/migrations/000320_terraform_cached_modules.up.sql b/coderd/database/migrations/000320_terraform_cached_modules.up.sql new file mode 100644 index 0000000000000..17028040de7d1 --- /dev/null +++ b/coderd/database/migrations/000320_terraform_cached_modules.up.sql @@ -0,0 +1 @@ +ALTER TABLE template_version_terraform_values ADD COLUMN cached_module_files uuid references files(id); diff --git a/coderd/database/models.go b/coderd/database/models.go index 2dfc2c23ed6e0..1b6046134bfd7 100644 --- a/coderd/database/models.go +++ b/coderd/database/models.go @@ -3265,6 +3265,7 @@ type TemplateVersionTerraformValue struct { TemplateVersionID uuid.UUID `db:"template_version_id" json:"template_version_id"` UpdatedAt time.Time `db:"updated_at" json:"updated_at"` CachedPlan json.RawMessage `db:"cached_plan" json:"cached_plan"` + CachedModuleFiles uuid.NullUUID `db:"cached_module_files" json:"cached_module_files"` } type TemplateVersionVariable struct { diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 9d33c33b9dfe4..9a16337eadfaa 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -11505,7 +11505,7 @@ func (q *sqlQuerier) UpdateTemplateVersionExternalAuthProvidersByJobID(ctx conte const getTemplateVersionTerraformValues = `-- name: GetTemplateVersionTerraformValues :one SELECT - template_version_terraform_values.template_version_id, template_version_terraform_values.updated_at, template_version_terraform_values.cached_plan + template_version_terraform_values.template_version_id, template_version_terraform_values.updated_at, template_version_terraform_values.cached_plan, template_version_terraform_values.cached_module_files FROM template_version_terraform_values WHERE @@ -11515,7 +11515,12 @@ WHERE func (q *sqlQuerier) GetTemplateVersionTerraformValues(ctx context.Context, templateVersionID uuid.UUID) (TemplateVersionTerraformValue, error) { row := q.db.QueryRowContext(ctx, getTemplateVersionTerraformValues, templateVersionID) var i TemplateVersionTerraformValue - err := row.Scan(&i.TemplateVersionID, &i.UpdatedAt, &i.CachedPlan) + err := row.Scan( + &i.TemplateVersionID, + &i.UpdatedAt, + &i.CachedPlan, + &i.CachedModuleFiles, + ) return i, err }