diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-02-01 10:09:52 +0100 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2021-02-01 10:09:52 +0100 |
commit | 1da28a5c15fc0d78f461c6466ea83e774a996e4d (patch) | |
tree | 21ce5caed3cf2f5476dca434cf243f277895e713 /controller-server | |
parent | 64762584188c55c0a03b52b4baa37486f4810831 (diff) |
Create role at tenant creation
Diffstat (limited to 'controller-server')
3 files changed, 7 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 8447353a869..42ac73a61d9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -406,7 +406,7 @@ public class ApplicationController { // Provision application roles if enabled for the zone if (provisionApplicationRoles.with(FetchVector.Dimension.ZONE_ID, zone.value()).value()) { try { - applicationRoles = controller.serviceRegistry().applicationRoleService().createApplicationRoles(instance.id()); + applicationRoles = controller.serviceRegistry().roleService().createApplicationRoles(instance.id()); } catch (Exception e) { log.log(Level.SEVERE, "Exception creating application roles for application: " + instance.id(), e); throw new RuntimeException("Unable to provision iam roles for application"); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java index 4c9cf4f105f..24b9efc3c77 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java @@ -101,6 +101,7 @@ public class TenantController { requireNonExistent(tenantSpec.tenant()); TenantId.validate(tenantSpec.tenant().value()); curator.writeTenant(accessControl.createTenant(tenantSpec, controller.clock().instant(), credentials, asList())); + controller.serviceRegistry().roleService().createTenantRole(tenantSpec.tenant()); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java index ae1e2c38e6a..fd0e7c20896 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java @@ -7,10 +7,10 @@ import com.yahoo.component.AbstractComponent; import com.yahoo.config.provision.SystemName; import com.yahoo.test.ManualClock; import com.yahoo.vespa.hosted.controller.api.integration.ServiceRegistry; -import com.yahoo.vespa.hosted.controller.api.integration.aws.ApplicationRoleService; +import com.yahoo.vespa.hosted.controller.api.integration.aws.RoleService; import com.yahoo.vespa.hosted.controller.api.integration.aws.MockAwsEventFetcher; import com.yahoo.vespa.hosted.controller.api.integration.aws.MockResourceTagger; -import com.yahoo.vespa.hosted.controller.api.integration.aws.NoopApplicationRoleService; +import com.yahoo.vespa.hosted.controller.api.integration.aws.NoopRoleService; import com.yahoo.vespa.hosted.controller.api.integration.aws.ResourceTagger; import com.yahoo.vespa.hosted.controller.api.integration.billing.BillingController; import com.yahoo.vespa.hosted.controller.api.integration.billing.MockBillingController; @@ -58,7 +58,7 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg private final ApplicationStoreMock applicationStoreMock = new ApplicationStoreMock(); private final MockRunDataStore mockRunDataStore = new MockRunDataStore(); private final MockResourceTagger mockResourceTagger = new MockResourceTagger(); - private final ApplicationRoleService applicationRoleService = new NoopApplicationRoleService(); + private final RoleService roleService = new NoopRoleService(); private final BillingController billingController = new MockBillingController(); private final ContainerRegistryMock containerRegistry = new ContainerRegistryMock(); @@ -178,8 +178,8 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg } @Override - public ApplicationRoleService applicationRoleService() { - return applicationRoleService; + public RoleService roleService() { + return roleService; } @Override |