Skip to content

Commit 664f554

Browse files
committed
Rename SSL configruation method in CassandraContainer
Add test using simple cqlsh command with SSL configuration
1 parent 5027cb9 commit 664f554

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public CassandraContainer withInitScript(String initScriptPath) {
158158
* @param clientKeyFile The client key required to execute CQL scripts.
159159
* @return The updated {@link CassandraContainer}.
160160
*/
161-
public CassandraContainer withSslClientConfig(String clientCertFile, String clientKeyFile) {
161+
public CassandraContainer withSsl(String clientCertFile, String clientKeyFile) {
162162
this.clientCertFile = clientCertFile;
163163
this.clientKeyFile = clientKeyFile;
164164
return self();

modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.datastax.oss.driver.internal.core.context.DefaultDriverContext;
1313
import com.datastax.oss.driver.internal.core.ssl.DefaultSslEngineFactory;
1414
import org.junit.Test;
15+
import org.testcontainers.containers.Container;
1516
import org.testcontainers.containers.ContainerLaunchException;
1617
import org.testcontainers.utility.DockerImageName;
1718

@@ -94,7 +95,7 @@ public void testWithSslClientConfig() {
9495
// with-ssl-config {
9596
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
9697
.withConfigurationOverride("cassandra-ssl-configuration")
97-
.withSslClientConfig("client-ssl/cassandra.cer.pem", "client-ssl/cassandra.key.pem")
98+
.withSsl("client-ssl/cassandra.cer.pem", "client-ssl/cassandra.key.pem")
9899
// }
99100
) {
100101
cassandraContainer.start();
@@ -111,6 +112,27 @@ public void testWithSslClientConfig() {
111112
}
112113
}
113114

115+
@Test
116+
public void testSimpleSslCqlsh() {
117+
try (
118+
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
119+
.withConfigurationOverride("cassandra-ssl-configuration")
120+
.withSsl("client-ssl/cassandra.cer.pem", "client-ssl/cassandra.key.pem")
121+
) {
122+
cassandraContainer.start();
123+
124+
Container.ExecResult execResult = cassandraContainer.execInContainer(
125+
"cqlsh",
126+
"--ssl",
127+
"-e",
128+
"SELECT * FROM system_schema.keyspaces;"
129+
);
130+
assertThat(execResult.getStdout()).contains("keyspace_name");
131+
} catch (Exception e) {
132+
fail(e);
133+
}
134+
}
135+
114136
@Test(expected = ContainerLaunchException.class)
115137
public void testEmptyConfigurationOverride() {
116138
try (

0 commit comments

Comments
 (0)