return role provision in add role

Signed-off-by: Arvindh <[email protected]>
absmach · Dec 26, 2024 · 1fe7708 · 1fe7708
1 parent c32d406
commit 1fe7708
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 97 deletions.
diff --git a/channels/mocks/repository.go b/channels/mocks/repository.go
diff --git a/channels/mocks/service.go b/channels/mocks/service.go
diff --git a/clients/mocks/repository.go b/clients/mocks/repository.go
diff --git a/clients/mocks/service.go b/clients/mocks/service.go
diff --git a/domains/mocks/repository.go b/domains/mocks/repository.go
diff --git a/domains/mocks/service.go b/domains/mocks/service.go
diff --git a/groups/mocks/repository.go b/groups/mocks/repository.go
diff --git a/groups/mocks/service.go b/groups/mocks/service.go
diff --git a/pkg/roles/mocks/rolemanager.go b/pkg/roles/mocks/rolemanager.go
diff --git a/pkg/roles/mocks/rolesRepo.go b/pkg/roles/mocks/rolesRepo.go
diff --git a/pkg/roles/provisionmanage.go b/pkg/roles/provisionmanage.go
@@ -210,23 +210,24 @@ func (r ProvisionManageService) AddNewEntitiesRoles(ctx context.Context, domainI
 		}()
 	}
 
-	if _, err := r.repo.AddRoles(ctx, newRolesProvision); err != nil {
+	nprs, err := r.repo.AddRoles(ctx, newRolesProvision)
+	if err != nil {
 		return []RoleProvision{}, errors.Wrap(svcerr.ErrCreateEntity, err)
 	}
 
-	return newRolesProvision, nil
+	return nprs, nil
 }
 
-func (r ProvisionManageService) AddRole(ctx context.Context, session authn.Session, entityID string, roleName string, optionalActions []string, optionalMembers []string) (retRole Role, retErr error) {
+func (r ProvisionManageService) AddRole(ctx context.Context, session authn.Session, entityID string, roleName string, optionalActions []string, optionalMembers []string) (retRoleProvision RoleProvision, retErr error) {
 	sid, err := r.sidProvider.ID()
 	if err != nil {
-		return Role{}, errors.Wrap(svcerr.ErrCreateEntity, err)
+		return RoleProvision{}, errors.Wrap(svcerr.ErrCreateEntity, err)
 	}
 
 	id := r.entityType + "_" + sid
 
 	if err := r.validateActions(toRolesActions(optionalActions)); err != nil {
-		return Role{}, errors.Wrap(svcerr.ErrMalformedEntity, err)
+		return RoleProvision{}, errors.Wrap(svcerr.ErrMalformedEntity, err)
 	}
 
 	newRoleProvisions := []RoleProvision{
@@ -267,7 +268,7 @@ func (r ProvisionManageService) AddRole(ctx context.Context, session authn.Sessi
 
 	if len(prs) > 0 {
 		if err := r.policy.AddPolicies(ctx, prs); err != nil {
-			return Role{}, errors.Wrap(svcerr.ErrCreateEntity, err)
+			return RoleProvision{}, errors.Wrap(svcerr.ErrCreateEntity, err)
 		}
 
 		defer func() {
@@ -279,16 +280,16 @@ func (r ProvisionManageService) AddRole(ctx context.Context, session authn.Sessi
 		}()
 	}
 
-	newRoles, err := r.repo.AddRoles(ctx, newRoleProvisions)
+	nrps, err := r.repo.AddRoles(ctx, newRoleProvisions)
 	if err != nil {
-		return Role{}, errors.Wrap(svcerr.ErrCreateEntity, err)
+		return RoleProvision{}, errors.Wrap(svcerr.ErrCreateEntity, err)
 	}
 
-	if len(newRoles) == 0 {
-		return Role{}, svcerr.ErrCreateEntity
+	if len(nrps) == 0 {
+		return RoleProvision{}, svcerr.ErrCreateEntity
 	}
 
-	return newRoles[0], nil
+	return nrps[0], nil
 }
 
 func (r ProvisionManageService) RemoveRole(ctx context.Context, session authn.Session, entityID, roleID string) error {