fix: data races in databasefake (#4084)

coadler · web-flow · commit 86fdafda2372 · 2022-09-16T00:06:39.000Z
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1257,6 +1257,9 @@ func (q *fakeQuerier) GetOrganizationMembershipsByUserID(_ context.Context, user
 }
 
 func (q *fakeQuerier) UpdateMemberRoles(_ context.Context, arg database.UpdateMemberRolesParams) (database.OrganizationMember, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
 	for i, mem := range q.organizationMembers {
 		if mem.UserID == arg.UserID && mem.OrganizationID == arg.OrgID {
 			uniqueRoles := make([]string, 0, len(arg.GrantedRoles))
@@ -1275,6 +1278,7 @@ func (q *fakeQuerier) UpdateMemberRoles(_ context.Context, arg database.UpdateMe
 			return mem, nil
 		}
 	}
+
 	return database.OrganizationMember{}, sql.ErrNoRows
 }
 
@@ -1449,6 +1453,10 @@ func (q *fakeQuerier) GetWorkspaceResourceMetadataCreatedAfter(ctx context.Conte
 	for _, resource := range resources {
 		resourceIDs[resource.ID] = struct{}{}
 	}
+
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
 	metadata := make([]database.WorkspaceResourceMetadatum, 0)
 	for _, m := range q.provisionerJobResourceMetadata {
 		_, ok := resourceIDs[m.WorkspaceResourceID]

Original file line number	Diff line number	Diff line change
`@@ -1257,6 +1257,9 @@ func (q *fakeQuerier) GetOrganizationMembershipsByUserID(_ context.Context, user`
`1257`	`1257`	`}`
`1258`	`1258`
`1259`	`1259`	`func (q *fakeQuerier) UpdateMemberRoles(_ context.Context, arg database.UpdateMemberRolesParams) (database.OrganizationMember, error) {`
	`1260`	`+ q.mutex.Lock()`
	`1261`	`+ defer q.mutex.Unlock()`
	`1262`	`+`
`1260`	`1263`	`for i, mem := range q.organizationMembers {`
`1261`	`1264`	`if mem.UserID == arg.UserID && mem.OrganizationID == arg.OrgID {`
`1262`	`1265`	`uniqueRoles := make([]string, 0, len(arg.GrantedRoles))`
`@@ -1275,6 +1278,7 @@ func (q *fakeQuerier) UpdateMemberRoles(_ context.Context, arg database.UpdateMe`
`1275`	`1278`	`return mem, nil`
`1276`	`1279`	`}`
`1277`	`1280`	`}`
	`1281`	`+`
`1278`	`1282`	`return database.OrganizationMember{}, sql.ErrNoRows`
`1279`	`1283`	`}`
`1280`	`1284`
`@@ -1449,6 +1453,10 @@ func (q *fakeQuerier) GetWorkspaceResourceMetadataCreatedAfter(ctx context.Conte`
`1449`	`1453`	`for _, resource := range resources {`
`1450`	`1454`	`resourceIDs[resource.ID] = struct{}{}`
`1451`	`1455`	`}`
	`1456`	`+`
	`1457`	`+ q.mutex.RLock()`
	`1458`	`+ defer q.mutex.RUnlock()`
	`1459`	`+`
`1452`	`1460`	`metadata := make([]database.WorkspaceResourceMetadatum, 0)`
`1453`	`1461`	`for _, m := range q.provisionerJobResourceMetadata {`
`1454`	`1462`	`_, ok := resourceIDs[m.WorkspaceResourceID]`