diff options
author | Øyvind Grønnesby <oyving@vespa.ai> | 2023-10-31 11:22:43 +0100 |
---|---|---|
committer | Øyvind Grønnesby <oyving@vespa.ai> | 2023-10-31 11:22:43 +0100 |
commit | 2f558270cc3bb6ebe2567c2e5c5a9ccb5057c032 (patch) | |
tree | 91c110d06d41d111cdee3dbf2ad773b0216151a2 | |
parent | b91b4a2c22bf3638c8dbf71edc59562f7426571a (diff) |
Fix bill ID in API output
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java index eacc156f3e0..d26bf93334f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java @@ -597,7 +597,7 @@ public class BillingApiHandlerV2 extends RestApiRequestHandler<BillingApiHandler } private void toSlime(Cursor slime, Bill bill, Map<Bill.ItemKey, Bill.ItemSummary> summaries) { - slime.setString("id", bill.id().toString()); + slime.setString("id", bill.id().value()); var summaryCursor = slime.setArray("summary"); summaries.forEach((key, summary) -> { toSlime(summaryCursor.addObject(), key, summary); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java index f09588bdf19..1db0e248b76 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java @@ -263,7 +263,7 @@ public class BillingApiHandlerV2Test extends ControllerContainerCloudTest { var req = request("/billing/v2/accountant/bill/id-1/summary?keys=plan,architecture") .roles(Role.hostedAccountant()); tester.assertResponse(req, """ - {"id":"BillId{value='id-1'}","summary":[{"key":{"plan":"paid","architecture":null},"summary":{"cpu":{"cost":"0","hours":"0"},"memory":{"cost":"0","hours":"0"},"disk":{"cost":"0","hours":"0"},"gpu":{"cost":"0","hours":"0"}}}]}"""); + {"id":"id-1","summary":[{"key":{"plan":"paid","architecture":null},"summary":{"cpu":{"cost":"0","hours":"0"},"memory":{"cost":"0","hours":"0"},"disk":{"cost":"0","hours":"0"},"gpu":{"cost":"0","hours":"0"}}}]}"""); } private static Bill createBill() { |