diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-09-09 14:39:40 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2021-09-09 14:39:40 +0200 |
| commit | e6b70149dea24485f6c8e32251b946f35abccced (patch) | |
| tree | 8e99ecf65494ce5a18d29640639e5fb4d5cfb447 /controller-server/src/main | |
| parent | 3275f1975076bab349dc6e06122b9b0bd7cca27b (diff) | |
Only consider tenant roles and application roles
Diffstat (limited to 'controller-server/src/main')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java index 6b509e82dba..53e29df597d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java @@ -6,7 +6,9 @@ import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.api.integration.user.Roles; import com.yahoo.vespa.hosted.controller.api.integration.user.UserManagement; +import com.yahoo.vespa.hosted.controller.api.role.ApplicationRole; import com.yahoo.vespa.hosted.controller.api.role.Role; +import com.yahoo.vespa.hosted.controller.api.role.TenantRole; import java.time.Duration; import java.util.List; @@ -57,6 +59,7 @@ public class UserManagementMaintainer extends ControllerMaintainer { .collect(Collectors.toList()); return userManagement.listRoles().stream() + .filter(role -> role instanceof TenantRole || role instanceof ApplicationRole) .filter(role -> !tenantRoles.contains(role) && !applicationRoles.contains(role)) .collect(Collectors.toList()); } |