Skip to content

server: simplify role change validation #9173

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

Merged
DaanHoogland merged 9 commits into from
Dec 14, 2024
Merged

server: simplify role change validation #9173

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e781150
server: simplify role change validation
shwstppr Jun 5, 2024
1064cb7
fix build failures
shwstppr Jun 5, 2024
ccb30ca
refactor error message
shwstppr Jun 5, 2024
1bd9766
Update server/src/main/java/com/cloud/user/AccountManagerImpl.java
shwstppr Jun 5, 2024
de8a1c2
Merge branch '4.19' into simplify-role-change-check
shwstppr Jul 22, 2024
3ccd65d
changes
shwstppr Aug 22, 2024
140445c
Merge remote-tracking branch 'apache/4.19' into simplify-role-change-…
shwstppr Aug 22, 2024
bc1b2eb
Merge remote-tracking branch 'apache/4.19' into simplify-role-change-…
shwstppr Dec 4, 2024
690188c
Merge remote-tracking branch 'apache/4.19' into simplify-role-change-…
shwstppr Dec 4, 2024
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'apache/4.19' into simplify-role-change-… 
…check
  • Loading branch information
@shwstppr
shwstppr committed Aug 22, 2024
commit 140445ccde9ef8096c9d626ac5b50261c7632507
19 changes: 1 addition & 18 deletions server/src/test/java/com/cloud/user/AccountManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;

import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.Role;
import org.apache.cloudstack.acl.RoleService;
import org.apache.cloudstack.acl.RoleType;
Expand Down Expand Up @@ -65,24 +66,6 @@
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.snapshot.VMSnapshotVO;

import com.cloud.acl.DomainChecker;
import com.cloud.api.auth.SetupUserTwoFactorAuthenticationCmd;
import com.cloud.domain.Domain;
import com.cloud.domain.DomainVO;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectAccountVO;
import com.cloud.user.Account.State;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.UserVmManagerImpl;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.snapshot.VMSnapshotVO;

@RunWith(MockitoJUnitRunner.class)
public class AccountManagerImplTest extends AccountManagetImplTestBase {

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.