Merge branch 'main' into lilac/import-graph

coder · aslilac · Mar 24, 2025 · Mar 19, 2025 · Mar 20, 2025 · Mar 20, 2025
commit 94187117111b52f0c10a165d03c5db97f537b01a
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -54,33 +54,32 @@ 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),
-			// templateVersionTerraformData: make([]database.TemplateVersionTerraformDatum, 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),
 			templates:                 make([]database.TemplateTable, 0),
 			users:                     make([]database.User, 0),
 			userConfigs:               make([]database.UserConfig, 0),

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/...ons/000302_template_import_graph.down.sql → ...ons/000304_template_import_graph.down.sql b/...ons/000302_template_import_graph.down.sql → ...ons/000304_template_import_graph.down.sql
diff --git a/...tions/000302_template_import_graph.up.sql → ...tions/000304_template_import_graph.up.sql b/...tions/000302_template_import_graph.up.sql → ...tions/000304_template_import_graph.up.sql
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/unique_constraint.go b/coderd/database/unique_constraint.go