diff options
| author | Øyvind Grønnesby <oyving@yahooinc.com> | 2022-05-05 09:18:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 09:18:37 +0200 |
| commit | 11fa502ceff0f4d7b7939289250441b94419eaa5 (patch) | |
| tree | 3ccf65118cf04d3ecae21cd6b6dcdbd77e4207c3 /controller-api | |
| parent | b4a2e26f7edc3ab49ec4d799e74ac46be67ce0a4 (diff) | |
| parent | c0cdfa6780ab9707c181327a6408ceb14a715116 (diff) | |
Merge pull request #22424 from vespa-engine/ogronnesby/accountant-can-change-plan
Allow hostedAccountant to bypass some checks
Diffstat (limited to 'controller-api')
2 files changed, 3 insertions, 2 deletions
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(); } |