diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-01-12 10:24:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 10:24:50 +0100 |
| commit | 2be11319692cbbc5bbc33a5db256ca507ccb61e1 (patch) | |
| tree | b9b5c27c19317283fe4bd5e34f91a26c1ba374b2 /controller-api | |
| parent | fe16ea412fab6a3ac1b3991799bf2e09bac58aa4 (diff) | |
| parent | ac8ada89022cecc27198c9386d7bf1d97bd45502 (diff) | |
Merge pull request #16007 from vespa-engine/ogronnesby/allow-billing-public
Update billing privileges for public
Diffstat (limited to 'controller-api')
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java | 14 | ||||
| -rw-r--r-- | controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java | 4 |
2 files changed, 9 insertions, 9 deletions
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 ff29725fe7c..12bae955c20 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 @@ -145,32 +145,32 @@ enum Policy { /** Read your own instrument information */ paymentInstrumentRead(Privilege.grant(Action.read) .on(PathGroup.billingInstrument) - .in(SystemName.PublicCd)), + .in(SystemName.PublicCd, SystemName.Public)), /** Ability to update tenant payment instrument */ paymentInstrumentUpdate(Privilege.grant(Action.update) .on(PathGroup.billingInstrument) - .in(SystemName.PublicCd)), + .in(SystemName.PublicCd, SystemName.Public)), /** Ability to remove your own payment instrument */ paymentInstrumentDelete(Privilege.grant(Action.delete) .on(PathGroup.billingInstrument) - .in(SystemName.PublicCd)), + .in(SystemName.PublicCd, SystemName.Public)), /** Get the token to view instrument form */ paymentInstrumentCreate(Privilege.grant(Action.read) .on(PathGroup.billingToken) - .in(SystemName.PublicCd)), + .in(SystemName.PublicCd, SystemName.Public)), /** Ability to update tenant payment instrument */ planUpdate(Privilege.grant(Action.update) .on(PathGroup.billingPlan) - .in(SystemName.PublicCd)), + .in(SystemName.PublicCd, SystemName.Public)), /** Ability to update tenant collection method */ collectionMethodUpdate(Privilege.grant(Action.update) .on(PathGroup.billingCollection) - .in(SystemName.PublicCd)), + .in(SystemName.PublicCd, SystemName.Public)), /** Read the generated bills */ @@ -181,7 +181,7 @@ enum Policy { /** Invoice management */ hostedAccountant(Privilege.grant(Action.all()) .on(PathGroup.hostedAccountant) - .in(SystemName.PublicCd)), + .in(SystemName.PublicCd, SystemName.Public)), /** Listing endpoint certificate request info */ endpointCertificateRequestInfo(Privilege.grant(Action.read) diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java index ab72098303f..b5b66b45c22 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java @@ -190,7 +190,7 @@ public class RoleTest { @Test public void billing_test() { - var tester = new EnforcerTester(publicCdEnforcer); + var tester = new EnforcerTester(publicEnforcer); var accountant = Role.hostedAccountant(); var operator = Role.hostedOperator(); @@ -201,7 +201,7 @@ public class RoleTest { tester.on("/billing/v1/tenant/t1/token") .assertAction(accountant) - .assertAction(operator, Action.read) + .assertAction(operator) .assertAction(reader) .assertAction(developer) .assertAction(admin, Action.read) |