Skip to content

server: ignore projectid=-1 for finding owner #12695

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

Draft
shwstppr wants to merge 1 commit into
base: 4.20
Choose a base branch
from
+2 −2
Draft

server: ignore projectid=-1 for finding owner #12695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions server/src/main/java/com/cloud/user/AccountManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@
import com.cloud.utils.ConstantTimeComparator;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.StringUtils;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
Expand Down Expand Up @@ -2563,7 +2563,7 @@ public Account finalizeOwner(Account caller, String accountName, Long domainId,
throw new InvalidParameterValueException("ProjectId and account/domainId can't be specified together");
}

if (projectId != null) {
if (projectId != null && projectId != -1L) {
Copy link

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change to handle projectId=-1 lacks test coverage. Consider adding tests to AccountManagerImplTest.java that verify the behavior when projectId=-1 is passed to finalizeOwner. Tests should cover scenarios such as:

  1. When projectId=-1 is passed alone, it should not throw an "Unable to find project" exception
  2. When projectId=-1 is passed with accountName and domainId, it should not throw the "ProjectId and account/domainId can't be specified together" exception
  3. The method should return the caller account when projectId=-1 is passed without other parameters

Copilot uses AI. Check for mistakes.
Project project = _projectMgr.getProject(projectId);
if (project == null) {
throw new InvalidParameterValueException("Unable to find project by id=" + projectId);
Expand Down
Loading