diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-09-06 15:17:06 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-09-09 10:34:17 +0200 |
commit | 9fdb33af343daf1c89ffe98016a4fdeaeefc175e (patch) | |
tree | fa5b3488c67008f31da200926489ce6c7b176c03 /controller-server | |
parent | c1986f854e4e1c630ebbb00cbe22ccf86a298ff7 (diff) |
Remove unused Marketplace interface
Diffstat (limited to 'controller-server')
2 files changed, 6 insertions, 7 deletions
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 f803ab9f29c..8c52931cd6c 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 @@ -4,10 +4,10 @@ import com.google.inject.Inject; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; 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.organization.BillingInfo; +import com.yahoo.vespa.hosted.controller.api.integration.user.Roles; 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.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; @@ -22,19 +22,19 @@ import java.util.List; */ public class CloudAccessControl implements AccessControl { - private final Marketplace marketplace; + private static final BillingInfo defaultBillingInfo = new BillingInfo("customer", "Vespa"); + private final UserManagement userManagement; @Inject - public CloudAccessControl(Marketplace marketplace, UserManagement userManagement) { - this.marketplace = marketplace; + public CloudAccessControl(UserManagement userManagement) { this.userManagement = userManagement; } @Override public CloudTenant createTenant(TenantSpec tenantSpec, Credentials credentials, List<Tenant> existing) { CloudTenantSpec spec = (CloudTenantSpec) tenantSpec; - CloudTenant tenant = new CloudTenant(spec.tenant(), marketplace.resolveCustomer(spec.getRegistrationToken())); + CloudTenant tenant = new CloudTenant(spec.tenant(), defaultBillingInfo); for (Role role : Roles.tenantRoles(spec.tenant())) userManagement.createRole(role); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java index 102326d0a5e..b6154876dba 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java @@ -27,7 +27,6 @@ public class ControllerContainerCloudTest extends ControllerContainerTest { return " <component id='com.yahoo.vespa.hosted.controller.security.CloudAccessControlRequests'/>\n" + " <component id='com.yahoo.vespa.hosted.controller.security.CloudAccessControl'/>\n" + " <component id='com.yahoo.vespa.hosted.controller.api.integration.stubs.MockUserManagement'/>\n" + - " <component id='com.yahoo.vespa.hosted.controller.api.integration.stubs.MockMarketplace'/>\n" + " <handler id='com.yahoo.vespa.hosted.controller.restapi.application.ApplicationApiHandler'>\n" + " <binding>http://*/application/v4/*</binding>\n" + |