diff options
Diffstat (limited to 'vespa-athenz/src')
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java | 5 | ||||
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java index 92d4c0c799c..89ddd31a9e0 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java @@ -288,7 +288,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { } @Override - public Map<AthenzUser, String> listPendingRoleApprovals(AthenzRole athenzRole) { + public Map<AthenzIdentity, String> listPendingRoleApprovals(AthenzRole athenzRole) { URI uri = zmsUrl.resolve(String.format("domain/%s/role/%s?pending=true", athenzRole.domain().getName(), athenzRole.roleName())); HttpUriRequest request = RequestBuilder.get() .setUri(uri) @@ -297,9 +297,8 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { return roleEntity.roleMembers().stream() .filter(RoleEntity.Member::pendingApproval) - .filter(re -> AthenzIdentities.USER_PRINCIPAL_DOMAIN.equals(AthenzIdentities.from(re.memberName()).getDomain())) .collect(Collectors.toUnmodifiableMap( - m -> (AthenzUser) AthenzIdentities.from(m.memberName()), + m -> AthenzIdentities.from(m.memberName()), m -> m.auditRef() != null ? m.auditRef() : "<no reason provided>")); } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java index f2fd4fef731..f6c612caec8 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java @@ -61,7 +61,7 @@ public interface ZmsClient extends AutoCloseable { Optional<AthenzPolicy> getPolicy(AthenzDomain domain, String name); - Map<AthenzUser, String> listPendingRoleApprovals(AthenzRole athenzRole); + Map<AthenzIdentity, String> listPendingRoleApprovals(AthenzRole athenzRole); void approvePendingRoleMembership(AthenzRole athenzRole, AthenzIdentity athenzIdentity, Instant expiry, Optional<String> reason); |