PR Comments, add unit test

Emyrk · Emyrk · commit c5d8ba08e4f9 · 2024-05-21T07:54:42.000-10:00
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -1180,6 +1180,7 @@ func (q *FakeQuerier) CustomRoles(_ context.Context, arg database.CustomRolesPar
 
 	found := make([]database.CustomRole, 0)
 	for _, role := range q.data.customRoles {
+		role := role
 		if len(arg.LookupRoles) > 0 {
 			if !slices.ContainsFunc(arg.LookupRoles, func(s string) bool {
 				return strings.EqualFold(s, role.Name)
@@ -1192,7 +1193,6 @@ func (q *FakeQuerier) CustomRoles(_ context.Context, arg database.CustomRolesPar
 			continue
 		}
 
-		role := role
 		found = append(found, role)
 	}
 
diff --git a/enterprise/cli/rolescmd.go b/enterprise/cli/rolescmd.go
@@ -18,7 +18,7 @@ import (
 func (r *RootCmd) roles() *serpent.Command {
 	cmd := &serpent.Command{
 		Use:     "roles",
-		Short:   "Manage roles",
+		Short:   "Manage site-wide roles.",
 		Aliases: []string{"role"},
 		Handler: func(inv *serpent.Invocation) error {
 			return inv.Command.HelpHandler(inv)
diff --git a/enterprise/coderd/roles_test.go b/enterprise/coderd/roles_test.go
@@ -167,4 +167,37 @@ func TestCustomRole(t *testing.T) {
 		})
 		require.ErrorContains(t, err, "forbidden")
 	})
+
+	t.Run("InvalidName", func(t *testing.T) {
+		t.Parallel()
+		dv := coderdtest.DeploymentValues(t)
+		dv.Experiments = []string{string(codersdk.ExperimentCustomRoles)}
+		owner, _ := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				DeploymentValues: dv,
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureCustomRoles: 1,
+				},
+			},
+		})
+
+		ctx := testutil.Context(t, testutil.WaitMedium)
+
+		//nolint:gocritic // owner is required for this
+		_, err := owner.PatchRole(ctx, codersdk.Role{
+			Name:        "Bad_Name", // No underscores allowed
+			DisplayName: "Testing Purposes",
+			// Basically creating a template admin manually
+			SitePermissions: codersdk.CreatePermissions(map[codersdk.RBACResource][]codersdk.RBACAction{
+				codersdk.ResourceTemplate:  {codersdk.ActionCreate, codersdk.ActionRead, codersdk.ActionUpdate, codersdk.ActionViewInsights},
+				codersdk.ResourceFile:      {codersdk.ActionCreate, codersdk.ActionRead},
+				codersdk.ResourceWorkspace: {codersdk.ActionRead},
+			}),
+			OrganizationPermissions: nil,
+			UserPermissions:         nil,
+		})
+		require.ErrorContains(t, err, "Invalid role name")
+	})
 }

Original file line number	Diff line number	Diff line change
`@@ -1180,6 +1180,7 @@ func (q *FakeQuerier) CustomRoles(_ context.Context, arg database.CustomRolesPar`
`1180`	`1180`
`1181`	`1181`	`found := make([]database.CustomRole, 0)`
`1182`	`1182`	`for _, role := range q.data.customRoles {`
	`1183`	`+ role := role`
`1183`	`1184`	`if len(arg.LookupRoles) > 0 {`
`1184`	`1185`	`if !slices.ContainsFunc(arg.LookupRoles, func(s string) bool {`
`1185`	`1186`	`return strings.EqualFold(s, role.Name)`
`@@ -1192,7 +1193,6 @@ func (q *FakeQuerier) CustomRoles(_ context.Context, arg database.CustomRolesPar`
`1192`	`1193`	`continue`
`1193`	`1194`	`}`
`1194`	`1195`
`1195`		`- role := role`
`1196`	`1196`	`found = append(found, role)`
`1197`	`1197`	`}`
`1198`	`1198`