make more use of dbgen

SasSwart · SasSwart · commit 61e86f687058 · 2025-03-28T09:46:58.000Z
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -960,8 +960,7 @@ func (s *MethodTestSuite) TestOrganization() {
 			TemplateVersionID: workspaceBuild.TemplateVersionID,
 			Name:              "test",
 		}
-		preset, err := db.InsertPreset(context.Background(), insertPresetParams)
-		require.NoError(s.T(), err)
+		preset := dbgen.Preset(s.T(), db, insertPresetParams)
 		insertPresetParametersParams := database.InsertPresetParametersParams{
 			TemplateVersionPresetID: preset.ID,
 			Names:                   []string{"test"},
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -1195,6 +1195,17 @@ func Preset(t testing.TB, db database.Store, seed database.InsertPresetParams) d
 	return preset
 }
 
+func PresetParameter(t testing.TB, db database.Store, seed database.InsertPresetParametersParams) []database.TemplateVersionPresetParameter {
+	parameters, err := db.InsertPresetParameters(genCtx, database.InsertPresetParametersParams{
+		TemplateVersionPresetID: takeFirst(seed.TemplateVersionPresetID, uuid.New()),
+		Names:                   takeFirstSlice(seed.Names, []string{testutil.GetRandomName(t)}),
+		Values:                  takeFirstSlice(seed.Values, []string{testutil.GetRandomName(t)}),
+	})
+
+	require.NoError(t, err, "insert preset parameters")
+	return parameters
+}
+
 func provisionerJobTiming(t testing.TB, db database.Store, seed database.ProvisionerJobTiming) database.ProvisionerJobTiming {
 	timing, err := db.InsertProvisionerJobTimings(genCtx, database.InsertProvisionerJobTimingsParams{
 		JobID:     takeFirst(seed.JobID, uuid.New()),
diff --git a/coderd/presets_test.go b/coderd/presets_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
+	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/codersdk"
@@ -86,16 +87,12 @@ func TestTemplateVersionPresets(t *testing.T) {
 			user := coderdtest.CreateFirstUser(t, client)
 			version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 
-			// nolint:gocritic // This is a test
-			provisionerCtx := dbauthz.AsProvisionerd(ctx)
-
 			// Insert all presets for this test case
 			for _, givenPreset := range tc.presets {
-				dbPreset, err := db.InsertPreset(provisionerCtx, database.InsertPresetParams{
+				dbPreset := dbgen.Preset(t, db, database.InsertPresetParams{
 					Name:              givenPreset.Name,
 					TemplateVersionID: version.ID,
 				})
-				require.NoError(t, err)
 
 				if len(givenPreset.Parameters) > 0 {
 					var presetParameterNames []string
@@ -104,12 +101,11 @@ func TestTemplateVersionPresets(t *testing.T) {
 						presetParameterNames = append(presetParameterNames, presetParameter.Name)
 						presetParameterValues = append(presetParameterValues, presetParameter.Value)
 					}
-					_, err = db.InsertPresetParameters(provisionerCtx, database.InsertPresetParametersParams{
+					dbgen.PresetParameter(t, db, database.InsertPresetParametersParams{
 						TemplateVersionPresetID: dbPreset.ID,
 						Names:                   presetParameterNames,
 						Values:                  presetParameterValues,
 					})
-					require.NoError(t, err)
 				}
 			}
 
