diff options
author | Andreas Eriksen <andreer@verizonmedia.com> | 2021-09-10 09:12:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-10 09:12:40 +0200 |
commit | 01513fb2bef0d0b3021ede9857604b3d8b19cf31 (patch) | |
tree | cff84b55f21dc620a03e3df379b4f6d8ba31d40b /controller-api/src | |
parent | 0e6866b490b1af138df94b7cab3b8244710704bf (diff) |
return audit refs when listing pending approvals (#19045)
Diffstat (limited to 'controller-api/src')
2 files changed, 5 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java index 0be32165916..3391965dc67 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java @@ -11,6 +11,7 @@ import com.yahoo.vespa.athenz.client.zms.ZmsClient; import java.time.Instant; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; public class AthenzAccessControlService implements AccessControlService { @@ -34,8 +35,8 @@ public class AthenzAccessControlService implements AccessControlService { if(!isVespaTeamMember(user)) { throw new IllegalArgumentException(String.format("User %s requires manual approval, please contact Vespa team", user.getName())); } - List<AthenzUser> users = zmsClient.listPendingRoleApprovals(dataPlaneAccessRole); - if (users.contains(user)) { + Map<AthenzUser, String> users = zmsClient.listPendingRoleApprovals(dataPlaneAccessRole); + if (users.containsKey(user)) { zmsClient.approvePendingRoleMembership(dataPlaneAccessRole, user, expiry); return true; } 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 45018787f02..63a2729baf4 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 @@ -162,8 +162,8 @@ public class ZmsClientMock implements ZmsClient { } @Override - public List<AthenzUser> listPendingRoleApprovals(AthenzRole athenzRole) { - return List.of(); + public Map<AthenzUser,String> listPendingRoleApprovals(AthenzRole athenzRole) { + return Map.of(); } @Override |