Move logic to zmsmock

2 files changed, 5 insertions, 9 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzDbMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzDbMock.java
index 976f1f08f1a..02a6efb280b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzDbMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzDbMock.java
@@ -70,14 +70,6 @@ public class AthenzDbMock {
             return this;
         }
 
-        public boolean allows(AthenzIdentity identity, String action, String resource) {
-            return policies.stream()
-                    .anyMatch(policy ->
-                            policy.principalMatches(identity) &&
-                            policy.actionMatches(action) &&
-                            policy.resourceMatches(resource));
-        }
-
         /**
          * Simulates establishing Vespa tenancy in Athens.
          */
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
index 0eda5146fb4..ec5d62569f6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
@@ -127,7 +127,11 @@ public class ZmsClientMock implements ZmsClient {
             return false;
         } else {
             AthenzDbMock.Domain domain = getDomainOrThrow(resource.getDomain(), false);
-            return domain.allows(identity, action, resource.getEntityName());
+            return domain.policies.stream()
+                    .anyMatch(policy ->
+                            policy.principalMatches(identity) &&
+                            policy.actionMatches(action) &&
+                            policy.resourceMatches(resource.getEntityName()));
         }
     }