diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-10-19 13:45:49 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-10-19 13:45:49 +0200 |
commit | ce1da3698d732b9f8bc5033695512c049dd8b80b (patch) | |
tree | 79bd8fefd11d963e71b7b0a0921706dfc0419095 /controller-server | |
parent | dbf6dbe83dbafc12977a0823034c5a41d6116c5c (diff) |
Rename TenantType.Athens -> TenantType.Athenz
Diffstat (limited to 'controller-server')
8 files changed, 21 insertions, 21 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/Tenant.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/Tenant.java index 4889f789819..df36266a2ac 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/Tenant.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/Tenant.java @@ -54,7 +54,7 @@ public class Tenant { public TenantType tenantType() { if (athenzDomain.isPresent()) { - return TenantType.ATHENS; + return TenantType.ATHENZ; } else if (id.isUser()) { return TenantType.USER; } else { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index c50f1464be7..eac960feb6b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -607,7 +607,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { controller.tenants().updateTenant(updatedTenant, authorizer.getNToken(request)); break; } - case ATHENS: { + case ATHENZ: { if (requestData.field("userGroup").valid()) throw new BadRequestException("Cannot set OpsDB user group to Athens tenant"); updatedTenant = Tenant.createAthensTenant(new TenantId(tenantName), diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/Authorizer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/Authorizer.java index 93dc2541385..7eec6d1b64c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/Authorizer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/Authorizer.java @@ -113,7 +113,7 @@ public class Authorizer { private boolean isTenantAdmin(UserId userId, Tenant tenant) { switch (tenant.tenantType()) { - case ATHENS: + case ATHENZ: return isAthenzTenantAdmin(userId, tenant.getAthensDomain().get()); case OPSDB: return isGroupMember(userId, tenant.getUserGroup().get()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index 1ac5dfeb58a..22a0ea82726 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -68,7 +68,7 @@ public class ApplicationApiTest extends ControllerContainerTest { // GET API root tester.assertResponse(request("/application/v4/", "", Request.Method.GET), new File("root.json")); - // GET athens domains + // GET Athenz domains tester.assertResponse(request("/application/v4/athensDomain/", "", Request.Method.GET), new File("athensDomain-list.json")); // GET OpsDB properties @@ -234,7 +234,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/", "", Request.Method.OPTIONS), ""); - // Add another Athens domain, so we can try to create more tenants + // Add another Athenz domain, so we can try to create more tenants addTenantAthenzDomain("domain2", "mytenant"); // New domain to test tenant w/property ID // POST (add) a tenant with property ID tester.assertResponse(request("/application/v4/tenant/tenant2", @@ -565,7 +565,7 @@ public class ApplicationApiTest extends ControllerContainerTest { "{\"error-code\":\"FORBIDDEN\",\"message\":\"Principal 'mytenant' is not a screwdriver principal, and does not have deploy access to application 'tenant1.application1'\"}", 403); - // Deleting an application for an Athens domain the user is not admin for is disallowed + // Deleting an application for an Athenz domain the user is not admin for is disallowed tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1", "", Request.Method.DELETE, @@ -581,7 +581,7 @@ public class ApplicationApiTest extends ControllerContainerTest { "", 200); - // Updating a tenant for an Athens domain the user is not admin for is disallowed + // Updating a tenant for an Athenz domain the user is not admin for is disallowed tester.assertResponse(request("/application/v4/tenant/tenant1", "{\"athensDomain\":\"domain1\", \"property\":\"property1\"}", Request.Method.PUT, @@ -589,16 +589,16 @@ public class ApplicationApiTest extends ControllerContainerTest { "{\"error-code\":\"FORBIDDEN\",\"message\":\"User othertenant does not have write access to tenant tenant1\"}", 403); - // Change Athens domain + // Change Athenz domain addTenantAthenzDomain("domain2", "mytenant"); tester.assertResponse(request("/application/v4/tenant/tenant1", "{\"athensDomain\":\"domain2\", \"property\":\"property1\"}", Request.Method.PUT, "domain1", authorizedUser), - "{\"type\":\"ATHENS\",\"athensDomain\":\"domain2\",\"property\":\"property1\",\"applications\":[]}", + "{\"type\":\"ATHENZ\",\"athensDomain\":\"domain2\",\"property\":\"property1\",\"applications\":[]}", 200); - // Deleting a tenant for an Athens domain the user is not admin for is disallowed + // Deleting a tenant for an Athenz domain the user is not admin for is disallowed tester.assertResponse(request("/application/v4/tenant/tenant1", "", Request.Method.DELETE, @@ -638,7 +638,7 @@ public class ApplicationApiTest extends ControllerContainerTest { } - /** Make a request with (athens) user domain1.mytenant1 */ + /** Make a request with (Athenz) user domain1.mytenant1 */ private Request request(String path, String data, Request.Method method) { return request(path, data.getBytes(StandardCharsets.UTF_8), method, "domain1", "mytenant", "application/json"); } @@ -673,12 +673,12 @@ public class ApplicationApiTest extends ControllerContainerTest { private AthenzDomain addTenantAthenzDomain(String domainName, String userName) { AthenzClientFactoryMock mock = (AthenzClientFactoryMock) container.components() .getComponent(AthenzClientFactoryMock.class.getName()); - AthenzDomain athensDomain = new AthenzDomain(domainName); - AthenzDbMock.Domain domain = new AthenzDbMock.Domain(athensDomain); + AthenzDomain athenzDomain = new AthenzDomain(domainName); + AthenzDbMock.Domain domain = new AthenzDbMock.Domain(athenzDomain); domain.markAsVespaTenant(); domain.admin(AthenzUtils.createPrincipal(new UserId(userName))); mock.getSetup().addDomain(domain); - return athensDomain; + return athenzDomain; } /** diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-list.json index a9d9cd33ae8..42a2ec49776 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-list.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-list.json @@ -2,10 +2,10 @@ { "tenant": "tenant1", "metaData": { - "type": "ATHENS", + "type": "ATHENZ", "athensDomain": "domain1", "property": "property1" }, "url": "http://localhost:8080/application/v4/tenant/tenant1" } -]
\ No newline at end of file +] diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json index 87901218c2e..601e408be77 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json @@ -1,5 +1,5 @@ { - "type": "ATHENS", + "type": "ATHENZ", "athensDomain": "domain1", "property": "property1", "applications": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json index 3deef01bb44..08c0f1e973b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json @@ -1,9 +1,9 @@ { - "type": "ATHENS", + "type": "ATHENZ", "athensDomain": "domain2", "property": "property2", "propertyId": "1234", "applications": [ ] -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json index 88ec5ec7d3d..eb0c1006ba0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json @@ -1,8 +1,8 @@ { - "type": "ATHENS", + "type": "ATHENZ", "athensDomain": "domain1", "property": "property1", "applications": [ ] -}
\ No newline at end of file +} |