Add PlanResult, wrapping optional error message

1 files changed, 6 insertions, 3 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 e4a0e2af6b3..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,9 +139,12 @@ public class BillingApiHandler extends LoggingRequestHandler {
         var planId = PlanId.from(slime.field("plan").asString());
         var hasApplications = applicationController.asList(tenantName).size() > 0;
 
-        return billingController.setPlan(tenantName, planId, hasApplications)
-                .<HttpResponse>map(ErrorResponse::forbidden)
-                .orElse(new StringResponse("Plan: " + planId.value()));
+        var result = billingController.setPlan(tenantName, planId, hasApplications);
+
+        if (result.isSuccess())
+            return new StringResponse("Plan: " + planId.value());
+
+        return ErrorResponse.forbidden(result.getErrorMessage().orElse("Invalid plan change"));
     }
 
     private HttpResponse getBillingAllTenants(String until) {