diff options
| author | Øyvind Grønnesby <oyving@yahooinc.com> | 2022-03-14 10:39:05 +0100 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@yahooinc.com> | 2022-03-14 10:39:05 +0100 |
| commit | 6dac0b3afdfc32e88eaab84578f70b9e688b11e6 (patch) | |
| tree | 21b73499669978612dd1d5c1540471010ec3609e /controller-api | |
| parent | fed4f6dddba35fe13b9d10dc79485fa7d4d97afb (diff) | |
Stop creating leagacy IAM roles
Diffstat (limited to 'controller-api')
2 files changed, 2 insertions, 8 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java index 236d5626909..541eb3dbe90 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java @@ -19,7 +19,7 @@ public class NoopRoleService implements RoleService { @Override public TenantRoles getTenantRole(TenantName tenant) { - return new TenantRoles(tenant.value() + "-legacy-host-role", tenant.value() + "-host-role", tenant.value() + "-host-service-role", tenant.value() + "-tenant-role"); + return new TenantRoles(tenant.value() + "-host-role", tenant.value() + "-host-service-role", tenant.value() + "-tenant-role"); } @Override diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java index e3cd8ede07c..fe7d3862e18 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java @@ -5,22 +5,16 @@ package com.yahoo.vespa.hosted.controller.api.integration.aws; * @author mortent */ public class TenantRoles { - private final String hostRole; private final String tenantHostRole; private final String tenantHostServiceRole; private final String containerRole; - public TenantRoles(String hostRole, String tenantHostRole, String tenantHostServiceRole, String containerRole) { - this.hostRole = hostRole; + public TenantRoles(String tenantHostRole, String tenantHostServiceRole, String containerRole) { this.tenantHostRole = tenantHostRole; this.tenantHostServiceRole = tenantHostServiceRole; this.containerRole = containerRole; } - public String hostRole() { - return hostRole; - } - public String tenantHostRole() { return tenantHostRole; } |