mirror of
https://github.com/coder/coder.git
synced 2025-07-06 15:41:45 +00:00
chore: dbgen passing nil slices to postgres is not valid (#6714)
This commit is contained in:
@ -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) {
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user