Rename AdminRoleID to AdminsRoleID for consistency

compose/commands/exporter.go

@@ -71,7 +71,7 @@ func Exporter(ctx context.Context, c *cli.Config) *cobra.Command {
 			// Roles are use for resolving access control
 			roles = sysTypes.RoleSet{
 				&sysTypes.Role{ID: permissions.EveryoneRoleID, Handle: "everyone"},
-				&sysTypes.Role{ID: permissions.AdminRoleID, Handle: "admins"},
+				&sysTypes.Role{ID: permissions.AdminsRoleID, Handle: "admins"},
 			}
 
 			modules, _, err := service.DefaultModule.Find(types.ModuleFilter{NamespaceID: ns.ID})

compose/importer/aux.go

@@ -31,7 +31,7 @@ func Import(ctx context.Context, ns *types.Namespace, ff ...io.Reader) (err erro
 		// Roles are use for resolving access control
 		roles = sysTypes.RoleSet{
 			&sysTypes.Role{ID: permissions.EveryoneRoleID, Handle: "everyone"},
-			&sysTypes.Role{ID: permissions.AdminRoleID, Handle: "admins"},
+			&sysTypes.Role{ID: permissions.AdminsRoleID, Handle: "admins"},
 		}
 	)
 

internal/permissions/permissions.go

@@ -28,7 +28,7 @@ const (
 	EveryoneRoleID = 1
 
 	// Hardcoded ID for Admin role
-	AdminRoleID = 2
+	AdminsRoleID = 2
 )
 
 func (op Operation) String() string {

messaging/importer/aux.go

@@ -37,7 +37,7 @@ func Import(ctx context.Context, ff ...io.Reader) (err error) {
 		// Roles are use for resolving access control
 		roles = sysTypes.RoleSet{
 			&sysTypes.Role{ID: permissions.EveryoneRoleID, Handle: "everyone"},
-			&sysTypes.Role{ID: permissions.AdminRoleID, Handle: "admins"},
+			&sysTypes.Role{ID: permissions.AdminsRoleID, Handle: "admins"},
 		}
 	)
 

system/provision-config.go

@@ -47,7 +47,7 @@ func provisionConfig(ctx context.Context, cmd *cobra.Command, c *cli.Config) err
 // Provision ONLY when there are no rules for role admins / everyone
 func isProvisioned(ctx context.Context) (bool, error) {
 	return len(service.DefaultPermissions.FindRulesByRoleID(permissions.EveryoneRoleID)) > 0 &&
-		len(service.DefaultPermissions.FindRulesByRoleID(permissions.AdminRoleID)) > 0, nil
+		len(service.DefaultPermissions.FindRulesByRoleID(permissions.AdminsRoleID)) > 0, nil
 }
 
 func makeDefaultApplications(ctx context.Context, cmd *cobra.Command, c *cli.Config) error {

system/service/auth.go

@@ -816,7 +816,7 @@ func (svc auth) createUserToken(user *types.User, kind string) (token string, er
 // Automatically promotes user to administrator if it is the first user in the database
 func (svc auth) autoPromote(u *types.User) (err error) {
 	if svc.users.Total() == 1 && u.ID > 0 {
-		err = svc.roles.MemberAddByID(permissions.AdminRoleID, u.ID)
+		err = svc.roles.MemberAddByID(permissions.AdminsRoleID, u.ID)
 
 		svc.log(
 			svc.ctx,