Skip to content

Commit d6ddd14

Browse files
committed
Added a constant for the string System
1 parent e1e51ff commit d6ddd14

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class ConfigKey<T> {
3434
public static final String CATEGORY_ADVANCED = "Advanced";
3535
public static final String CATEGORY_ALERT = "Alert";
3636
public static final String CATEGORY_NETWORK = "Network";
37+
public static final String CATEGORY_SYSTEM = "System";
3738

3839
public enum Scope {
3940
Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@
310310
import static com.cloud.configuration.Config.SecStorageAllowedInternalDownloadSites;
311311
import static com.cloud.offering.NetworkOffering.RoutingMode.Dynamic;
312312
import static com.cloud.offering.NetworkOffering.RoutingMode.Static;
313+
import static org.apache.cloudstack.framework.config.ConfigKey.CATEGORY_SYSTEM;
313314

314315
public class ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, ConfigurationService, Configurable {
315316
public static final String PERACCOUNT = "peraccount";
@@ -956,7 +957,7 @@ public Configuration updateConfiguration(final UpdateCfgCmd cmd) throws InvalidP
956957
category = config.getCategory();
957958
}
958959

959-
if ("System".equals(category) && !_accountMgr.isRootAdmin(caller.getId())) {
960+
if (CATEGORY_SYSTEM.equals(category) && !_accountMgr.isRootAdmin(caller.getId())) {
960961
logger.warn("Only Root Admin is allowed to edit the configuration " + name);
961962
throw new CloudRuntimeException("Only Root Admin is allowed to edit this configuration.");
962963
}

server/src/main/java/com/cloud/user/AccountManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
373373
"totp",
374374
"The default user two factor authentication provider. Eg. totp, staticpin", true, ConfigKey.Scope.Domain);
375375

376-
public static final ConfigKey<Boolean> apiKeyAccess = new ConfigKey<>("System", Boolean.class,
376+
public static final ConfigKey<Boolean> apiKeyAccess = new ConfigKey<>(ConfigKey.CATEGORY_SYSTEM, Boolean.class,
377377
"api.key.access",
378378
"true",
379379
"Determines whether API (api-key/secret-key) access is allowed or not. Editable only by Root Admin.",

0 commit comments

Comments
 (0)