Add smoke tests to verify Cassandra SSL connections

See gh-25602

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java

@@ -117,7 +117,7 @@ public class CassandraAutoConfiguration {
 			ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers, ObjectProvider<SslBundles> sslBundles) {
 		CqlSessionBuilder builder = CqlSession.builder().withConfigLoader(driverConfigLoader);
 		configureAuthentication(builder, connectionDetails);
-		configureSsl(builder, connectionDetails, sslBundles.getIfAvailable());
+		configureSsl(builder, sslBundles.getIfAvailable());
 		builder.withKeyspace(this.properties.getKeyspaceName());
 		builderCustomizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
 		return builder;
@@ -130,11 +130,7 @@ public class CassandraAutoConfiguration {
 		}
 	}
 
-	private void configureSsl(CqlSessionBuilder builder, CassandraConnectionDetails connectionDetails,
+	private void configureSsl(CqlSessionBuilder builder, SslBundles sslBundles) {
-			SslBundles sslBundles) {
-		if (!(connectionDetails instanceof PropertiesCassandraConnectionDetails)) {
-			return;
-		}
 		Ssl properties = this.properties.getSsl();
 		if (properties == null || !properties.isEnabled()) {
 			return;

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+	id "java"
+	id "org.springframework.boot.conventions"
+}
+
+description = "Spring Boot Data Cassandra smoke test"
+
+dependencies {
+	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra"))
+
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
+	testImplementation("org.junit.jupiter:junit-jupiter")
+	testImplementation("org.junit.platform:junit-platform-engine")
+	testImplementation("org.junit.platform:junit-platform-launcher")
+	testImplementation("org.testcontainers:junit-jupiter")
+	testImplementation("org.testcontainers:testcontainers")
+	testImplementation("org.testcontainers:cassandra")
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.data.cassandra;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SampleCassandraApplication {
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleEntity.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.data.cassandra;
+
+import org.springframework.data.cassandra.core.mapping.PrimaryKey;
+import org.springframework.data.cassandra.core.mapping.Table;
+
+@Table
+public class SampleEntity {
+
+	@PrimaryKey
+	private String id;
+
+	private String description;
+
+	public String getId() {
+		return this.id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleRepository.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.data.cassandra;
+
+import org.springframework.data.cassandra.repository.CassandraRepository;
+
+interface SampleRepository extends CassandraRepository<SampleEntity, String> {
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleService.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.data.cassandra;
+
+import org.springframework.data.cassandra.core.CassandraTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SampleService {
+
+	private final CassandraTemplate cassandraTemplate;
+
+	public SampleService(CassandraTemplate cassandraTemplate) {
+		this.cassandraTemplate = cassandraTemplate;
+	}
+
+	public boolean hasRecord(SampleEntity entity) {
+		return this.cassandraTemplate.exists(entity.getId(), SampleEntity.class);
+	}
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.data.cassandra;
+
+import java.util.UUID;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.CqlSessionBuilder;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.cassandra.core.CassandraTemplate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Smoke tests for Cassandra with SSL.
+ *
+ * @author Scott Frederick
+ */
+@Testcontainers(disabledWithoutDocker = true)
+@SpringBootTest(properties = { "spring.cassandra.schema-action=create-if-not-exists",
+		"spring.cassandra.connection.connect-timeout=60s", "spring.cassandra.connection.init-query-timeout=60s",
+		"spring.cassandra.request.timeout=60s", "spring.cassandra.ssl.bundle=client",
+		"spring.ssl.bundle.jks.client.keystore.location=classpath:ssl/test-client.p12",
+		"spring.ssl.bundle.jks.client.keystore.password=password",
+		"spring.ssl.bundle.jks.client.truststore.location=classpath:ssl/test-ca.p12",
+		"spring.ssl.bundle.jks.client.truststore.password=password" })
+class SampleCassandraApplicationSslTests {
+
+	@Container
+	@ServiceConnection
+	static final SecureCassandraContainer secureCassandra = new SecureCassandraContainer();
+
+	@Autowired
+	private CassandraTemplate cassandraTemplate;
+
+	@Autowired
+	private SampleRepository repository;
+
+	@Test
+	void testRepository() {
+		SampleEntity entity = new SampleEntity();
+		entity.setDescription("Look, new @DataCassandraTest!");
+		String id = UUID.randomUUID().toString();
+		entity.setId(id);
+		SampleEntity savedEntity = this.repository.save(entity);
+		SampleEntity getEntity = this.cassandraTemplate.selectOneById(id, SampleEntity.class);
+		assertThat(getEntity).isNotNull();
+		assertThat(getEntity.getId()).isNotNull();
+		assertThat(getEntity.getId()).isEqualTo(savedEntity.getId());
+		this.repository.deleteAll();
+	}
+
+	@TestConfiguration(proxyBeanMethods = false)
+	static class KeyspaceTestConfiguration {
+
+		@Bean
+		CqlSession cqlSession(CqlSessionBuilder cqlSessionBuilder) {
+			try (CqlSession session = cqlSessionBuilder.build()) {
+				session.execute("CREATE KEYSPACE IF NOT EXISTS boot_test"
+						+ "  WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };");
+			}
+			return cqlSessionBuilder.withKeyspace("boot_test").build();
+		}
+
+	}
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SecureCassandraContainer.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.data.cassandra;
+
+import org.testcontainers.utility.MountableFile;
+
+import org.springframework.boot.testsupport.testcontainers.CassandraContainer;
+
+/**
+ * A {@link CassandraContainer} for Cassandra with SSL configuration.
+ *
+ * @author Scott Frederick
+ */
+class SecureCassandraContainer extends CassandraContainer {
+
+	SecureCassandraContainer() {
+		withCopyFileToContainer(MountableFile.forClasspathResource("/ssl/cassandra.yaml"),
+				"/etc/cassandra/cassandra.yaml");
+		withCopyFileToContainer(MountableFile.forClasspathResource("/ssl/test-server.p12"),
+				"/etc/cassandra/server.p12");
+		withCopyFileToContainer(MountableFile.forClasspathResource("/ssl/test-ca.p12"),
+				"/etc/cassandra/truststore.p12");
+	}
+
+}