diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-04-06 18:41:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 18:41:51 +0200 |
| commit | cf3f7bbb9e99f5b3e6cf3ac3f93e813042e4a12c (patch) | |
| tree | d828e3f692631dc7c1ca9b03e0884e5b131e4f5a /controller-api/src/main/java | |
| parent | 528b436526a40f7e9839d59f19d94051e057c783 (diff) | |
| parent | 5653997012c34912e3f884c40eba99cdd9586751 (diff) | |
Merge pull request #22008 from vespa-engine/revert-22002-andreer/re-request-certificate-api
Revert "handler to re-request endpoint certificates"
Diffstat (limited to 'controller-api/src/main/java')
| -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 | 6 |
2 files changed, 5 insertions, 5 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 98c64a2a11e..cc667175316 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 @@ -228,8 +228,8 @@ enum PathGroup { hostedAccountant("/billing/v1/invoice/{*}", "/billing/v1/billing"), - /** Path used for listing endpoint certificate request and re-requesting endpoint certificates */ - endpointCertificates("/endpointcertificates/"), + /** Path used for listing endpoint certificate request info */ + endpointCertificateRequestInfo("/certificateRequests/"), /** Path used for secret store management */ secretStore(Matcher.tenant, "/application/v4/tenant/{tenant}/secret-store/{*}"), 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 4d342e3b1ee..afecbf9d2e3 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 @@ -197,9 +197,9 @@ enum Policy { .on(PathGroup.hostedAccountant, PathGroup.accountant) .in(SystemName.PublicCd, SystemName.Public)), - /** Listing endpoint certificates and re-requesting certificates */ - endpointCertificateApi(Privilege.grant(Action.all()) - .on(PathGroup.endpointCertificates) + /** Listing endpoint certificate request info */ + endpointCertificateRequestInfo(Privilege.grant(Action.read) + .on(PathGroup.endpointCertificateRequestInfo) .in(SystemName.all())), /** Secret store operations */ |