Fix api access tests

2 files changed, 10 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzClientFactoryMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzClientFactoryMock.java
index 54fda58d19c..c4194315922 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzClientFactoryMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzClientFactoryMock.java
@@ -39,7 +39,7 @@ public class AthenzClientFactoryMock extends AbstractComponent implements Athenz
 
     @Override
     public ZtsClient createZtsClient() {
-        return new ZtsClientMock(athenz);
+        return new ZtsClientMock(athenz, createZmsClient());
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java
index b03710ba0b5..3ca0fdd0f23 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java
@@ -10,6 +10,7 @@ import com.yahoo.vespa.athenz.api.AthenzRole;
 import com.yahoo.vespa.athenz.api.AwsRole;
 import com.yahoo.vespa.athenz.api.AwsTemporaryCredentials;
 import com.yahoo.vespa.athenz.api.ZToken;
+import com.yahoo.vespa.athenz.client.zms.ZmsClient;
 import com.yahoo.vespa.athenz.client.zts.Identity;
 import com.yahoo.vespa.athenz.client.zts.InstanceIdentity;
 import com.yahoo.vespa.athenz.client.zts.ZtsClient;
@@ -18,6 +19,7 @@ import java.security.KeyPair;
 import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -28,9 +30,14 @@ public class ZtsClientMock implements ZtsClient {
     private static final Logger log = Logger.getLogger(ZtsClientMock.class.getName());
 
     private final AthenzDbMock athenz;
+    private final Optional<ZmsClient> zmsClient;
 
     public ZtsClientMock(AthenzDbMock athenz) {
+        this(athenz, null);
+    }
+    public ZtsClientMock(AthenzDbMock athenz, ZmsClient zmsClient) {
         this.athenz = athenz;
+        this.zmsClient = Optional.ofNullable(zmsClient);
     }
 
     @Override
@@ -100,7 +107,8 @@ public class ZtsClientMock implements ZtsClient {
 
     @Override
     public boolean hasAccess(AthenzResourceName resource, String action, AthenzIdentity identity) {
-        throw new UnsupportedOperationException();
+        return zmsClient.orElseThrow(UnsupportedOperationException::new)
+                .hasAccess(resource, action, identity);
     }
 
     @Override