From cf8af6d6ce0be3dd565b1f7a14f0648d482b3e42 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 14 May 2020 16:58:07 +0200 Subject: Expose underlying certificate and private key from SiaIdentityProvider Extend ServiceIdentityProvider interface with new methods. Add class that bundles certificate with private key. Use Path instead of File for better compatibility with mocked file system in unit tests. --- .../yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vespa-athenz/src/test/java/com') diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java index ce02860cc78..1fe32561f82 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java @@ -52,9 +52,9 @@ public class SiaIdentityProviderTest { SiaIdentityProvider provider = new SiaIdentityProvider( new AthenzService("domain", "service-name"), - keyFile, - certificateFile, - trustStoreFile, + keyFile.toPath(), + certificateFile.toPath(), + trustStoreFile.toPath(), SiaProviderConfig.TrustStoreType.Enum.jks); assertNotNull(provider.getIdentitySslContext()); @@ -76,9 +76,9 @@ public class SiaIdentityProviderTest { SiaIdentityProvider provider = new SiaIdentityProvider( new AthenzService("domain", "service-name"), - keyFile, - certificateFile, - trustStoreFile, + keyFile.toPath(), + certificateFile.toPath(), + trustStoreFile.toPath(), SiaProviderConfig.TrustStoreType.Enum.pem); assertNotNull(provider.getIdentitySslContext()); -- cgit v1.2.3