Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add smoke tests to verify Couchbase SSL connections

Browse Source 
See gh-34811
This commit is contained in:
Scott Frederick
2023-05-04 17:09:52 -05:00
parent d4107a8185
commit 1143396531
17 changed files with 591 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
View File

@@ -120,8 +120,7 @@ public class CouchbaseAutoConfiguration {
builder.ioConfig((config) -> config.maxHttpConnections(io.getMaxEndpoints())
.numKvConnections(io.getMinEndpoints())
.idleHttpConnectionTimeout(io.getIdleHttpConnectionTimeout()));
if ((connectionDetails instanceof PropertiesCouchbaseConnectionDetails)
&& this.properties.getEnv().getSsl().getEnabled()) {
if (this.properties.getEnv().getSsl().getEnabled()) {
configureSsl(builder, sslBundles);
}
return builder;

2
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java
View File

@@ -32,7 +32,7 @@ public final class DockerImageNames {
private static final String CASSANDRA_VERSION = "3.11.10";
private static final String COUCHBASE_VERSION = "6.5.1";
private static final String COUCHBASE_VERSION = "7.1.4";
private static final String ELASTICSEARCH_VERSION = "7.17.5";