Skip to content

Commit b1f84f9

Browse files
committed
Fix CI
Signed-off-by: JeffMboya <jangina.mboya@gmail.com>
1 parent 1a3fb77 commit b1f84f9

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

domains/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,5 +335,5 @@ func (svc *service) RoleRemoveMembers(ctx context.Context, session authn.Session
335335
}
336336

337337
func (svc *service) RoleRemoveAllMembers(ctx context.Context, session authn.Session, entityID, roleID string) error {
338-
return svc.ProvisionManageService.RoleRemoveAllMembers(ctx, session, entityID, roleID)
338+
return svc.ProvisionManageService.RoleRemoveAllMembers(ctx, session, entityID, roleID)
339339
}

pkg/roles/provisionmanage.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -560,14 +560,14 @@ func (r ProvisionManageService) RoleRemoveMembers(ctx context.Context, session a
560560
}
561561

562562
if ro.Name == "admin" {
563-
page, err := r.repo.RoleListMembers(ctx, ro.ID, 0, 0)
564-
if err != nil {
565-
return errors.Wrap(svcerr.ErrViewEntity, err)
566-
}
567-
if page.Total <= uint64(len(members)) {
568-
return errors.Wrap(svcerr.ErrRemoveEntity, fmt.Errorf( "admin role must retain at least one member"))
569-
}
570-
}
563+
page, err := r.repo.RoleListMembers(ctx, ro.ID, 0, 0)
564+
if err != nil {
565+
return errors.Wrap(svcerr.ErrViewEntity, err)
566+
}
567+
if page.Total <= uint64(len(members)) {
568+
return errors.Wrap(svcerr.ErrRemoveEntity, fmt.Errorf("admin role must retain at least one member"))
569+
}
570+
}
571571

572572
if len(members) == 0 {
573573
return svcerr.ErrMalformedEntity
@@ -603,8 +603,8 @@ func (r ProvisionManageService) RoleRemoveAllMembers(ctx context.Context, sessio
603603
}
604604

605605
if ro.Name == "admin" {
606-
return errors.Wrap(svcerr.ErrRemoveEntity, fmt.Errorf("removing all members from the built-in admin role is not permitted"))
607-
}
606+
return errors.Wrap(svcerr.ErrRemoveEntity, fmt.Errorf("removing all members from the built-in admin role is not permitted"))
607+
}
608608

609609
prs := policies.Policy{
610610
ObjectType: policies.RoleType,

0 commit comments

Comments
 (0)