diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-03-04 17:07:54 +0100 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2021-03-04 17:07:54 +0100 |
| commit | 09f55fcf4212ba16dc1d13ef5c3ed4a8d92c4826 (patch) | |
| tree | 1e021a0f023a460eb75931fd4ad1625bcfedc741 /controller-api | |
| parent | f3b17b2cf1488053eb386608574c3369d4b668a1 (diff) | |
Delete tenant policy requires role
Diffstat (limited to 'controller-api')
2 files changed, 2 insertions, 4 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 d967ad3dca4..719f948eaa9 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 @@ -1,7 +1,6 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.aws; -import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; import java.util.Collections; @@ -27,7 +26,7 @@ public class NoopRoleService implements RoleService { } @Override - public void deleteTenantPolicy(TenantName tenant, String policyName) { } + public void deleteTenantPolicy(TenantName tenant, String policyName, String role) { } @Override public void maintainRoles(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 4219ad35612..ac499a0def3 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 @@ -1,7 +1,6 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.aws; -import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; import java.util.List; @@ -18,7 +17,7 @@ public interface RoleService { String createTenantPolicy(TenantName tenant, String policyName, String awsId, String role); - void deleteTenantPolicy(TenantName tenant, String policyName); + void deleteTenantPolicy(TenantName tenant, String policyName, String role); /* * Maintain roles for the tenants in the system. Create missing roles, update trust. |