fixup field name changes

Emyrk · Emyrk · commit a9f0a381d3ae · 2024-05-16T12:19:22.000-05:00
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -620,19 +620,19 @@ func (q *querier) canAssignRoles(ctx context.Context, orgID *uuid.UUID, added, r
 	}
 
 	if len(customRoles) > 0 {
-		customRoles, err := q.CustomRolesByName(ctx, customRoles)
+		expandedCustomRoles, err := q.CustomRolesByName(ctx, customRoles)
 		if err != nil {
 			return xerrors.Errorf("fetching custom roles: %w", err)
 		}
 
 		// If the lists are not identical, then have a problem, as some roles
 		// provided do no exist.
-		if len(customRoles) != len(customRoles) {
+		if len(customRoles) != len(expandedCustomRoles) {
 			for _, role := range customRoles {
 				// Stop at the first one found. We could make a better error that
 				// returns them all, but then someone could pass in a large list to make us do
 				// a lot of loop iterations.
-				if !slices.ContainsFunc(customRoles, func(customRole database.CustomRole) bool {
+				if !slices.ContainsFunc(expandedCustomRoles, func(customRole database.CustomRole) bool {
 					return strings.EqualFold(customRole.Name, role)
 				}) {
 					return xerrors.Errorf("%q is not a supported role", role)
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -8291,7 +8291,7 @@ func (q *FakeQuerier) UpsertCustomRole(_ context.Context, arg database.UpsertCus
 			q.customRoles[i].SitePermissions = arg.SitePermissions
 			q.customRoles[i].OrgPermissions = arg.OrgPermissions
 			q.customRoles[i].UserPermissions = arg.UserPermissions
-			q.customRoles[i].LastUpdated = dbtime.Now()
+			q.customRoles[i].UpdatedAt = dbtime.Now()
 			return q.customRoles[i], nil
 		}
 	}
@@ -8303,7 +8303,7 @@ func (q *FakeQuerier) UpsertCustomRole(_ context.Context, arg database.UpsertCus
 		OrgPermissions:  arg.OrgPermissions,
 		UserPermissions: arg.UserPermissions,
 		CreatedAt:       dbtime.Now(),
-		LastUpdated:     dbtime.Now(),
+		UpdatedAt:       dbtime.Now(),
 	}
 	q.customRoles = append(q.customRoles, role)
 

Original file line number	Diff line number	Diff line change
`@@ -8291,7 +8291,7 @@ func (q *FakeQuerier) UpsertCustomRole(_ context.Context, arg database.UpsertCus`
`8291`	`8291`	`q.customRoles[i].SitePermissions = arg.SitePermissions`
`8292`	`8292`	`q.customRoles[i].OrgPermissions = arg.OrgPermissions`
`8293`	`8293`	`q.customRoles[i].UserPermissions = arg.UserPermissions`
`8294`		`- q.customRoles[i].LastUpdated = dbtime.Now()`
	`8294`	`+ q.customRoles[i].UpdatedAt = dbtime.Now()`
`8295`	`8295`	`return q.customRoles[i], nil`
`8296`	`8296`	`}`
`8297`	`8297`	`}`
`@@ -8303,7 +8303,7 @@ func (q *FakeQuerier) UpsertCustomRole(_ context.Context, arg database.UpsertCus`
`8303`	`8303`	`OrgPermissions: arg.OrgPermissions,`
`8304`	`8304`	`UserPermissions: arg.UserPermissions,`
`8305`	`8305`	`CreatedAt: dbtime.Now(),`
`8306`		`- LastUpdated: dbtime.Now(),`
	`8306`	`+ UpdatedAt: dbtime.Now(),`
`8307`	`8307`	`}`
`8308`	`8308`	`q.customRoles = append(q.customRoles, role)`
`8309`	`8309`