summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-05 15:06:26 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-08 11:05:54 +0200
commit89ed1c77cc353aebca390cfe0d24c584cd9ecd1f (patch)
treecd83ae65d392a263ca1b7099478460e11fffe5da /controller-server
parent759eb69f16a04488d8661b24087d7da8a7cccd91 (diff)
Remove applicationOwner
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
index d1806fb5747..afae832251f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
@@ -67,7 +67,7 @@ public class CloudAccessControl implements AccessControl {
@Override
public void createApplication(ApplicationId application, Credentials credentials) {
- RoleId ownerRole = RoleId.fromRole(roles.applicationOwner(application.tenant(), application.application()));
+ RoleId ownerRole = RoleId.fromRole(roles.applicationAdmin(application.tenant(), application.application()));
userManagement.createRole(ownerRole);
userManagement.addUsers(ownerRole, List.of(new UserId(credentials.user().getName())));
}
@@ -97,8 +97,7 @@ public class CloudAccessControl implements AccessControl {
return List.of(roles.applicationReader(tenant, application),
roles.applicationDeveloper(tenant, application),
roles.applicationOperator(tenant, application),
- roles.applicationAdmin(tenant, application),
- roles.applicationOwner(tenant, application));
+ roles.applicationAdmin(tenant, application));
}
}