generate ids for presets by default

SasSwart · SasSwart · commit ce2956d1a78e · 2025-02-12T10:13:43.000Z
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -886,7 +886,6 @@ func (s *MethodTestSuite) TestOrganization() {
 			JobID:             job.ID,
 		})
 		insertPresetParams := database.InsertPresetParams{
-			ID:                uuid.New(),
 			TemplateVersionID: workspaceBuild.TemplateVersionID,
 			Name:              "test",
 		}
@@ -3817,7 +3816,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
 			CreatedBy:      user.ID,
 		})
 		preset, err := db.InsertPreset(ctx, database.InsertPresetParams{
-			ID:                uuid.New(),
 			TemplateVersionID: templateVersion.ID,
 			Name:              "test",
 		})
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -8151,7 +8151,7 @@ func (q *FakeQuerier) InsertPreset(_ context.Context, arg database.InsertPresetP
 
 	//nolint:gosimple // arg needs to keep its type for interface reasons and that type is not appropriate for preset below.
 	preset := database.TemplateVersionPreset{
-		ID:                arg.ID,
+		ID:                uuid.New(),
 		TemplateVersionID: arg.TemplateVersionID,
 		Name:              arg.Name,
 		CreatedAt:         arg.CreatedAt,
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000292_generate_default_preset_parameter_ids.down.sql b/coderd/database/migrations/000292_generate_default_preset_parameter_ids.down.sql
@@ -1,2 +1,5 @@
+ALTER TABLE template_version_presets
+ALTER COLUMN id DROP DEFAULT;
+
 ALTER TABLE template_version_preset_parameters
 ALTER COLUMN id DROP DEFAULT;
diff --git a/coderd/database/migrations/000292_generate_default_preset_parameter_ids.up.sql b/coderd/database/migrations/000292_generate_default_preset_parameter_ids.up.sql
@@ -1,2 +1,5 @@
+ALTER TABLE template_version_presets
+ALTER COLUMN id SET DEFAULT gen_random_uuid();
+
 ALTER TABLE template_version_preset_parameters
 ALTER COLUMN id SET DEFAULT gen_random_uuid();
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/presets.sql b/coderd/database/queries/presets.sql
@@ -1,8 +1,8 @@
 -- name: InsertPreset :one
 INSERT INTO
-	template_version_presets (id, template_version_id, name, created_at)
+	template_version_presets (template_version_id, name, created_at)
 VALUES
-	(@id, @template_version_id, @name, @created_at) RETURNING *;
+	(@template_version_id, @name, @created_at) RETURNING *;
 
 -- name: InsertPresetParameters :many
 INSERT INTO
diff --git a/coderd/presets_test.go b/coderd/presets_test.go
@@ -44,7 +44,6 @@ func TestTemplateVersionPresets(t *testing.T) {
 	provisionerCtx := dbauthz.AsProvisionerd(ctx)
 
 	preset, err := db.InsertPreset(provisionerCtx, database.InsertPresetParams{
-		ID:                sdkPreset.ID,
 		Name:              sdkPreset.Name,
 		TemplateVersionID: version.ID,
 	})
