diff --git a/coderd/database/dbauthz/querier_test.go b/coderd/database/dbauthz/querier_test.go index cb746cb81d..41c27f37ad 100644 --- a/coderd/database/dbauthz/querier_test.go +++ b/coderd/database/dbauthz/querier_test.go @@ -1150,9 +1150,10 @@ func (s *MethodTestSuite) TestWorkspace() { ws := dbgen.Workspace(s.T(), db, database.Workspace{}) build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()}) check.Args(database.UpdateWorkspaceBuildByIDParams{ - ID: build.ID, - UpdatedAt: build.UpdatedAt, - Deadline: build.Deadline, + ID: build.ID, + UpdatedAt: build.UpdatedAt, + Deadline: build.Deadline, + ProvisionerState: []byte{}, }).Asserts(ws, rbac.ActionUpdate).Returns(build) })) s.Run("SoftDeleteWorkspaceByID", s.Subtest(func(db database.Store, check *expects) { diff --git a/coderd/database/dbgen/take.go b/coderd/database/dbgen/take.go index caa4a1b403..6792e5bb83 100644 --- a/coderd/database/dbgen/take.go +++ b/coderd/database/dbgen/take.go @@ -3,8 +3,6 @@ package dbgen import "net" func takeFirstIP(values ...net.IPNet) net.IPNet { - takeFirstSlice([]string{}) - return takeFirstF(values, func(v net.IPNet) bool { return len(v.IP) != 0 && len(v.Mask) != 0 }) @@ -20,13 +18,16 @@ func takeFirstSlice[T any](values ...[]T) []T { // takeFirstF takes the first value that returns true func takeFirstF[Value any](values []Value, take func(v Value) bool) Value { - var empty Value for _, v := range values { if take(v) { return v } } - // If all empty, return empty + // If all empty, return the last element + if len(values) > 0 { + return values[len(values)-1] + } + var empty Value return empty }