summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@verizonmedia.com>2020-06-19 10:21:12 +0200
committerGitHub <noreply@github.com>2020-06-19 10:21:12 +0200
commitb70147cbdc3139ae9ea43b8341b79b3e1cbbdd1b (patch)
treee8ec6008b195aabe349006ca22298d607a43a7c1 /controller-api
parent415131f99177117537b4bdead03ff4bbb5651349 (diff)
andreer/verify cameo client in cd (#13600)
* add policy and pathgroup for endpoint certificate request api * remove unused imports * suppress warning for @Beta api
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java4
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java7
2 files changed, 9 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 68dff26529f..2fdf442dbe0 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
@@ -219,8 +219,10 @@ enum PathGroup {
/** Paths used for invoice management */
hostedAccountant(PathPrefix.api,
"/billing/v1/invoice/{*}",
- "/billing/v1/billing");
+ "/billing/v1/billing"),
+ /** Path used for listing endpoint certificate request info */
+ endpointCertificateRequestInfo(PathPrefix.none, "/certificateRequests/");
final List<String> pathSpecs;
final PathPrefix prefix;
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 9a5a0ad0e77..83adba6f59b 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
@@ -166,7 +166,12 @@ enum Policy {
/** Invoice management */
hostedAccountant(Privilege.grant(Action.all())
.on(PathGroup.hostedAccountant)
- .in(SystemName.PublicCd));
+ .in(SystemName.PublicCd)),
+
+ /** Listing endpoint certificate request info */
+ endpointCertificateRequestInfo(Privilege.grant(Action.read)
+ .on(PathGroup.endpointCertificateRequestInfo)
+ .in(SystemName.all()));
private final Set<Privilege> privileges;