Skip to content

chore: refactor ResolveAutostart tests to use dbfake #10603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 1, 2023
Merged

chore: refactor ResolveAutostart tests to use dbfake #10603

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2fa1ef3
chore: refactor ResolveAutostart tests to use dbfake
sreya Nov 9, 2023
3ea2911
lint
sreya Nov 9, 2023
52ed0fc
Merge branch 'main' into jon/refautostart
sreya Nov 27, 2023
03ef4a6
refactor db fake
sreya Nov 28, 2023
670480e
Merge branch 'main' into jon/refautostart
sreya Nov 29, 2023
7cc8f4c
finish up api
sreya Nov 29, 2023
620d470
avoid exporting
sreya Nov 29, 2023
90d81fc
fix a test
sreya Nov 30, 2023
bba579d
update with workspacebuilder
sreya Nov 30, 2023
958a0fe
remove workspacebuilder
sreya Dec 1, 2023
4dfd3be
bad copy pasta
sreya Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lint
  • Loading branch information
@sreya
sreya committed Nov 9, 2023
commit 3ea291167d95b50d00179058fc9acc06435b769e
27 changes: 2 additions & 25 deletions coderd/database/dbfake/dbfake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/coder/coder/v2/coderd/database/dbtime"
"github.com/coder/coder/v2/coderd/provisionerdserver"
"github.com/coder/coder/v2/coderd/telemetry"
"github.com/coder/coder/v2/provisionersdk/proto"
sdkproto "github.com/coder/coder/v2/provisionersdk/proto"
)

Expand All @@ -38,7 +37,7 @@ 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, job database.ProvisionerJob, 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 ...*sdkproto.Resource) (database.Template, database.TemplateVersion) {
t.Helper()

template := dbgen.Template(t, db, tpl)
Expand All @@ -58,7 +57,7 @@ func TemplateWithVersion(t testing.TB, db database.Store, tpl database.Template,
return template, version
}

func TemplateVersion(t testing.TB, db database.Store, tv database.TemplateVersion, job database.ProvisionerJob, resources ...*proto.Resource) database.TemplateVersion {
func TemplateVersion(t testing.TB, db database.Store, tv database.TemplateVersion, job database.ProvisionerJob, resources ...*sdkproto.Resource) database.TemplateVersion {
templateVersion := dbgen.TemplateVersion(t, db, tv)
payload, err := json.Marshal(provisionerdserver.TemplateVersionImportJob{
TemplateVersionID: templateVersion.ID,
Expand Down Expand Up @@ -199,25 +198,3 @@ func ProvisionerJobResources(t testing.TB, db database.Store, job uuid.UUID, tra
require.NoError(t, err)
}
}

func must[V any](v V, err error) V {
if err != nil {
panic(err)
}
return v
}

// takeFirstF takes the first value that returns true
func takeFirstF[Value any](values []Value, take func(v Value) bool) Value {
for _, v := range values {
if take(v) {
return v
}
}
// If all empty, return the last element
if len(values) > 0 {
return values[len(values)-1]
}
var empty Value
return empty
}