diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2022-08-10 11:40:39 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2022-08-10 11:42:50 +0200 |
| commit | 18d53a9e3b97bd034ab3ea9d82262a7dd46e6e94 (patch) | |
| tree | cbfe4277bd4695e14880ab6bb797b44c430ec8a8 /controller-api | |
| parent | 2e39740349f23b96307c504fd90312ff607517b1 (diff) | |
Clean up roles of deleted tenants
Diffstat (limited to 'controller-api')
3 files changed, 12 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java index 53e2592e0a6..7539f7b4cf2 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java @@ -274,6 +274,11 @@ public class ZmsClientMock implements ZmsClient { } @Override + public void deleteSubdomain(AthenzDomain parent, String name) { + athenz.domains.remove(new AthenzDomain(parent.getName() + "." + name)); + } + + @Override public void close() {} private static AthenzDomain getTenantDomain(AthenzResourceName resource) { 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 541eb3dbe90..1ef1bc5106c 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 @@ -35,4 +35,9 @@ public class NoopRoleService implements RoleService { @Override public void maintainRoles(List<TenantName> tenants) { } + + @Override + public void cleanupRoles(List<TenantName> tenants) { + + } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/RoleService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/RoleService.java index bc661077537..0a35893a7c4 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/RoleService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/RoleService.java @@ -27,4 +27,6 @@ public interface RoleService { * Maintain roles for the tenants in the system. Create missing roles, update trust. */ void maintainRoles(List<TenantName> tenants); + + void cleanupRoles(List<TenantName> deletedTenants); } |