diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-07-10 15:28:47 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-07-25 16:38:50 +0200 |
| commit | 50814bf4ce9b984d8ac3fe559541d9dc5f47f0d4 (patch) | |
| tree | 2c214319a5e4aa9ed32591770aefcf5ab9eeff6b /controller-server/src | |
| parent | 3a9d916073fa1f90610fdc219d3214b0fb3b2223 (diff) | |
Handle zms keys in addition to zts keys
Diffstat (limited to 'controller-server/src')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
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<NToken, AthenzPrincipal> validTokens = new HashMap<>(); NTokenValidatorMock() { - super(keyId -> Optional.empty()); + super((AthenzTruststore)null); } public NTokenValidatorMock add(NToken token, AthenzPrincipal principal) { |