Merge pull request cosmo-workspace#794 from jlandowner/change-group-a…

…dmin

Support group-admin is admin for group

api/v1alpha1/user_types.go

@@ -108,7 +108,14 @@ type UserRole struct {
 func (r UserRole) GetGroupAndRole() (group string, role string) {
 	v := strings.Split(r.Name, "-")
 	if len(v) > 0 {
-		return strings.Join(v[:len(v)-1], "-"), v[len(v)-1]
+		group := strings.Join(v[:len(v)-1], "-")
+		role := v[len(v)-1]
+
+		if group == "" {
+			return r.Name, ""
+		}
+
+		return group, role
 	}
 	return r.Name, ""
 }

api/v1alpha1/user_types_test.go

@@ -94,6 +94,30 @@ func TestUserRole_GetGroupAndRole(t *testing.T) {
 			wantGroup: "cosmo-admin",
 			wantRole:  "developer",
 		},
+		{
+			name: "non-admin: no hyphen",
+			fields: fields{
+				Name: "チームX",
+			},
+			wantGroup: "チームX",
+			wantRole:  "",
+		},
+		{
+			name: "non-admin: prefix",
+			fields: fields{
+				Name: "-XXX",
+			},
+			wantGroup: "-XXX",
+			wantRole:  "",
+		},
+		{
+			name: "admin: prefix",
+			fields: fields{
+				Name: "-XXX-admin",
+			},
+			wantGroup: "-XXX",
+			wantRole:  "admin",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {