The default CAs are namespaced and accessed via a relative path (#2906)

The default CAs are namespaced and accessed via a relative path, allowing the keystores library to be shaded
palantir · May 15, 2024 · 2d201fb · 2d201fb
1 parent 503874b
commit 2d201fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/changelog/@unreleased/pr-2906.v2.yml b/changelog/@unreleased/pr-2906.v2.yml
@@ -0,0 +1,6 @@
+type: improvement
+improvement:
+  description: The default CAs are namespaced and accessed via a relative path, allowing
+    the keystores library to be shaded
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2906
diff --git a/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java b/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java
@@ -41,7 +41,7 @@ final class DefaultCas {
     /**
      * This is managed by an excavator.
      */
-    private static final String CA_CERTIFICATES_CRT = "/ca-certificates.crt";
+    private static final String CA_CERTIFICATES_CRT = "ca-certificates.crt";
 
     private static final Supplier<Map<String, X509Certificate>> TRUSTED_CERTIFICATES =
             Suppliers.memoize(DefaultCas::getTrustedCertificates);

diff --git a/...es/src/main/resources/ca-certificates.crt → ...njure/java/config/ssl/ca-certificates.crt b/...es/src/main/resources/ca-certificates.crt → ...njure/java/config/ssl/ca-certificates.crt