May 22, 2025 · May 21, 2025 · May 22, 2025 · May 22, 2025
diff --git a/coderd/database/no_slim.go b/coderd/database/no_slim.go
 //go:build slim

 package database

 const (
 // This declaration protects against imports in slim builds, see
 // no_slim_slim.go.
 //nolint:revive,unused
 _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = "DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS"
 // This line fails to compile, preventing this package from being imported
 // in slim builds.
 _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS
 )
diff --git a/coderd/database/no_slim_slim.go b/coderd/database/no_slim_slim.go
diff --git a/coderd/rbac/no_slim.go b/coderd/rbac/no_slim.go
 //go:build slim

 package rbac

 const (
 // This declaration protects against imports in slim builds, see
 // no_slim_slim.go.
 //nolint:revive,unused
 _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = "DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS"
 // This line fails to compile, preventing this package from being imported
 // in slim builds.
 _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS
 )
diff --git a/coderd/rbac/no_slim_slim.go b/coderd/rbac/no_slim_slim.go
diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go
 return roles
 }

 //SiteRoles lists all roles that can be applied to a user.
 //SiteBuiltInRoles lists all roles that can be applied to a user.
 // This is the list of available roles, and not specific to a user
 //
 // This should be a list in a database, but until then we build
 // the list from the builtins.
 funcSiteRoles() []Role {
 funcSiteBuiltInRoles() []Role {
 var roles []Role
 for _, roleF := range builtInRoles {
 // Must provide some non-nil uuid to filter out org roles.
diff --git a/coderd/rbac/roles_test.go b/coderd/rbac/roles_test.go
 // rules. If this is incorrect, that is a mistake.
 func TestBuiltInRoles(t *testing.T) {
 t.Parallel()
 for _, r := range rbac.SiteRoles() {
 for _, r := range rbac.SiteBuiltInRoles() {
 r := r
 t.Run(r.Identifier.String(), func(t *testing.T) {
 t.Parallel()
 func TestListRoles(t *testing.T) {
 t.Parallel()

 siteRoles := rbac.SiteRoles()
 siteRoles := rbac.SiteBuiltInRoles()
 siteRoleNames := make([]string, 0, len(siteRoles))
 for _, role := range siteRoles {
 siteRoleNames = append(siteRoleNames, role.Identifier.Name)
diff --git a/coderd/roles.go b/coderd/roles.go
 return
 }

 httpapi.Write(ctx, rw, http.StatusOK, assignableRoles(actorRoles.Roles, rbac.SiteRoles(), dbCustomRoles))
 httpapi.Write(ctx, rw, http.StatusOK, assignableRoles(actorRoles.Roles, rbac.SiteBuiltInRoles(), dbCustomRoles))
 }

 // assignableOrgRoles returns all org wide roles that can be assigned.
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,9 @@
		//go:build slim

		package database

		const (
		// This declaration protects against imports in slim builds, see
		// no_slim_slim.go.
		//nolint:revive,unused
		_DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = "DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS"
		// This line fails to compile, preventing this package from being imported
		// in slim builds.
		_DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS
		)
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,9 @@
		//go:build slim

		package rbac

		const (
		// This declaration protects against imports in slim builds, see
		// no_slim_slim.go.
		//nolint:revive,unused
		_DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = "DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS"
		// This line fails to compile, preventing this package from being imported
		// in slim builds.
		_DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS = _DO_NOT_IMPORT_THIS_PACKAGE_IN_SLIM_BUILDS
		)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -798,12 +798,12 @@ func OrganizationRoles(organizationID uuid.UUID) []Role {
		return roles
		}

		//SiteRoles lists all roles that can be applied to a user.
		//SiteBuiltInRoles lists all roles that can be applied to a user.
		// This is the list of available roles, and not specific to a user
		//
		// This should be a list in a database, but until then we build
		// the list from the builtins.
		funcSiteRoles() []Role {
		funcSiteBuiltInRoles() []Role {
		var roles []Role
		for _, roleF := range builtInRoles {
		// Must provide some non-nil uuid to filter out org roles.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,7 +34,7 @@ func (a authSubject) Subjects() []authSubject { return []authSubject{a} }
		// rules. If this is incorrect, that is a mistake.
		func TestBuiltInRoles(t *testing.T) {
		t.Parallel()
		for _, r := range rbac.SiteRoles() {
		for _, r := range rbac.SiteBuiltInRoles() {
		r := r
		t.Run(r.Identifier.String(), func(t *testing.T) {
		t.Parallel()
Expand DownExpand Up		@@ -997,7 +997,7 @@ func TestIsOrgRole(t *testing.T) {
		func TestListRoles(t *testing.T) {
		t.Parallel()

		siteRoles := rbac.SiteRoles()
		siteRoles := rbac.SiteBuiltInRoles()
		siteRoleNames := make([]string, 0, len(siteRoles))
		for _, role := range siteRoles {
		siteRoleNames = append(siteRoleNames, role.Identifier.Name)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,7 +43,7 @@ func (api API) AssignableSiteRoles(rw http.ResponseWriter, r http.Request) {
		return
		}

		httpapi.Write(ctx, rw, http.StatusOK, assignableRoles(actorRoles.Roles, rbac.SiteRoles(), dbCustomRoles))
		httpapi.Write(ctx, rw, http.StatusOK, assignableRoles(actorRoles.Roles, rbac.SiteBuiltInRoles(), dbCustomRoles))
		}

		// assignableOrgRoles returns all org wide roles that can be assigned.
Expand Down