From 50814bf4ce9b984d8ac3fe559541d9dc5f47f0d4 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 10 Jul 2018 15:28:47 +0200 Subject: Handle zms keys in addition to zts keys --- .../hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'controller-server/src') diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java index 9fe582b829f..d6481b741dd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java @@ -14,6 +14,7 @@ import com.yahoo.vespa.athenz.api.NToken; import com.yahoo.vespa.athenz.tls.KeyAlgorithm; import com.yahoo.vespa.athenz.tls.KeyUtils; import com.yahoo.vespa.athenz.tls.X509CertificateBuilder; +import com.yahoo.vespa.athenz.utils.ntoken.AthenzTruststore; import com.yahoo.vespa.athenz.utils.ntoken.NTokenValidator; import com.yahoo.vespa.hosted.controller.restapi.ApplicationRequestToDiscFilterRequestWrapper; import org.junit.Before; @@ -176,7 +177,7 @@ public class AthenzPrincipalFilterTest { private final Map validTokens = new HashMap<>(); NTokenValidatorMock() { - super(keyId -> Optional.empty()); + super((AthenzTruststore)null); } public NTokenValidatorMock add(NToken token, AthenzPrincipal principal) { -- cgit v1.2.3