Skip to content

server: remove user-project mappings when delete a project #14150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weizhouapache wants to merge 3 commits into
base: 4.20
Choose a base branch
from
+11 −16
Open

server: remove user-project mappings when delete a project #14150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
506fbc0
server: remove user-project mappings when delete a project
weizhouapache Sep 11, 2026
a5a8aee
Revert "server: remove user-project mappings when delete a project"
weizhouapache Oct 26, 2026
f4aa2c4
server: remove all project account mappings of an account in a project
weizhouapache Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface ProjectAccountDao extends GenericDao<ProjectAccountVO, Long> {

void removeAccountFromProjects(long accountId);

void removeUserFromProjects(long userId);
int removeByProjectIdAccountId(long projectId, long accountId);

boolean canUserModifyProject(long projectId, long accountId, long userId);

Expand Down
12 changes: 7 additions & 5 deletions engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,16 @@ public void removeAccountFromProjects(long accountId) {
}

@Override
public void removeUserFromProjects(long userId) {
public int removeByProjectIdAccountId(long projectId, long accountId) {
SearchCriteria<ProjectAccountVO> sc = AllFieldsSearch.create();
sc.setParameters("userId", userId);
sc.setParameters("projectId", projectId);
sc.setParameters("accountId", accountId);

int removedCount = remove(sc);
if (removedCount > 0) {
logger.debug(String.format("Removed user [%s] from %s project(s).", userId, removedCount));
int rowsRemoved = remove(sc);
if (rowsRemoved > 0) {
logger.debug("Removed {} mappings of account id={} from project id={}", rowsRemoved, accountId, projectId);
}
return rowsRemoved;
}

@Override
Expand Down
13 changes: 3 additions & 10 deletions server/src/main/java/com/cloud/projects/ProjectManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,18 +449,11 @@ public Boolean doInTransaction(TransactionStatus status) {

@Override
public boolean unassignAccountFromProject(long projectId, long accountId) {
ProjectAccountVO projectAccount = _projectAccountDao.findByProjectIdAccountId(projectId, accountId);
if (projectAccount == null) {
int removed = _projectAccountDao.removeByProjectIdAccountId(projectId, accountId);
if (removed == 0) {
logger.debug("Account id=" + accountId + " is not assigned to project id=" + projectId + " so no need to unassign");
return true;
}

if (_projectAccountDao.remove(projectAccount.getId())) {
return true;
} else {
logger.warn("Failed to unassign account id=" + accountId + " from the project id=" + projectId);
return false;
}
return true;
}

@Override
Expand Down
Loading