Merge pull request #16781 from vespa-engine/mortent/maintain-roles

Add new methods to RoleService, create maintainer for maintaining roles

2 files changed, 20 insertions, 0 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 dceb56d14c1..d967ad3dca4 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
@@ -4,6 +4,8 @@ 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;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -17,7 +19,16 @@ public class NoopRoleService implements RoleService {
     }
 
     @Override
+    public void deleteTenantRole(TenantName tenant) { }
+
+    @Override
     public String createTenantPolicy(TenantName tenant, String policyName, String awsId, String role) {
         return "";
     }
+
+    @Override
+    public void deleteTenantPolicy(TenantName tenant, String policyName) { }
+
+    @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 3c04546f479..4219ad35612 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
@@ -4,6 +4,7 @@ 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;
 import java.util.Optional;
 
 /**
@@ -13,6 +14,14 @@ public interface RoleService {
 
     Optional<TenantRoles> createTenantRole(TenantName tenant);
 
+    void deleteTenantRole(TenantName tenant);
+
     String createTenantPolicy(TenantName tenant, String policyName, String awsId, String role);
 
+    void deleteTenantPolicy(TenantName tenant, String policyName);
+
+    /*
+     * Maintain roles for the tenants in the system. Create missing roles, update trust.
+     */
+    void maintainRoles(List<TenantName> tenants);
 }