Merge pull request #13756 from vespa-engine/olaa/propagate-error-message

Propagate error message when setting plan fails

1 files changed, 4 insertions, 17 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
index ccbee15d2c5..0e6f856b115 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
@@ -139,12 +139,12 @@ public class BillingApiHandler extends LoggingRequestHandler {
         var planId = PlanId.from(slime.field("plan").asString());
         var hasApplications = applicationController.asList(tenantName).size() > 0;
 
-        if (billingController.setPlan(tenantName, planId, hasApplications)) {
+        var result = billingController.setPlan(tenantName, planId, hasApplications);
+
+        if (result.isSuccess())
             return new StringResponse("Plan: " + planId.value());
-        } else {
-            return ErrorResponse.forbidden("Invalid plan change with active deployments");
-        }
 
+        return ErrorResponse.forbidden(result.getErrorMessage().orElse("Invalid plan change"));
     }
 
     private HttpResponse getBillingAllTenants(String until) {
@@ -374,19 +374,6 @@ public class BillingApiHandler extends LoggingRequestHandler {
         return inspector.field(field).asString();
     }
 
-    private DeploymentId getDeploymentIdOrNull(Inspector inspector) {
-        if (inspector.field("applicationId").valid() != inspector.field("zoneId").valid() ) {
-            throw new BadRequestException("Either both application id and zone id should be set, or neither.");
-        }
-        if (inspector.field("applicationId").valid()) {
-            return new DeploymentId(
-                    ApplicationId.fromSerializedForm(inspector.field("applicationId").asString()),
-                    com.yahoo.config.provision.zone.ZoneId.from(inspector.field("zoneId").asString())
-            );
-        }
-        return null;
-    }
-
     private LocalDate untilParameter(String until) {
         if (until == null || until.isEmpty() || until.isBlank())
             return LocalDate.now().plusDays(1);