fix rbac merge woes

sreya · sreya · commit ef159087329f · 2022-09-19T21:13:39.000Z
diff --git a/coderd/rbac/builtin.go b/coderd/rbac/builtin.go
@@ -398,12 +398,12 @@ func roleSplit(role string) (name string, orgID string, err error) {
 // and actions a bit easier.
 func permissions(perms map[string][]Action) []Permission {
 	list := make([]Permission, 0, len(perms))
-	for objectType, actions := range perms {
+	for k, actions := range perms {
 		for _, act := range actions {
 			act := act
 			list = append(list, Permission{
 				Negate:       false,
-				ResourceType: objectType,
+				ResourceType: k,
 				Action:       act,
 			})
 		}
diff --git a/coderd/rbac/scopes.go b/coderd/rbac/scopes.go
@@ -19,8 +19,8 @@ var builtinScopes map[Scope]Role = map[Scope]Role{
 	ScopeAll: {
 		Name:        fmt.Sprintf("Scope_%s", ScopeAll),
 		DisplayName: "All operations",
-		Site: permissions(map[Object][]Action{
-			ResourceWildcard: {WildcardSymbol},
+		Site: permissions(map[string][]Action{
+			ResourceWildcard.Type: {WildcardSymbol},
 		}),
 		Org:  map[string][]Permission{},
 		User: []Permission{},
@@ -29,8 +29,8 @@ var builtinScopes map[Scope]Role = map[Scope]Role{
 	ScopeApplicationConnect: {
 		Name:        fmt.Sprintf("Scope_%s", ScopeApplicationConnect),
 		DisplayName: "Ability to connect to applications",
-		Site: permissions(map[Object][]Action{
-			ResourceWorkspaceApplicationConnect: {ActionCreate},
+		Site: permissions(map[string][]Action{
+			ResourceWorkspaceApplicationConnect.Type: {ActionCreate},
 		}),
 		Org:  map[string][]Permission{},
 		User: []Permission{},
