diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-05 16:25:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-05 16:25:14 +0200 |
commit | 55f2e69ee26e926c23004395c77fe267f9a648e7 (patch) | |
tree | 902c87e4c1e9b197fdddf178eb0569750a6da0d7 /controller-api | |
parent | f38ed1bb1ae6a78ff9abb4d9464985648227e9f7 (diff) |
Revert "Expose method to find user and their tenants"
Diffstat (limited to 'controller-api')
4 files changed, 4 insertions, 23 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java index 468e03bab13..0de51795bc0 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.stubs; -import com.yahoo.component.AbstractComponent; import com.yahoo.jdisc.http.filter.security.misc.User; import com.yahoo.vespa.hosted.controller.api.integration.user.UserId; import com.yahoo.vespa.hosted.controller.api.integration.user.UserManagement; @@ -14,14 +13,13 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; /** * @author jonmv */ -public class MockUserManagement extends AbstractComponent implements UserManagement { +public class MockUserManagement implements UserManagement { private final Map<Role, Set<User>> memberships = new HashMap<>(); @@ -50,7 +48,7 @@ public class MockUserManagement extends AbstractComponent implements UserManagem public void addUsers(Role role, Collection<UserId> users) { List<User> userObjs = users.stream() .map(id -> new User(id.value(), id.value(), null, null)) - .toList(); + .collect(Collectors.toList()); get(role).addAll(userObjs); } @@ -80,22 +78,11 @@ public class MockUserManagement extends AbstractComponent implements UserManagem @Override public List<Role> listRoles(UserId userId) { - return memberships.entrySet().stream() - .filter(entry -> entry.getValue().stream().anyMatch(user -> user.name().equals(userId.value()))) - .map(Map.Entry::getKey) - .toList(); + return List.of(); } @Override public List<Role> listRoles() { return new ArrayList<>(memberships.keySet()); } - - @Override - public Optional<User> findUser(String email) { - return memberships.values().stream() - .flatMap(Collection::stream) - .filter(user -> user.email().equals(email)) - .findFirst(); - } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java index db0b66bc9db..9abd318d085 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java @@ -6,7 +6,6 @@ import com.yahoo.vespa.hosted.controller.api.role.Role; import java.util.Collection; import java.util.List; -import java.util.Optional; /** * Management of {@link UserId}s as members of {@link Role}s. @@ -41,7 +40,4 @@ public interface UserManagement { /** Returns all roles */ List<Role> listRoles(); - - /** Find a user with all attributes */ - Optional<User> findUser(String email); } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java index c2682334ce0..43928b31b93 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java @@ -90,8 +90,6 @@ enum PathGroup { accountant("/billing/v2/accountant/{*}"), - userSearch("/user/v1/find"), - applicationKeys(Matcher.tenant, Matcher.application, "/application/v4/tenant/{tenant}/application/{application}/key/"), diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java index 91eaec53aa4..e7b6f7fe8e5 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java @@ -194,7 +194,7 @@ enum Policy { /** Invoice management */ hostedAccountant(Privilege.grant(Action.all()) - .on(PathGroup.hostedAccountant, PathGroup.accountant, PathGroup.userSearch) + .on(PathGroup.hostedAccountant, PathGroup.accountant) .in(SystemName.PublicCd, SystemName.Public)), /** Listing endpoint certificates and re-requesting certificates */ |