Provide path to trust stores from ServiceIdentityProvider

Model distinction between the Athenz and client trust store.
Cleanup constructors and config for SiaIdentityProvider.

1 files changed, 5 insertions, 12 deletions

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 1fe32561f82..b7db502b1d0 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
@@ -2,15 +2,11 @@
 package com.yahoo.vespa.athenz.identity;
 
 import com.yahoo.security.KeyAlgorithm;
-import com.yahoo.security.KeyStoreBuilder;
-import com.yahoo.security.KeyStoreType;
-import com.yahoo.security.KeyStoreUtils;
 import com.yahoo.security.KeyUtils;
 import com.yahoo.security.SignatureAlgorithm;
 import com.yahoo.security.X509CertificateBuilder;
 import com.yahoo.security.X509CertificateUtils;
 import com.yahoo.vespa.athenz.api.AthenzService;
-import com.yahoo.yolean.Exceptions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -21,11 +17,11 @@ import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.file.Files;
 import java.security.KeyPair;
-import java.security.KeyStore;
 import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.time.Instant;
 
+import static com.yahoo.yolean.Exceptions.uncheck;
 import static org.junit.Assert.assertNotNull;
 
 /**
@@ -55,7 +51,7 @@ public class SiaIdentityProviderTest {
                         keyFile.toPath(),
                         certificateFile.toPath(),
                         trustStoreFile.toPath(),
-                        SiaProviderConfig.TrustStoreType.Enum.jks);
+                        trustStoreFile.toPath());
 
         assertNotNull(provider.getIdentitySslContext());
     }
@@ -79,7 +75,7 @@ public class SiaIdentityProviderTest {
                         keyFile.toPath(),
                         certificateFile.toPath(),
                         trustStoreFile.toPath(),
-                        SiaProviderConfig.TrustStoreType.Enum.pem);
+                        trustStoreFile.toPath());
 
         assertNotNull(provider.getIdentitySslContext());
     }
@@ -109,14 +105,11 @@ public class SiaIdentityProviderTest {
 
     private void createPemTrustStoreFile(X509Certificate certificate, File trustStoreFile) {
         var pemEncoded = X509CertificateUtils.toPem(certificate);
-        Exceptions.uncheck(() -> Files.writeString(trustStoreFile.toPath(), pemEncoded));
+        uncheck(() -> Files.writeString(trustStoreFile.toPath(), pemEncoded));
     }
 
     private void createTrustStoreFile(X509Certificate certificate, File trustStoreFile) {
-        KeyStore keystore = KeyStoreBuilder.withType(KeyStoreType.JKS)
-                .withCertificateEntry("dummy-cert", certificate)
-                .build();
-        KeyStoreUtils.writeKeyStoreToFile(keystore, trustStoreFile.toPath());
+        uncheck(() -> Files.writeString(trustStoreFile.toPath(), X509CertificateUtils.toPem(certificate)));
     }
 
 }