Only verify tenant admin membership if tenant exist

1 files changed, 6 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
index 7d700914fee..0e703cf4cec 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
@@ -152,12 +152,12 @@ public class ControllerAuthorizationFilter implements SecurityRequestFilter {
     }
 
     private void verifyIsTenantAdmin(AthenzPrincipal principal, TenantId tenantId) {
-        boolean isTenantAdmin = controller.tenants().tenant(tenantId)
-                .map(tenant -> isTenantAdmin(principal.getIdentity(), tenant))
-                .orElse(false);
-        if (!isTenantAdmin) {
-            throw new ForbiddenException("Tenant admin or Vespa operator role required");
-        }
+        controller.tenants().tenant(tenantId)
+                .ifPresent(tenant -> {
+                    if (!isTenantAdmin(principal.getIdentity(), tenant)) {
+                        throw new ForbiddenException("Tenant admin or Vespa operator role required");
+                    }
+                });
     }
 
     private boolean isTenantAdmin(AthenzIdentity identity, Tenant tenant) {