From b9865d1674ec2fb42360e0d9052f9890e8938cd6 Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Fri, 10 Jan 2020 15:38:46 +0100 Subject: Move logic to zmsmock --- .../hosted/controller/api/integration/athenz/AthenzDbMock.java | 8 -------- .../hosted/controller/api/integration/athenz/ZmsClientMock.java | 6 +++++- 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())); } } -- cgit v1.2.3