diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-03-05 10:23:46 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-03-05 13:53:51 +0100 |
commit | 1e7e5d787497c067984a8effdceb06fcbb6d439a (patch) | |
tree | 19f854dca4dd0ff0c167e2c9a34b7740005720e0 /controller-api/src/test | |
parent | 50e75b45e06fb9d48cbc6be1dac66e4ee05b03ae (diff) |
Remove unused tenant and application roles
Diffstat (limited to 'controller-api/src/test')
2 files changed, 4 insertions, 57 deletions
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RolesTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RolesTest.java index 22baedd16b4..2e7308e41e1 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RolesTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RolesTest.java @@ -29,11 +29,6 @@ public class RolesTest { Roles.toRole("hostedOperator")); assertEquals(Role.hostedSupporter(), Roles.toRole("hostedSupporter")); - assertEquals(Role.tenantOperator(tenant), - Roles.toRole("my-tenant.tenantOperator")); - assertEquals(Role.applicationReader(tenant, application), - Roles.toRole("my-tenant.my-application.applicationReader")); - assertEquals(Role.administrator(tenant), Roles.toRole("my-tenant.administrator")); assertEquals(Role.developer(tenant), Roles.toRole("my-tenant.developer")); assertEquals(Role.reader(tenant), Roles.toRole("my-tenant.reader")); @@ -42,12 +37,12 @@ public class RolesTest { @Test(expected = IllegalArgumentException.class) public void illegalTenantName() { - Roles.valueOf(Role.tenantAdmin(TenantName.from("my.tenant"))); + Roles.valueOf(Role.developer(TenantName.from("my.tenant"))); } @Test(expected = IllegalArgumentException.class) public void illegalApplicationName() { - Roles.valueOf(Role.applicationOperator(TenantName.from("my-tenant"), ApplicationName.from("my.app"))); + Roles.valueOf(Role.headless(TenantName.from("my-tenant"), ApplicationName.from("my.app"))); } @Test(expected = IllegalArgumentException.class) diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java index 5348185c276..f0483e55b3e 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java @@ -90,54 +90,6 @@ public class RoleTest { } @Test - public void implications() { - TenantName tenant1 = TenantName.from("t1"); - ApplicationName application1 = ApplicationName.from("a1"); - TenantName tenant2 = TenantName.from("t2"); - ApplicationName application2 = ApplicationName.from("a2"); - - Role tenantOwner1 = Role.tenantOwner(tenant1); - Role tenantAdmin1 = Role.tenantAdmin(tenant1); - Role tenantAdmin2 = Role.tenantAdmin(tenant2); - Role tenantOperator1 = Role.tenantOperator(tenant1); - Role applicationAdmin11 = Role.applicationAdmin(tenant1, application1); - Role applicationOperator11 = Role.applicationOperator(tenant1, application1); - Role applicationDeveloper11 = Role.applicationDeveloper(tenant1, application1); - Role applicationReader11 = Role.applicationReader(tenant1, application1); - Role applicationReader12 = Role.applicationReader(tenant1, application2); - Role applicationReader22 = Role.applicationReader(tenant2, application2); - - assertFalse(tenantOwner1.implies(tenantOwner1)); - assertTrue(tenantOwner1.implies(tenantAdmin1)); - assertFalse(tenantOwner1.implies(tenantAdmin2)); - assertTrue(tenantOwner1.implies(tenantOperator1)); - assertTrue(tenantOwner1.implies(applicationAdmin11)); - assertTrue(tenantOwner1.implies(applicationReader11)); - assertTrue(tenantOwner1.implies(applicationReader12)); - assertFalse(tenantOwner1.implies(applicationReader22)); - - assertFalse(tenantAdmin1.implies(tenantOwner1)); - assertFalse(tenantAdmin1.implies(tenantAdmin2)); - assertTrue(tenantAdmin1.implies(applicationDeveloper11)); - - assertFalse(tenantOperator1.implies(applicationReader11)); - - assertFalse(applicationAdmin11.implies(tenantAdmin1)); - assertFalse(applicationAdmin11.implies(tenantOperator1)); - assertTrue(applicationAdmin11.implies(applicationOperator11)); - assertTrue(applicationAdmin11.implies(applicationDeveloper11)); - assertTrue(applicationAdmin11.implies(applicationReader11)); - assertFalse(applicationAdmin11.implies(applicationReader12)); - assertFalse(applicationAdmin11.implies(applicationReader22)); - - assertFalse(applicationOperator11.implies(applicationDeveloper11)); - assertTrue(applicationOperator11.implies(applicationReader11)); - - assertFalse(applicationDeveloper11.implies(applicationOperator11)); - assertTrue(applicationDeveloper11.implies(applicationReader11)); - } - - @Test public void new_implications() { TenantName tenant1 = TenantName.from("t1"); ApplicationName application1 = ApplicationName.from("a1"); @@ -188,8 +140,8 @@ public class RoleTest { // Write { var url = URI.create("/routing/v1/inactive/tenant/t1/application/a1/instance/i1/environment/prod/region/us-north-1"); - var allowedRole = Role.applicationAdmin(TenantName.from("t1"), ApplicationName.from("a1")); - var disallowedRole = Role.applicationAdmin(TenantName.from("t2"), ApplicationName.from("a2")); + var allowedRole = Role.developer(TenantName.from("t1")); + var disallowedRole = Role.developer(TenantName.from("t2")); assertTrue(allowedRole + " can override status at " + url, mainEnforcer.allows(allowedRole, Action.create, url)); assertTrue(allowedRole + " can clear status at " + url, mainEnforcer.allows(allowedRole, Action.delete, url)); assertFalse(disallowedRole + " cannot override status at " + url, mainEnforcer.allows(disallowedRole, Action.create, url)); |