Skip to content

Commit ab764db

Browse files
authored
chore: dbgen passing nil slices to postgres is not valid (#6714)
1 parent 5460ab4 commit ab764db

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

coderd/database/dbauthz/querier_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,9 +1150,10 @@ func (s *MethodTestSuite) TestWorkspace() {
11501150
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
11511151
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
11521152
check.Args(database.UpdateWorkspaceBuildByIDParams{
1153-
ID: build.ID,
1154-
UpdatedAt: build.UpdatedAt,
1155-
Deadline: build.Deadline,
1153+
ID: build.ID,
1154+
UpdatedAt: build.UpdatedAt,
1155+
Deadline: build.Deadline,
1156+
ProvisionerState: []byte{},
11561157
}).Asserts(ws, rbac.ActionUpdate).Returns(build)
11571158
}))
11581159
s.Run("SoftDeleteWorkspaceByID", s.Subtest(func(db database.Store, check *expects) {

coderd/database/dbgen/take.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package dbgen
33
import "net"
44

55
func takeFirstIP(values ...net.IPNet) net.IPNet {
6-
takeFirstSlice([]string{})
7-
86
return takeFirstF(values, func(v net.IPNet) bool {
97
return len(v.IP) != 0 && len(v.Mask) != 0
108
})
@@ -20,13 +18,16 @@ func takeFirstSlice[T any](values ...[]T) []T {
2018

2119
// takeFirstF takes the first value that returns true
2220
func takeFirstF[Value any](values []Value, take func(v Value) bool) Value {
23-
var empty Value
2421
for _, v := range values {
2522
if take(v) {
2623
return v
2724
}
2825
}
29-
// If all empty, return empty
26+
// If all empty, return the last element
27+
if len(values) > 0 {
28+
return values[len(values)-1]
29+
}
30+
var empty Value
3031
return empty
3132
}
3233

0 commit comments

Comments
 (0)