Add simplifed constructor to SiaIdentityProvider

1 files changed, 20 insertions, 5 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java
index 24dcf4ec00a..2b4b267492a 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java
@@ -11,6 +11,7 @@ import com.yahoo.vespa.athenz.tls.SslContextBuilder;
 
 import javax.net.ssl.SSLContext;
 import java.io.File;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.concurrent.ScheduledExecutorService;
@@ -42,11 +43,17 @@ public class SiaIdentityProvider extends AbstractComponent implements AthenzIden
              getPrivateKeyFile(config.keyPathPrefix(), config.athenzDomain(), config.athenzService()),
              getCertificateFile(config.keyPathPrefix(), config.athenzDomain(), config.athenzService()),
              new File(config.trustStorePath()),
-             new ScheduledThreadPoolExecutor(1, runnable -> {
-                 Thread thread = new Thread(runnable);
-                 thread.setName("sia-identity-provider-sslcontext-updater");
-                 return thread;
-             }));
+             createScheduler());
+    }
+
+    public SiaIdentityProvider(AthenzService service,
+                               Path siaPath,
+                               File trustStoreFile) {
+        this(service,
+             getPrivateKeyFile(siaPath.toString(), service.getDomain().getName(), service.getName()),
+             getCertificateFile(siaPath.toString(), service.getDomain().getName(), service.getName()),
+             trustStoreFile,
+             createScheduler());
     }
 
     public SiaIdentityProvider(AthenzService service,
@@ -63,6 +70,14 @@ public class SiaIdentityProvider extends AbstractComponent implements AthenzIden
         scheduler.scheduleAtFixedRate(this::reloadSslContext, REFRESH_INTERVAL.toMinutes(), REFRESH_INTERVAL.toMinutes(), TimeUnit.MINUTES);
     }
 
+    private static ScheduledThreadPoolExecutor createScheduler() {
+        return new ScheduledThreadPoolExecutor(1, runnable -> {
+            Thread thread = new Thread(runnable);
+            thread.setName("sia-identity-provider-sslcontext-updater");
+            return thread;
+        });
+    }
+
     @Override
     public String getDomain() {
         return service.getDomain().getName();