yeah yeah

aslilac · aslilac · commit 0e108f1953db · 2025-08-06T02:05:26.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1415,7 +1415,7 @@ func New(options *Options) *API {
 				r.Get("/timings", api.workspaceTimings)
 				r.Route("/acl", func(r chi.Router) {
 					r.Use(
-						httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentWorkspaceSharing)
+						httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentWorkspaceSharing),
 					)
 
 					r.Patch("/", api.patchWorkspaceACL)
diff --git a/coderd/rbac/acl/updatevalidator.go b/coderd/rbac/acl/updatevalidator.go
@@ -11,7 +11,7 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 )
 
-type ACLUpdateValidator[Role codersdk.WorkspaceRole | codersdk.TemplateRole] interface {
+type UpdateValidator[Role codersdk.WorkspaceRole | codersdk.TemplateRole] interface {
 	Users() (map[string]Role, string)
 	Groups() (map[string]Role, string)
 	ValidateRole(role Role) error
@@ -20,7 +20,7 @@ type ACLUpdateValidator[Role codersdk.WorkspaceRole | codersdk.TemplateRole] int
 func Validate[T codersdk.WorkspaceRole | codersdk.TemplateRole](
 	ctx context.Context,
 	db database.Store,
-	v ACLUpdateValidator[T],
+	v UpdateValidator[T],
 ) []codersdk.ValidationError {
 	// nolint:gocritic // Validate requires full read access to users and groups
 	ctx = dbauthz.AsSystemRestricted(ctx)
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -2479,7 +2479,7 @@ var (
 	workspaceACLUpdateGroupsFieldName = "group_roles"
 )
 
-var _ acl.ACLUpdateValidator[codersdk.WorkspaceRole] = WorkspaceACLUpdateValidator{}
+var _ acl.UpdateValidator[codersdk.WorkspaceRole] = WorkspaceACLUpdateValidator{}
 
 func (w WorkspaceACLUpdateValidator) Users() (map[string]codersdk.WorkspaceRole, string) {
 	return w.UserRoles, workspaceACLUpdateUsersFieldName
diff --git a/enterprise/coderd/templates.go b/enterprise/coderd/templates.go
@@ -273,7 +273,7 @@ var (
 	templateACLUpdateGroupsFieldName = "group_perms"
 )
 
-var _ acl.ACLUpdateValidator[codersdk.TemplateRole] = TemplateACLUpdateValidator{}
+var _ acl.UpdateValidator[codersdk.TemplateRole] = TemplateACLUpdateValidator{}
 
 func (w TemplateACLUpdateValidator) Users() (map[string]codersdk.TemplateRole, string) {
 	return w.UserPerms, templateACLUpdateUsersFieldName

Original file line number	Diff line number	Diff line change
`@@ -1415,7 +1415,7 @@ func New(options Options) API {`
`1415`	`1415`	`r.Get("/timings", api.workspaceTimings)`
`1416`	`1416`	`r.Route("/acl", func(r chi.Router) {`
`1417`	`1417`	`r.Use(`
`1418`		`- httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentWorkspaceSharing)`
	`1418`	`+ httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentWorkspaceSharing),`
`1419`	`1419`	`)`
`1420`	`1420`
`1421`	`1421`	`r.Patch("/", api.patchWorkspaceACL)`
Original file line number	Diff line number	Diff line change
`@@ -2479,7 +2479,7 @@ var (`
`2479`	`2479`	`workspaceACLUpdateGroupsFieldName = "group_roles"`
`2480`	`2480`	`)`
`2481`	`2481`
`2482`		`-var _ acl.ACLUpdateValidator[codersdk.WorkspaceRole] = WorkspaceACLUpdateValidator{}`
	`2482`	`+var _ acl.UpdateValidator[codersdk.WorkspaceRole] = WorkspaceACLUpdateValidator{}`
`2483`	`2483`
`2484`	`2484`	`func (w WorkspaceACLUpdateValidator) Users() (map[string]codersdk.WorkspaceRole, string) {`
`2485`	`2485`	`return w.UserRoles, workspaceACLUpdateUsersFieldName`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ var (`
`273`	`273`	`templateACLUpdateGroupsFieldName = "group_perms"`
`274`	`274`	`)`
`275`	`275`
`276`		`-var _ acl.ACLUpdateValidator[codersdk.TemplateRole] = TemplateACLUpdateValidator{}`
	`276`	`+var _ acl.UpdateValidator[codersdk.TemplateRole] = TemplateACLUpdateValidator{}`
`277`	`277`
`278`	`278`	`func (w TemplateACLUpdateValidator) Users() (map[string]codersdk.TemplateRole, string) {`
`279`	`279`	`return w.UserPerms, templateACLUpdateUsersFieldName`