Merge pull request #24397 from vespa-engine/hakonhall/use-yahoo-cert-bundle-trust-store-when-uploading-to-panic-in-gcp

SIA identity SSLContext with custom trust store

1 files changed, 4 insertions, 0 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 a032b23bfb3..0415bca1670 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
@@ -70,6 +70,10 @@ public class SiaIdentityProvider extends AbstractComponent implements ServiceIde
     @Override public Path certificatePath() { return certificateFile; }
     @Override public Path privateKeyPath() { return privateKeyFile; }
 
+    public SSLContext createIdentitySslContextWithTrustStore(Path trustStoreFile) {
+        return createIdentitySslContext(keyManager, trustStoreFile);
+    }
+
     private static SSLContext createIdentitySslContext(AutoReloadingX509KeyManager keyManager, Path trustStoreFile) {
         return new SslContextBuilder()
                 .withTrustStore(trustStoreFile)