This is an automated email from the ASF dual-hosted git repository. nvazquez pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit e9d8d7942df92287ca1e0ca54d867a9324cce0a1 Merge: 5db62c1 bc93163 Author: nvazquez <[email protected]> AuthorDate: Thu Feb 10 09:48:49 2022 -0300 Merge branch '4.16' .../main/java/com/cloud/user/AccountService.java | 4 +- .../java/org/apache/cloudstack/acl/APIChecker.java | 3 + .../command/admin/account/CreateAccountCmd.java | 3 +- .../admin/account/CreateAccountCmdTest.java | 6 +- .../acl/DynamicRoleBasedAPIAccessChecker.java | 9 ++ .../acl/ProjectRoleBasedApiAccessChecker.java | 11 +- .../acl/StaticRoleBasedAPIAccessChecker.java | 8 ++ .../cloudstack/discovery/ApiDiscoveryService.java | 5 + .../discovery/ApiDiscoveryServiceImpl.java | 19 +++ .../ratelimit/ApiRateLimitServiceImpl.java | 13 +- .../api/BaremetalProvisionDoneNotificationCmd.java | 3 +- .../contrail/management/MockAccountManager.java | 11 +- .../java/com/cloud/user/AccountManagerImpl.java | 154 ++++++++++++++++++++- .../core/spring-server-core-managers-context.xml | 4 +- .../com/cloud/user/MockAccountManagerImpl.java | 11 +- ui/src/config/section/domain.js | 2 +- 16 files changed, 238 insertions(+), 28 deletions(-) diff --cc plugins/acl/dynamic-role-based/src/main/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java index 4664811,76d700e..a73a5c0 --- a/plugins/acl/dynamic-role-based/src/main/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java +++ b/plugins/acl/dynamic-role-based/src/main/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java @@@ -106,8 -110,13 +110,13 @@@ public class DynamicRoleBasedAPIAccessC throw new UnavailableCommandException("The API " + commandName + " does not exist or is not available for this account."); } + @Override + public boolean isEnabled() { + return roleService.isEnabled(); + } + public void addApiToRoleBasedAnnotationsMap(final RoleType roleType, final String commandName) { - if (roleType == null || Strings.isNullOrEmpty(commandName)) { + if (roleType == null || StringUtils.isEmpty(commandName)) { return; } final Set<String> commands = annotationRoleBasedApisMap.get(roleType);
