diff options
Diffstat (limited to 'controller-api')
4 files changed, 24 insertions, 30 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java index d74dbe13acb..f545cb8ff47 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java @@ -1,13 +1,18 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration; +import com.yahoo.vespa.hosted.controller.api.integration.aws.AwsEventFetcher; import com.yahoo.vespa.hosted.controller.api.integration.certificates.ApplicationCertificateProvider; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServer; +import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationStore; +import com.yahoo.vespa.hosted.controller.api.integration.deployment.ArtifactRepository; +import com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud; import com.yahoo.vespa.hosted.controller.api.integration.dns.NameService; import com.yahoo.vespa.hosted.controller.api.integration.entity.EntityService; +import com.yahoo.vespa.hosted.controller.api.integration.organization.Billing; import com.yahoo.vespa.hosted.controller.api.integration.organization.ContactRetriever; -import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueHandler; import com.yahoo.vespa.hosted.controller.api.integration.organization.DeploymentIssues; +import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueHandler; import com.yahoo.vespa.hosted.controller.api.integration.organization.Mailer; import com.yahoo.vespa.hosted.controller.api.integration.organization.OwnershipIssues; import com.yahoo.vespa.hosted.controller.api.integration.resource.CostReportConsumer; @@ -50,4 +55,19 @@ public interface ServiceRegistry { CostReportConsumer costReportConsumer(); + Billing billingService(); + + AwsEventFetcher eventFetcherService(); + + ArtifactRepository artifactRepository(); + + TesterCloud testerCloud(); + + ApplicationStore applicationStore(); + + RunDataStore runDataStore(); + + // TODO: No longer used. Remove this once untangled from test code + BuildService buildService(); + } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/AwsEventFetcher.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/AwsEventFetcher.java index 8e7a261100a..606d7add8b0 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/AwsEventFetcher.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/AwsEventFetcher.java @@ -4,6 +4,9 @@ import com.yahoo.vespa.hosted.controller.api.integration.organization.Issue; import java.util.List; +/** + * @author freva + */ public interface AwsEventFetcher { List<CloudEvent> getEvents(String awsRegionName); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Marketplace.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Marketplace.java deleted file mode 100644 index b0ee5274a8f..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Marketplace.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yahoo.vespa.hosted.controller.api.integration.organization; - -/** - * A marketplace where purchase tokens can be validated and redeemed for payments. - * - * @author jonmv - */ -public interface Marketplace { - - /** Validates and translates the token to billing information which can be used to request payment. */ - BillingInfo resolveCustomer(String registrationToken); - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMarketplace.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMarketplace.java deleted file mode 100644 index bb5c3749289..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMarketplace.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yahoo.vespa.hosted.controller.api.integration.stubs; - -import com.yahoo.vespa.hosted.controller.api.integration.organization.BillingInfo; -import com.yahoo.vespa.hosted.controller.api.integration.organization.Marketplace; - -/** - * @author jonmv - */ -public class MockMarketplace implements Marketplace { - - @Override - public BillingInfo resolveCustomer(String registrationToken) { - return new BillingInfo("customer", "Vespa"); - } - -} |