add additional withSsl(certificate, keyfile)

Author: mkorolyov

modules/scylladb/src/main/java/org/testcontainers/scylladb/ScyllaDBContainer.java

@@ -75,9 +75,13 @@ public ScyllaDBContainer withConfigurationOverride(String configLocation) {
     }
 
     public ScyllaDBContainer withSsl(MountableFile certificate, MountableFile keyfile, MountableFile truststore) {
+        return withSsl(certificate, keyfile)
+            .withCopyFileToContainer(truststore, "/etc/scylla/scylla.truststore");
+    }
+
+    public ScyllaDBContainer withSsl(MountableFile certificate, MountableFile keyfile) {
         return withCopyFileToContainer(certificate, "/etc/scylla/scylla.cer.pem")
             .withCopyFileToContainer(keyfile, "/etc/scylla/scylla.key.pem")
-            .withCopyFileToContainer(truststore, "/etc/scylla/scylla.truststore")
             .withEnv("SSL_CERTFILE", "/etc/scylla/scylla.cer.pem");
     }
 

modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java

@@ -72,12 +72,12 @@ public void testSimpleSsl()
         ) {
             // sslContext {
             ScyllaDBContainer sslScylladb = scylladb.withSsl(
-                MountableFile.forClasspathResource("scylla-test-ssl/keys/scylla.cer.pem"),
-                MountableFile.forClasspathResource("scylla-test-ssl/keys/scylla.key.pem"),
-                MountableFile.forClasspathResource("scylla-test-ssl/keys/scylla.truststore")
+                MountableFile.forClasspathResource("keys/scylla.cer.pem"),
+                MountableFile.forClasspathResource("keys/scylla.key.pem"),
+                MountableFile.forClasspathResource("keys/scylla.truststore")
             );
 
-            String testResourcesDir = getClass().getClassLoader().getResource("scylla-test-ssl/keys/").getPath();
+            String testResourcesDir = getClass().getClassLoader().getResource("keys/").getPath();
 
             KeyStore keyStore = KeyStore.getInstance("PKCS12");
             keyStore.load(Files.newInputStream(Paths.get(testResourcesDir + "scylla.keystore")), "scylla".toCharArray());
@@ -125,9 +125,9 @@ public void testSimpleSslCqlsh() throws IllegalStateException, InterruptedExcept
             ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)
                 .withConfigurationOverride("scylla-test-ssl")
                 .withSsl(
-                    MountableFile.forClasspathResource("scylla-test-ssl/keys/scylla.cer.pem"),
-                    MountableFile.forClasspathResource("scylla-test-ssl/keys/scylla.key.pem"),
-                    MountableFile.forClasspathResource("scylla-test-ssl/keys/scylla.truststore")
+                    MountableFile.forClasspathResource("keys/scylla.cer.pem"),
+                    MountableFile.forClasspathResource("keys/scylla.key.pem"),
+                    MountableFile.forClasspathResource("keys/scylla.truststore")
                 )) {
             scylladb.start();