summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-09 10:48:51 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-09 13:05:40 +0200
commit22705c2b18720f92342e485600ebd32ff734508d (patch)
tree0e1fafc4d29d95e80b1c64f9e1e76977fd20afba /controller-api
parent28b25da428ec2ff417b794e0833b8f420f56dfa6 (diff)
Reorder roles from most to least privileged
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRoles.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRoles.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRoles.java
index df68cf807cc..8950ce06639 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRoles.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRoles.java
@@ -28,17 +28,17 @@ public class UserRoles {
/** Returns the list of {@link TenantRole}s a {@link UserId} may be a member of. */
public List<TenantRole> tenantRoles(TenantName tenant) {
- return List.of(roles.tenantOperator(tenant),
+ return List.of(roles.tenantOwner(tenant),
roles.tenantAdmin(tenant),
- roles.tenantOwner(tenant));
+ roles.tenantOperator(tenant));
}
/** Returns the list of {@link ApplicationRole}s a {@link UserId} may be a member of. */
public List<ApplicationRole> applicationRoles(TenantName tenant, ApplicationName application) {
- return List.of(roles.applicationReader(tenant, application),
- roles.applicationDeveloper(tenant, application),
+ return List.of(roles.applicationAdmin(tenant, application),
roles.applicationOperator(tenant, application),
- roles.applicationAdmin(tenant, application));
+ roles.applicationDeveloper(tenant, application),
+ roles.applicationReader(tenant, application));
}
/** Returns the {@link Role} the given value represents. */