Skip to content

Commit 6ab9c7e

Browse files
eddumelendezeddumelendez
committed
Polish
1 parent 3b95f64 commit 6ab9c7e

File tree

4 files changed

+35
-38
lines changed

4 files changed

+35
-38
lines changed

‎docs/modules/databases/scylladb.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ You can start a ScyllaDB container instance from any Java application by using:
2424
[Using SSL](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:sslContext
2525
<!--/codeinclude-->
2626

27-
<!--codeinclude-->
28-
[Using SSL with cqlsh](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:sslCqlsh
29-
<!--/codeinclude-->
30-
3127
<!--codeinclude-->
3228
[Using Shard Awareness port](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:shardAwarenessSession
3329
<!--/codeinclude-->

‎modules/scylladb/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
description = "Testcontainers :: ScyllaDB"
22

33
dependencies {
4-
api project(":database-commons")
5-
api "com.scylladb:java-driver-core:4.15.0.0"
4+
api project(":testcontainers")
65

6+
testImplementation 'com.scylladb:java-driver-core:4.15.0.0'
77
testImplementation 'org.assertj:assertj-core:3.24.2'
88
testImplementation 'software.amazon.awssdk:dynamodb:2.28.6'
99
}

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,11 @@ public ScyllaDBContainer withConfigurationOverride(String configLocation) {
7575
}
7676

7777
public ScyllaDBContainer withSsl(MountableFile certificate, MountableFile keyfile, MountableFile truststore) {
78-
return withSsl(certificate, keyfile)
79-
.withCopyFileToContainer(truststore, "/etc/scylla/scylla.truststore");
80-
}
81-
82-
public ScyllaDBContainer withSsl(MountableFile certificate, MountableFile keyfile) {
83-
return withCopyFileToContainer(certificate, "/etc/scylla/scylla.cer.pem")
84-
.withCopyFileToContainer(keyfile, "/etc/scylla/scylla.key.pem")
85-
.withEnv("SSL_CERTFILE", "/etc/scylla/scylla.cer.pem");
78+
withCopyFileToContainer(certificate, "/etc/scylla/scylla.cer.pem");
79+
withCopyFileToContainer(keyfile, "/etc/scylla/scylla.key.pem");
80+
withCopyFileToContainer(truststore, "/etc/scylla/scylla.truststore");
81+
withEnv("SSL_CERTFILE", "/etc/scylla/scylla.cer.pem");
82+
return this;
8683
}
8784

8885
public ScyllaDBContainer withAlternator() {

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

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
import software.amazon.awssdk.services.dynamodb.model.KeyType;
1818
import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
1919

20-
import javax.net.ssl.KeyManagerFactory;
21-
import javax.net.ssl.SSLContext;
22-
import javax.net.ssl.TrustManagerFactory;
2320
import java.io.IOException;
2421
import java.net.URI;
2522
import java.nio.file.Files;
@@ -31,6 +28,10 @@
3128
import java.security.UnrecoverableKeyException;
3229
import java.security.cert.CertificateException;
3330

31+
import javax.net.ssl.KeyManagerFactory;
32+
import javax.net.ssl.SSLContext;
33+
import javax.net.ssl.TrustManagerFactory;
34+
3435
import static org.assertj.core.api.Assertions.assertThat;
3536
import static org.assertj.core.api.Assertions.assertThatThrownBy;
3637

@@ -43,8 +44,8 @@ public class ScyllaDBContainerTest {
4344
@Test
4445
public void testSimple() {
4546
try ( // container {
46-
ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)
47-
// }
47+
ScyllaDBContainer scylladb = new ScyllaDBContainer("scylladb/scylla:6.2")
48+
// }
4849
) {
4950
scylladb.start();
5051
// session {
@@ -66,21 +67,23 @@ public void testSimpleSsl()
6667
throws NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException, UnrecoverableKeyException, KeyManagementException {
6768
try (
6869
// customConfiguration {
69-
ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)
70+
ScyllaDBContainer scylladb = new ScyllaDBContainer("scylladb/scylla:6.2")
7071
.withConfigurationOverride("scylla-test-ssl")
72+
.withSsl(
73+
MountableFile.forClasspathResource("keys/scylla.cer.pem"),
74+
MountableFile.forClasspathResource("keys/scylla.key.pem"),
75+
MountableFile.forClasspathResource("keys/scylla.truststore")
76+
)
7177
// }
7278
) {
7379
// sslContext {
74-
ScyllaDBContainer sslScylladb = scylladb.withSsl(
75-
MountableFile.forClasspathResource("keys/scylla.cer.pem"),
76-
MountableFile.forClasspathResource("keys/scylla.key.pem"),
77-
MountableFile.forClasspathResource("keys/scylla.truststore")
78-
);
79-
8080
String testResourcesDir = getClass().getClassLoader().getResource("keys/").getPath();
8181

8282
KeyStore keyStore = KeyStore.getInstance("PKCS12");
83-
keyStore.load(Files.newInputStream(Paths.get(testResourcesDir + "scylla.keystore")), "scylla".toCharArray());
83+
keyStore.load(
84+
Files.newInputStream(Paths.get(testResourcesDir + "scylla.keystore")),
85+
"scylla".toCharArray()
86+
);
8487

8588
KeyStore trustStore = KeyStore.getInstance("PKCS12");
8689
trustStore.load(
@@ -102,11 +105,11 @@ public void testSimpleSsl()
102105
sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
103106
// }
104107

105-
sslScylladb.start();
108+
scylladb.start();
106109

107110
CqlSession session = CqlSession
108111
.builder()
109-
.addContactPoint(sslScylladb.getContactPoint())
112+
.addContactPoint(scylladb.getContactPoint())
110113
.withLocalDatacenter("datacenter1")
111114
.withSslContext(sslContext)
112115
.build();
@@ -119,22 +122,24 @@ public void testSimpleSsl()
119122

120123
@Test
121124
public void testSimpleSslCqlsh() throws IllegalStateException, InterruptedException, IOException {
122-
// sslConfiguration {
123-
// }
124125
try (
125126
ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)
126127
.withConfigurationOverride("scylla-test-ssl")
127128
.withSsl(
128129
MountableFile.forClasspathResource("keys/scylla.cer.pem"),
129130
MountableFile.forClasspathResource("keys/scylla.key.pem"),
130131
MountableFile.forClasspathResource("keys/scylla.truststore")
131-
)) {
132+
)
133+
) {
132134
scylladb.start();
133135

134-
// sslCqlsh {
135-
Container.ExecResult execResult = scylladb.execInContainer("cqlsh", "--ssl", "-e", "select * from system_schema.keyspaces;");
136+
Container.ExecResult execResult = scylladb.execInContainer(
137+
"cqlsh",
138+
"--ssl",
139+
"-e",
140+
"select * from system_schema.keyspaces;"
141+
);
136142
assertThat(execResult.getStdout()).contains("keyspace_name");
137-
// }
138143
}
139144
}
140145

@@ -158,8 +163,8 @@ public void testShardAwareness() {
158163
@Test
159164
public void testAlternator() {
160165
try ( // alternator {
161-
ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE).withAlternator()
162-
// }
166+
ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE).withAlternator()
167+
// }
163168
) {
164169
scylladb.start();
165170

@@ -195,5 +200,4 @@ public void throwExceptionWhenAlternatorDisabled() {
195200
.hasMessageContaining("Alternator is not enabled");
196201
}
197202
}
198-
199203
}

0 commit comments

Comments
 (0)