From 9d693d1113a8400efac1a773faf9130a27aad1bd Mon Sep 17 00:00:00 2001 From: Øyvind Grønnesby Date: Tue, 3 May 2022 16:04:34 +0200 Subject: Allow hostedAccountant to bypass some checks --- .../hosted/controller/api/integration/billing/BillingController.java | 3 ++- .../controller/api/integration/billing/MockBillingController.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'controller-api') diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java index 0ef76f498fb..40bc9b27449 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java @@ -48,9 +48,10 @@ public interface BillingController { * @param tenant The name of the tenant. * @param planId The ID of the plan to change to. * @param hasDeployments Does the tenant have active deployments. + * @param isAccountant Is it the hosted accountant that is doing the operation * @return String containing error message if something went wrong. Empty otherwise */ - PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments); + PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments, boolean isAccountant); /** * Create a bill of unbilled use for the given tenant in the given time period. diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java index d6aa434ece4..44dd3a293c5 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java @@ -56,7 +56,7 @@ public class MockBillingController implements BillingController { } @Override - public PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments) { + public PlanResult setPlan(TenantName tenant, PlanId planId, boolean hasDeployments, boolean isAccountant) { plans.put(tenant, planId); return PlanResult.success(); } -- cgit v1.2.3