diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-04-05 15:06:26 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-04-08 11:05:54 +0200 |
commit | 89ed1c77cc353aebca390cfe0d24c584cd9ecd1f (patch) | |
tree | cd83ae65d392a263ca1b7099478460e11fffe5da /controller-api | |
parent | 759eb69f16a04488d8661b24087d7da8a7cccd91 (diff) |
Remove applicationOwner
Diffstat (limited to 'controller-api')
4 files changed, 1 insertions, 13 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleId.java index 199f233835f..55ef4607a9a 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleId.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleId.java @@ -68,7 +68,6 @@ public class RoleId { case "tenantOperator": return roles.tenantOperator(TenantName.from(parts[0])); } if (parts.length == 3) switch (parts[2]) { - case "applicationOwner": return roles.applicationOwner(TenantName.from(parts[0]), ApplicationName.from(parts[1])); case "applicationAdmin": return roles.applicationAdmin(TenantName.from(parts[0]), ApplicationName.from(parts[1])); case "applicationOperator": return roles.applicationOperator(TenantName.from(parts[0]), ApplicationName.from(parts[1])); case "applicationDeveloper": return roles.applicationDeveloper(TenantName.from(parts[0]), ApplicationName.from(parts[1])); @@ -104,7 +103,6 @@ public class RoleId { case tenantOwner: return "tenantOwner"; case tenantAdmin: return "tenantAdmin"; case tenantOperator: return "tenantOperator"; - case applicationOwner: return "applicationOwner"; case applicationAdmin: return "applicationAdmin"; case applicationOperator: return "applicationOperator"; case applicationDeveloper: return "applicationDeveloper"; diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java index e9c2f7bc643..ac9fdaaa339 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java @@ -49,10 +49,6 @@ public enum RoleDefinition { Policy.productionDeployment, Policy.submission), - /** Application administrator with the additional ability to delete an application. */ - applicationOwner(applicationOperator, - Policy.applicationDelete), - /** Tenant operator with admin access to all applications under the tenant, as well as the ability to create applications. */ tenantOperator(applicationAdmin, Policy.applicationCreate), diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Roles.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Roles.java index f6149bf6e88..9811b26d873 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Roles.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Roles.java @@ -71,11 +71,6 @@ public class Roles { return new TenantRole(RoleDefinition.tenantOperator, system, tenant); } - /** Returns a {@link RoleDefinition#applicationOwner} for the current system and given tenant and application. */ - public ApplicationRole applicationOwner(TenantName tenant, ApplicationName application) { - return new ApplicationRole(RoleDefinition.applicationOwner, system, tenant, application); - } - /** Returns a {@link RoleDefinition#applicationAdmin} for the current system and given tenant and application. */ public ApplicationRole applicationAdmin(TenantName tenant, ApplicationName application) { return new ApplicationRole(RoleDefinition.applicationAdmin, system, tenant, application); diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleIdTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleIdTest.java index 609646eb672..12adcbbae89 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleIdTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleIdTest.java @@ -28,8 +28,7 @@ public class RoleIdTest { assertEquals(role, RoleId.fromRole(role).toRole(roles)); ApplicationName application = ApplicationName.from("my-application"); - for (ApplicationRole role : List.of(roles.applicationOwner(tenant, application), - roles.applicationAdmin(tenant, application), + for (ApplicationRole role : List.of(roles.applicationAdmin(tenant, application), roles.applicationOperator(tenant, application), roles.applicationDeveloper(tenant, application), roles.applicationReader(tenant, application))) |