diff options
9 files changed, 72 insertions, 72 deletions
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java index 05ab94fc118..1bd5feb1966 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java @@ -118,12 +118,12 @@ public class IdentifierTest { } @Test - public void athens_parent_domain_is_without_name_suffix() { + public void athenz_parent_domain_is_without_name_suffix() { assertEquals(new AthenzDomain("yby.john"), new AthenzDomain("yby.john.myapp").getParent()); } @Test - public void athens_domain_name_is_last_suffix() { + public void athenz_domain_name_is_last_suffix() { assertEquals("myapp", new AthenzDomain("yby.john.myapp").getNameSuffix()); } 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 4eb2e1a3b46..4889f789819 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 @@ -19,41 +19,41 @@ public class Tenant { private final TenantId id; private final Optional<UserGroup> userGroup; private final Optional<Property> property; - private final Optional<AthenzDomain> athensDomain; + private final Optional<AthenzDomain> athenzDomain; private final Optional<PropertyId> propertyId; // TODO: Use factory methods. They're down at the bottom! - public Tenant(TenantId id, Optional<UserGroup> userGroup, Optional<Property> property, Optional<AthenzDomain> athensDomain) { - this(id, userGroup, property, athensDomain, Optional.empty()); + public Tenant(TenantId id, Optional<UserGroup> userGroup, Optional<Property> property, Optional<AthenzDomain> athenzDomain) { + this(id, userGroup, property, athenzDomain, Optional.empty()); } - public Tenant(TenantId id, Optional<UserGroup> userGroup, Optional<Property> property, Optional<AthenzDomain> athensDomain, Optional<PropertyId> propertyId) { + public Tenant(TenantId id, Optional<UserGroup> userGroup, Optional<Property> property, Optional<AthenzDomain> athenzDomain, Optional<PropertyId> propertyId) { if (id.isUser()) { require(!userGroup.isPresent(), "User tenant '%s' cannot have a user group.", id); require(!property.isPresent(), "User tenant '%s' cannot have a property.", id); require(!propertyId.isPresent(), "User tenant '%s' cannot have a property ID.", id); - require(!athensDomain.isPresent(), "User tenant '%s' cannot have an athens domain.", id); - } else if (athensDomain.isPresent()) { + require(!athenzDomain.isPresent(), "User tenant '%s' cannot have an athens domain.", id); + } else if (athenzDomain.isPresent()) { require(property.isPresent(), "Athens tenant '%s' must have a property.", id); require(!userGroup.isPresent(), "Athens tenant '%s' cannot have a user group.", id); - require(athensDomain.isPresent(), "Athens tenant '%s' must have an athens domain.", id); + require(athenzDomain.isPresent(), "Athens tenant '%s' must have an athens domain.", id); } else { require(property.isPresent(), "OpsDB tenant '%s' must have a property.", id); require(userGroup.isPresent(), "OpsDb tenant '%s' must have a user group.", id); - require(!athensDomain.isPresent(), "OpsDb tenant '%s' cannot have an athens domain.", id); + require(!athenzDomain.isPresent(), "OpsDb tenant '%s' cannot have an athens domain.", id); } this.id = id; this.userGroup = userGroup; this.property = property; - this.athensDomain = athensDomain; + this.athenzDomain = athenzDomain; this.propertyId = propertyId; // TODO: Check validity after TODO@14. OpsDb tenants have this set in Sherpa, while athens tenants do not. } - public boolean isAthensTenant() { return athensDomain.isPresent(); } + public boolean isAthensTenant() { return athenzDomain.isPresent(); } public boolean isOpsDbTenant() { return userGroup.isPresent();} public TenantType tenantType() { - if (athensDomain.isPresent()) { + if (athenzDomain.isPresent()) { return TenantType.ATHENS; } else if (id.isUser()) { return TenantType.USER; @@ -81,7 +81,7 @@ public class Tenant { } public Optional<AthenzDomain> getAthensDomain() { - return athensDomain; + return athenzDomain; } private void require(boolean statement, String message, TenantId id) { @@ -124,7 +124,7 @@ public class Tenant { if (!id.equals(tenant.id)) return false; if (!userGroup.equals(tenant.userGroup)) return false; if (!property.equals(tenant.property)) return false; - if (!athensDomain.equals(tenant.athensDomain)) return false; + if (!athenzDomain.equals(tenant.athenzDomain)) return false; if (!propertyId.equals(tenant.propertyId)) return false; return true; } @@ -134,7 +134,7 @@ public class Tenant { int result = id.hashCode(); result = 31 * result + userGroup.hashCode(); result = 31 * result + property.hashCode(); - result = 31 * result + athensDomain.hashCode(); + result = 31 * result + athenzDomain.hashCode(); result = 31 * result + propertyId.hashCode(); return result; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java index 6fb03754e5e..0cd55fc685f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java @@ -17,36 +17,36 @@ public class AthenzClientFactoryMock extends AbstractComponent implements Athenz private static final Logger log = Logger.getLogger(AthenzClientFactoryMock.class.getName()); - private final AthenzDbMock athens; + private final AthenzDbMock athenz; public AthenzClientFactoryMock() { this(new AthenzDbMock()); } - public AthenzClientFactoryMock(AthenzDbMock athens) { - this.athens = athens; + public AthenzClientFactoryMock(AthenzDbMock athenz) { + this.athenz = athenz; } public AthenzDbMock getSetup() { - return athens; + return athenz; } @Override public ZmsClient createZmsClientWithServicePrincipal() { log("createZmsClientWithServicePrincipal()"); - return new ZmsClientMock(athens); + return new ZmsClientMock(athenz); } @Override public ZtsClient createZtsClientWithServicePrincipal() { log("createZtsClientWithServicePrincipal()"); - return new ZtsClientMock(athens); + return new ZtsClientMock(athenz); } @Override public ZmsClient createZmsClientWithAuthorizedServiceToken(NToken authorizedServiceToken) { log("createZmsClientWithAuthorizedServiceToken(authorizedServiceToken='%s')", authorizedServiceToken); - return new ZmsClientMock(athens); + return new ZmsClientMock(athenz); } private static void log(String format, Object... args) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java index d1ada1836f8..b2e657eae09 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java @@ -24,10 +24,10 @@ public class ZmsClientMock implements ZmsClient { private static final Logger log = Logger.getLogger(ZmsClientMock.class.getName()); - private final AthenzDbMock athens; + private final AthenzDbMock athenz; - public ZmsClientMock(AthenzDbMock athens) { - this.athens = athens; + public ZmsClientMock(AthenzDbMock athenz) { + this.athenz = athenz; } @Override @@ -88,7 +88,7 @@ public class ZmsClientMock implements ZmsClient { @Override public List<AthenzDomain> getDomainList(String prefix) { log("getDomainList()"); - return new ArrayList<>(athens.domains.keySet()); + return new ArrayList<>(athenz.domains.keySet()); } @Override @@ -102,7 +102,7 @@ public class ZmsClientMock implements ZmsClient { } private AthenzDbMock.Domain getDomainOrThrow(AthenzDomain domainName, boolean verifyVespaTenant) { - AthenzDbMock.Domain domain = Optional.ofNullable(athens.domains.get(domainName)) + AthenzDbMock.Domain domain = Optional.ofNullable(athenz.domains.get(domainName)) .orElseThrow(() -> zmsException(400, "Domain '%s' not found", domainName)); if (verifyVespaTenant && !domain.isVespaTenant) { throw zmsException(400, "Domain not a Vespa tenant: '%s'", domainName); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java index ebcfac416b5..f21bc011273 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java @@ -17,16 +17,16 @@ import static java.util.stream.Collectors.toList; public class ZtsClientMock implements ZtsClient { private static final Logger log = Logger.getLogger(ZtsClientMock.class.getName()); - private final AthenzDbMock athens; + private final AthenzDbMock athenz; - public ZtsClientMock(AthenzDbMock athens) { - this.athens = athens; + public ZtsClientMock(AthenzDbMock athenz) { + this.athenz = athenz; } @Override public List<AthenzDomain> getTenantDomainsForUser(AthenzPrincipal principal) { log.log(Level.INFO, "getTenantDomainsForUser(principal='%s')", principal); - return athens.domains.values().stream() + return athenz.domains.values().stream() .filter(domain -> domain.tenantAdmins.contains(principal) || domain.admins.contains(principal)) .map(domain -> domain.name) .collect(toList()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 23e32130153..d39f72ec1b8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -357,13 +357,13 @@ public class ControllerTest { } @Test - public void testMigratingTenantToAthensWillModifyAthensDomainsCorrectly() { + public void testMigratingTenantToAthenzWillModifyAthenzDomainsCorrectly() { ControllerTester tester = new ControllerTester(); // Create Athens domain mock AthenzDomain athensDomain = new AthenzDomain("vespa.john"); AthenzDbMock.Domain mockDomain = new AthenzDbMock.Domain(athensDomain); - tester.athensDb().addDomain(mockDomain); + tester.athenzDb().addDomain(mockDomain); // Create OpsDb tenant TenantId tenantId = new TenantId("mytenant"); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java index f21539348bb..b49d55aeb3b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertTrue; public final class ControllerTester { private final ControllerDb db; - private final AthenzDbMock athensDb; + private final AthenzDbMock athenzDb; private final ManualClock clock; private final ConfigServerClientMock configServer; private final ZoneRegistryMock zoneRegistry; @@ -73,11 +73,11 @@ public final class ControllerTester { new ZoneRegistryMock(), new GitHubMock(), new MockCuratorDb(), new MemoryNameService()); } - private ControllerTester(ControllerDb db, AthenzDbMock athensDb, ManualClock clock, + private ControllerTester(ControllerDb db, AthenzDbMock athenzDb, ManualClock clock, ConfigServerClientMock configServer, ZoneRegistryMock zoneRegistry, GitHubMock gitHub, CuratorDb curator, MemoryNameService nameService) { this.db = db; - this.athensDb = athensDb; + this.athenzDb = athenzDb; this.clock = clock; this.configServer = configServer; this.zoneRegistry = zoneRegistry; @@ -85,7 +85,7 @@ public final class ControllerTester { this.curator = curator; this.nameService = nameService; this.controller = createController(db, curator, configServer, clock, gitHub, zoneRegistry, - athensDb, nameService); + athenzDb, nameService); } public Controller controller() { return controller; } @@ -94,7 +94,7 @@ public final class ControllerTester { public ManualClock clock() { return clock; } - public AthenzDbMock athensDb() { return athensDb; } + public AthenzDbMock athenzDb() { return athenzDb; } public MemoryNameService nameService() { return nameService; } @@ -106,7 +106,7 @@ public final class ControllerTester { /** Create a new controller instance. Useful to verify that controller state is rebuilt from persistence */ public final void createNewController() { - controller = createController(db, curator, configServer, clock, gitHub, zoneRegistry, athensDb, nameService); + controller = createController(db, curator, configServer, clock, gitHub, zoneRegistry, athenzDb, nameService); } /** Creates the given tenant and application and deploys it */ @@ -149,7 +149,7 @@ public final class ControllerTester { public AthenzDomain createDomain(String domainName) { AthenzDomain domain = new AthenzDomain(domainName); - athensDb.addDomain(new AthenzDbMock.Domain(domain)); + athenzDb.addDomain(new AthenzDbMock.Domain(domain)); return domain; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java index ffa1bb13ce0..45a8972eafe 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java @@ -68,7 +68,7 @@ public class ContainerControllerTester { } public Application createApplication(String athensDomain, String tenant, String application) { - AthenzDomain domain1 = addTenantAthensDomain(athensDomain, "mytenant"); + AthenzDomain domain1 = addTenantAthenzDomain(athensDomain, "mytenant"); controller.tenants().addTenant(Tenant.createAthensTenant(new TenantId(tenant), domain1, new Property("property1"), Optional.of(new PropertyId("1234"))), @@ -94,7 +94,7 @@ public class ContainerControllerTester { )); } - public AthenzDomain addTenantAthensDomain(String domainName, String userName) { + public AthenzDomain addTenantAthenzDomain(String domainName, String userName) { AthenzClientFactoryMock mock = (AthenzClientFactoryMock) containerTester.container().components() .getComponent(AthenzClientFactoryMock.class.getName()); AthenzDomain athensDomain = new AthenzDomain(domainName); 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 e1fc0dfe960..ef8a3809b25 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 @@ -53,8 +53,8 @@ public class ApplicationApiTest extends ControllerContainerTest { .environment(Environment.prod) .region("corp-us-east-1") .build(); - private static final String athensUserDomain = "domain1"; - private static final String athensScrewdriverDomain = AthenzUtils.SCREWDRIVER_DOMAIN.id(); + private static final String athenzUserDomain = "domain1"; + private static final String athenzScrewdriverDomain = AthenzUtils.SCREWDRIVER_DOMAIN.id(); @Test @@ -63,7 +63,7 @@ public class ApplicationApiTest extends ControllerContainerTest { ContainerTester tester = controllerTester.containerTester(); tester.updateSystemVersion(); - addTenantAthensDomain(athensUserDomain, "mytenant"); // (Necessary but not provided in this API) + addTenantAthenzDomain(athenzUserDomain, "mytenant"); // (Necessary but not provided in this API) // GET API root tester.assertResponse(request("/application/v4/", "", Request.Method.GET), @@ -121,7 +121,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/dev/region/us-west-1/instance/default/deploy", entity, Request.Method.POST, - athensUserDomain, "mytenant"), + athenzUserDomain, "mytenant"), new File("deploy-result.json")); // POST (deploy) an application to a zone. This simulates calls done by our tenant pipeline. @@ -138,7 +138,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/test/region/us-east-1/instance/default/", createApplicationDeployData(applicationPackage, Optional.of(screwdriverProjectId)), Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/test/region/us-east-1/instance/default", "", @@ -150,7 +150,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/staging/region/us-east-3/instance/default/", createApplicationDeployData(applicationPackage, Optional.of(screwdriverProjectId)), Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/staging/region/us-east-3/instance/default", "", @@ -162,7 +162,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/corp-us-east-1/instance/default/", createApplicationDeployData(applicationPackage, Optional.of(screwdriverProjectId)), Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); controllerTester.notifyJobCompletion(id, screwdriverProjectId, false, DeploymentJobs.JobType.productionCorpUsEast1); @@ -228,14 +228,14 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/user?user=newuser&domain=by", new byte[0], Request.Method.PUT, - athensUserDomain, "newuser", "application/json"), + athenzUserDomain, "newuser", "application/json"), new File("create-user-response.json")); // OPTIONS return 200 OK tester.assertResponse(request("/application/v4/", "", Request.Method.OPTIONS), ""); // Add another Athens domain, so we can try to create more tenants - addTenantAthensDomain("domain2", "mytenant"); // New domain to test tenant w/property ID + 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", "{\"athensDomain\":\"domain2\", \"property\":\"property2\", \"propertyId\":\"1234\"}", @@ -292,7 +292,7 @@ public class ApplicationApiTest extends ControllerContainerTest { ContainerControllerTester controllerTester = new ContainerControllerTester(container, responseFiles); ContainerTester tester = controllerTester.containerTester(); tester.updateSystemVersion(); - addTenantAthensDomain(athensUserDomain, "mytenant"); + addTenantAthenzDomain(athenzUserDomain, "mytenant"); addScrewdriverUserToDomain("screwdriveruser1", "domain1"); // Create tenant @@ -312,7 +312,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/corp-us-east-1/instance/default/deploy", entity, Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); } @@ -322,7 +322,7 @@ public class ApplicationApiTest extends ControllerContainerTest { ContainerControllerTester controllerTester = new ContainerControllerTester(container, responseFiles); ContainerTester tester = controllerTester.containerTester(); tester.updateSystemVersion(); - addTenantAthensDomain(athensUserDomain, "mytenant"); + addTenantAthenzDomain(athenzUserDomain, "mytenant"); addScrewdriverUserToDomain("screwdriveruser1", "domain1"); // Create tenant @@ -351,7 +351,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-east-3/instance/default/deploy", deployData, Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); controllerTester.notifyJobCompletion(id, projectId, true, DeploymentJobs.JobType.productionUsEast3); @@ -368,7 +368,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-west-1/instance/default/deploy", deployData, Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); controllerTester.notifyJobCompletion(id, projectId, true, DeploymentJobs.JobType.productionUsWest1); @@ -376,7 +376,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-east-3/instance/default/deploy", deployData, Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); controllerTester.notifyJobCompletion(id, projectId, true, DeploymentJobs.JobType.productionUsEast3); @@ -388,7 +388,7 @@ public class ApplicationApiTest extends ControllerContainerTest { public void testErrorResponses() throws Exception { ContainerTester tester = new ContainerTester(container, responseFiles); tester.updateSystemVersion(); - addTenantAthensDomain("domain1", "mytenant"); + addTenantAthenzDomain("domain1", "mytenant"); // PUT (update) non-existing tenant tester.assertResponse(request("/application/v4/tenant/tenant1", @@ -459,7 +459,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/dev/region/us-west-1/instance/default/deploy", entity, Request.Method.POST, - athensUserDomain, "mytenant"), + athenzUserDomain, "mytenant"), new File("deploy-failure.json"), 400); // POST (deploy) an application without available capacity @@ -467,7 +467,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/dev/region/us-west-1/instance/default/deploy", entity, Request.Method.POST, - athensUserDomain, "mytenant"), + athenzUserDomain, "mytenant"), new File("deploy-out-of-capacity.json"), 400); // DELETE tenant which has an application @@ -522,7 +522,7 @@ public class ApplicationApiTest extends ControllerContainerTest { "[]", 200); - addTenantAthensDomain("domain1", "mytenant"); + addTenantAthenzDomain("domain1", "mytenant"); // Creating a tenant for an Athens domain the user is not admin for is disallowed tester.assertResponse(request("/application/v4/tenant/tenant1", @@ -561,7 +561,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-west-1/instance/default/deploy", entity, Request.Method.POST, - athensUserDomain, "mytenant"), + athenzUserDomain, "mytenant"), "{\"error-code\":\"FORBIDDEN\",\"message\":\"Principal 'mytenant' is not a screwdriver principal, and does not have deploy access to application 'tenant1.application1'\"}", 403); @@ -590,7 +590,7 @@ public class ApplicationApiTest extends ControllerContainerTest { 403); // Change Athens domain - addTenantAthensDomain("domain2", "mytenant"); + addTenantAthenzDomain("domain2", "mytenant"); tester.assertResponse(request("/application/v4/tenant/tenant1", "{\"athensDomain\":\"domain2\", \"property\":\"property1\"}", Request.Method.PUT, @@ -670,7 +670,7 @@ public class ApplicationApiTest extends ControllerContainerTest { * In production this happens outside hosted Vespa, so there is no API for it and we need to reach down into the * mock setup to replicate the action. */ - private AthenzDomain addTenantAthensDomain(String domainName, String userName) { + private AthenzDomain addTenantAthenzDomain(String domainName, String userName) { AthenzClientFactoryMock mock = (AthenzClientFactoryMock) container.components() .getComponent(AthenzClientFactoryMock.class.getName()); AthenzDomain athensDomain = new AthenzDomain(domainName); @@ -689,7 +689,7 @@ public class ApplicationApiTest extends ControllerContainerTest { AthenzClientFactoryMock mock = (AthenzClientFactoryMock) container.components() .getComponent(AthenzClientFactoryMock.class.getName()); AthenzDbMock.Domain domain = mock.getSetup().domains.get(new AthenzDomain(domainName)); - domain.admin(new AthenzPrincipal(new AthenzDomain(athensScrewdriverDomain), new UserId(screwdriverUserId))); + domain.admin(new AthenzPrincipal(new AthenzDomain(athenzScrewdriverDomain), new UserId(screwdriverUserId))); } private void startAndTestChange(ContainerControllerTester controllerTester, ApplicationId application, long projectId, @@ -703,9 +703,9 @@ public class ApplicationApiTest extends ControllerContainerTest { String testPath = String.format("/application/v4/tenant/%s/application/%s/environment/test/region/us-east-1/instance/default", application.tenant().value(), application.application().value()); tester.assertResponse(request(testPath, - deployData, - Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + deployData, + Request.Method.POST, + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); tester.assertResponse(request(testPath, "", @@ -717,9 +717,9 @@ public class ApplicationApiTest extends ControllerContainerTest { String stagingPath = String.format("/application/v4/tenant/%s/application/%s/environment/staging/region/us-east-3/instance/default", application.tenant().value(), application.application().value()); tester.assertResponse(request(stagingPath, - deployData, - Request.Method.POST, - athensScrewdriverDomain, "screwdriveruser1"), + deployData, + Request.Method.POST, + athenzScrewdriverDomain, "screwdriveruser1"), new File("deploy-result.json")); tester.assertResponse(request(stagingPath, "", |