consistent api

sreya · sreya · commit bc6c44a7c622 · 2023-11-09T08:16:58.000Z
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -38,15 +38,15 @@ func Workspace(t testing.TB, db database.Store, seed database.Workspace) databas
 	return dbgen.Workspace(t, db, seed)
 }
 
-func TemplateWithVersion(t testing.TB, db database.Store, tpl database.Template, tv database.TemplateVersion, resources ...*proto.Resource) (database.Template, database.TemplateVersion) {
+func TemplateWithVersion(t testing.TB, db database.Store, tpl database.Template, tv database.TemplateVersion, job database.ProvisionerJob, resources ...*proto.Resource) (database.Template, database.TemplateVersion) {
 	t.Helper()
 
 	template := dbgen.Template(t, db, tpl)
 
 	tv.TemplateID = dbgen.TakeFirst(tv.TemplateID, uuid.NullUUID{UUID: template.ID, Valid: true})
 	tv.OrganizationID = dbgen.TakeFirst(tv.OrganizationID, template.OrganizationID)
 	tv.CreatedBy = dbgen.TakeFirst(tv.CreatedBy, template.CreatedBy)
-	version := TemplateVersion(t, db, tv, database.ProvisionerJob{}, resources...)
+	version := TemplateVersion(t, db, tv, job, resources...)
 
 	err := db.UpdateTemplateActiveVersionByID(dbgen.Ctx, database.UpdateTemplateActiveVersionByIDParams{
 		ID:              template.ID,
@@ -79,10 +79,10 @@ func TemplateVersion(t testing.TB, db database.Store, tv database.TemplateVersio
 	return templateVersion
 }
 
-func TemplateVersionWithParams(t testing.TB, db database.Store, tv database.TemplateVersion, params []database.TemplateVersionParameter) (database.TemplateVersion, []database.TemplateVersionParameter) {
+func TemplateVersionWithParams(t testing.TB, db database.Store, tv database.TemplateVersion, job database.ProvisionerJob, params []database.TemplateVersionParameter) (database.TemplateVersion, []database.TemplateVersionParameter) {
 	t.Helper()
 
-	version := TemplateVersion(t, db, tv, database.ProvisionerJob{})
+	version := TemplateVersion(t, db, tv, job)
 	tvps := make([]database.TemplateVersionParameter, 0, len(params))
 
 	for _, param := range params {
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -350,7 +350,7 @@ func TestResolveAutostart(t *testing.T) {
 	template, version1 := dbfake.TemplateWithVersion(t, db, database.Template{
 		CreatedBy:      owner.UserID,
 		OrganizationID: owner.OrganizationID,
-	}, database.TemplateVersion{})
+	}, database.TemplateVersion{}, database.ProvisionerJob{})
 
 	params := []database.TemplateVersionParameter{{
 		Name:         "param",
@@ -361,7 +361,7 @@ func TestResolveAutostart(t *testing.T) {
 		TemplateID:     uuid.NullUUID{UUID: template.ID, Valid: true},
 		OrganizationID: template.OrganizationID,
 		CreatedBy:      owner.UserID,
-	}, []database.TemplateVersionParameter{{
+	}, database.ProvisionerJob{}, []database.TemplateVersionParameter{{
 		Name:         "param",
 		DefaultValue: "",
 		Required:     true,
@@ -411,7 +411,7 @@ func TestResolveAutostart(t *testing.T) {
 		TemplateID:     uuid.NullUUID{UUID: template.ID, Valid: true},
 		OrganizationID: owner.OrganizationID,
 		CreatedBy:      owner.UserID,
-	}, params)
+	}, database.ProvisionerJob{}, params)
 
 	err = ownerClient.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{
 		ID: version3.ID,
diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go
@@ -1090,7 +1090,7 @@ func TestResolveAutostart(t *testing.T) {
 	template, version1 := dbfake.TemplateWithVersion(t, db, database.Template{
 		CreatedBy:      owner.UserID,
 		OrganizationID: owner.OrganizationID,
-	}, database.TemplateVersion{})
+	}, database.TemplateVersion{}, database.ProvisionerJob{})
 
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
@@ -1104,7 +1104,7 @@ func TestResolveAutostart(t *testing.T) {
 		TemplateID:     uuid.NullUUID{UUID: template.ID, Valid: true},
 		OrganizationID: template.OrganizationID,
 		CreatedBy:      owner.UserID,
-	}, []database.TemplateVersionParameter{{
+	}, database.ProvisionerJob{}, []database.TemplateVersionParameter{{
 		Name:         "param",
 		DefaultValue: "",
 		Required:     true,
