summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-06-21 11:07:15 +0200
committerGitHub <noreply@github.com>2021-06-21 11:07:15 +0200
commitd8c78f91e7cc31359c6b8c83fd3abbbf12990b07 (patch)
tree48c635e77a116a43f046e4248f04b2ef266aa603 /controller-server
parent0d2fce67974e3be98aee66dbd86e12b83ff8843e (diff)
parent95e723b7ea1ad74fa799bec42300e3aaa072ca0c (diff)
Merge pull request #18331 from vespa-engine/mortent/access-request-improvements
Add optional reason to membership request
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
index 073451f6309..cb3e5ea97c1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
@@ -215,7 +215,7 @@ public class AthenzFacade implements AccessControl {
}
public void addTenantAdmin(AthenzDomain tenantDomain, AthenzUser user) {
- zmsClient.addRoleMember(new AthenzRole(tenantDomain, "tenancy." + service.getFullName() + ".admin"), user);
+ zmsClient.addRoleMember(new AthenzRole(tenantDomain, "tenancy." + service.getFullName() + ".admin"), user, Optional.empty());
}
private void deleteApplication(AthenzDomain domain, ApplicationName application, OktaIdentityToken identityToken, OktaAccessToken accessToken) {