diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-04-19 09:50:08 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-04-19 09:50:08 +0200 |
| commit | a0db2b1020ea53aa356a7547a23d4e1dfaa851c0 (patch) | |
| tree | f026606d2525dbf9e18c612ff64e246dd429af2b /controller-api | |
| parent | 015ade7cd232f217dd964da037ab202731b37cef (diff) | |
Billing API v2 draft - tenat API done, accountant not started
Diffstat (limited to 'controller-api')
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java | 4 | ||||
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java index a0da8cbddba..1387f4a4eaa 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java @@ -77,6 +77,9 @@ enum PathGroup { billingList(Matcher.tenant, "/billing/v1/tenant/{tenant}/billing/{*}"), + billing(Matcher.tenant, + "/billing/v2/tenant/{tenant}/{*}"), + applicationKeys(Matcher.tenant, Matcher.application, "/application/v4/tenant/{tenant}/application/{application}/key/"), @@ -282,6 +285,7 @@ enum PathGroup { PathGroup.billingInstrument, PathGroup.billingList, PathGroup.billingPlan, + PathGroup.billing, PathGroup.hostedAccountant ); } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java index b48e786c178..8bfb10c2e3e 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java @@ -174,7 +174,7 @@ enum Policy { /** Ability to update tenant payment instrument */ planUpdate(Privilege.grant(Action.update) - .on(PathGroup.billingPlan) + .on(PathGroup.billingPlan, PathGroup.billing) .in(SystemName.PublicCd, SystemName.Public)), /** Ability to update tenant collection method */ @@ -185,7 +185,7 @@ enum Policy { /** Read the generated bills */ billingInformationRead(Privilege.grant(Action.read) - .on(PathGroup.billingList) + .on(PathGroup.billingList, PathGroup.billing) .in(SystemName.PublicCd, SystemName.Public)), /** Invoice management */ |