diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-04-15 09:50:46 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-04-15 10:16:26 +0200 |
commit | c5c5015d4c4aeb1615f86a1b1aa3744bd3ff0722 (patch) | |
tree | 197ded919ddba283392b0f508317c8a4ca92a36f /controller-server | |
parent | d0fe8b84ed98bf6cb294af8edda1f7d0bcd03e89 (diff) |
UserRoles -> Roles
Diffstat (limited to 'controller-server')
2 files changed, 10 insertions, 10 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java index c11bdc38c5d..d2979824651 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java @@ -15,7 +15,7 @@ import com.yahoo.slime.Slime; import com.yahoo.vespa.config.SlimeUtils; import com.yahoo.vespa.hosted.controller.api.integration.user.UserId; import com.yahoo.vespa.hosted.controller.api.integration.user.UserManagement; -import com.yahoo.vespa.hosted.controller.api.integration.user.UserRoles; +import com.yahoo.vespa.hosted.controller.api.integration.user.Roles; import com.yahoo.vespa.hosted.controller.api.role.Role; import com.yahoo.vespa.hosted.controller.api.role.RoleDefinition; import com.yahoo.vespa.hosted.controller.restapi.ErrorResponse; @@ -45,13 +45,13 @@ public class UserApiHandler extends LoggingRequestHandler { private final static Logger log = Logger.getLogger(UserApiHandler.class.getName()); private static final String optionalPrefix = "/api"; - private final UserRoles roles; + private final Roles roles; private final UserManagement users; @Inject public UserApiHandler(Context parentCtx, UserManagement users) { super(parentCtx); - this.roles = new UserRoles(); + this.roles = new Roles(); this.users = users; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java index 7e0bb42c712..4daa2216484 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java @@ -7,7 +7,7 @@ import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.api.integration.organization.Marketplace; import com.yahoo.vespa.hosted.controller.api.integration.user.UserId; import com.yahoo.vespa.hosted.controller.api.integration.user.UserManagement; -import com.yahoo.vespa.hosted.controller.api.integration.user.UserRoles; +import com.yahoo.vespa.hosted.controller.api.integration.user.Roles; 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; @@ -24,13 +24,13 @@ public class CloudAccessControl implements AccessControl { private final Marketplace marketplace; private final UserManagement userManagement; - private final UserRoles userRoles; + private final Roles roles; @Inject public CloudAccessControl(Marketplace marketplace, UserManagement userManagement) { this.marketplace = marketplace; this.userManagement = userManagement; - this.userRoles = new UserRoles(); + this.roles = new Roles(); } @Override @@ -38,7 +38,7 @@ public class CloudAccessControl implements AccessControl { CloudTenantSpec spec = (CloudTenantSpec) tenantSpec; CloudTenant tenant = new CloudTenant(spec.tenant(), marketplace.resolveCustomer(spec.getRegistrationToken())); - for (Role role : userRoles.tenantRoles(spec.tenant())) + for (Role role : roles.tenantRoles(spec.tenant())) userManagement.createRole(role); userManagement.addUsers(Role.tenantOwner(spec.tenant()), List.of(new UserId(credentials.user().getName()))); @@ -54,20 +54,20 @@ public class CloudAccessControl implements AccessControl { public void deleteTenant(TenantName tenant, Credentials credentials) { // Probably terminate customer subscription? - for (TenantRole role : userRoles.tenantRoles(tenant)) + for (TenantRole role : roles.tenantRoles(tenant)) userManagement.deleteRole(role); } @Override public void createApplication(ApplicationId id, Credentials credentials) { - for (Role role : userRoles.applicationRoles(id.tenant(), id.application())) + for (Role role : roles.applicationRoles(id.tenant(), id.application())) userManagement.createRole(role); userManagement.addUsers(Role.applicationAdmin(id.tenant(), id.application()), List.of(new UserId(credentials.user().getName()))); } @Override public void deleteApplication(ApplicationId id, Credentials credentials) { - for (ApplicationRole role : userRoles.applicationRoles(id.tenant(), id.application())) + for (ApplicationRole role : roles.applicationRoles(id.tenant(), id.application())) userManagement.deleteRole(role); } |