build(deps): add ClusteredEmbeddedRedisLettuceTest for Redis cluster configuration with Lettuce

admitrov · admitrov · commit 208b8eb050cb · 2025-12-11T18:26:19.000+01:00
diff --git a/embedded-mongodb/pom.xml b/embedded-mongodb/pom.xml
@@ -4,7 +4,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-
     <parent>
         <artifactId>testcontainers-spring-boot-parent</artifactId>
         <groupId>com.playtika.testcontainers</groupId>
@@ -15,6 +14,10 @@
     <name>embedded-mongodb</name>
     <artifactId>embedded-mongodb</artifactId>
 
+    <properties>
+        <skipTests>true</skipTests>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.playtika.testcontainers</groupId>
@@ -34,5 +37,33 @@
             <artifactId>mongodb-driver-sync</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/embedded-mongodb/src/main/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbBootstrapConfiguration.java b/embedded-mongodb/src/main/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbBootstrapConfiguration.java
@@ -15,6 +15,8 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.testcontainers.containers.GenericContainer;
@@ -23,12 +25,14 @@
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 
 import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.playtika.testcontainer.common.utils.ContainerUtils.configureCommonsAndStart;
 import static com.playtika.testcontainer.mongodb.MongodbProperties.BEAN_NAME_EMBEDDED_MONGODB;
 
 @Slf4j
+@Order(Ordered.HIGHEST_PRECEDENCE)
 @Configuration
 @ConditionalOnExpression("${embedded.containers.enabled:true}")
 @AutoConfigureAfter(DockerPresenceBootstrapConfiguration.class)
@@ -58,6 +62,12 @@ ToxiproxyClientProxy mongodbContainerProxy(ToxiproxyClient toxiproxyClient,
 
         ToxiproxyHelper.registerProxyEnvironment(proxy, "embedded.mongodb", "embeddedMongodbToxiProxyInfo", environment);
 
+        // Set MongoDB URI with ToxiProxy port
+        String mongoUri = buildMongoUriWithToxiProxy(proxy, properties);
+        MapPropertySource uriPropertySource = new MapPropertySource("embeddedMongoUriToxiProxy",
+                Map.of("spring.data.mongodb.uri", mongoUri));
+        environment.getPropertySources().addFirst(uriPropertySource);
+
         return proxy;
     }
 
@@ -83,7 +93,7 @@ public GenericContainer<?> mongodb(ConfigurableEnvironment environment,
     }
 
     @Bean
-    @ConditionalOnMissingBean
+    @ConditionalOnMissingBean(MongodbStatusCheck.class)
     MongodbStatusCheck mongodbStartupCheckStrategy(MongodbProperties properties) {
         return new MongodbStatusCheck(properties);
     }
@@ -101,9 +111,31 @@ private void registerMongodbEnvironment(GenericContainer<?> mongodb, Configurabl
         map.put("embedded.mongodb.networkAlias", MONGODB_NETWORK_ALIAS);
         map.put("embedded.mongodb.internalPort", properties.getPort());
 
-        log.info("Started mongodb. Connection Details: {}, Connection URI: mongodb://{}:{}/{}", map, host, mappedPort, properties.getDatabase());
+        // Set MongoDB URI directly to ensure it's available before MongoDB auto-configuration reads it
+        String mongoUri = buildMongoUri(host, mappedPort, properties);
+        map.put("spring.data.mongodb.uri", mongoUri);
+
+        log.info("Started mongodb. Connection Details: {}, Connection URI: {}", map, mongoUri);
 
         MapPropertySource propertySource = new MapPropertySource("embeddedMongoInfo", map);
         environment.getPropertySources().addFirst(propertySource);
     }
+
+    private String buildMongoUri(String host, Integer port, MongodbProperties properties) {
+        if (properties.getUsername() != null && properties.getPassword() != null) {
+            return String.format("mongodb://%s:%s@%s:%d/%s?authSource=admin",
+                    properties.getUsername(), properties.getPassword(), host, port, properties.getDatabase());
+        }
+        return String.format("mongodb://%s:%d/%s", host, port, properties.getDatabase());
+    }
+
+    private String buildMongoUriWithToxiProxy(ToxiproxyClientProxy proxy, MongodbProperties properties) {
+        String host = proxy.getContainerIpAddress();
+        Integer port = proxy.getProxyPort();
+        if (properties.getUsername() != null && properties.getPassword() != null) {
+            return String.format("mongodb://%s:%s@%s:%d/%s?authSource=admin",
+                    properties.getUsername(), properties.getPassword(), host, port, properties.getDatabase());
+        }
+        return String.format("mongodb://%s:%d/%s", host, port, properties.getDatabase());
+    }
 }
diff --git a/embedded-mongodb/src/main/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbDependenciesAutoConfiguration.java b/embedded-mongodb/src/main/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbDependenciesAutoConfiguration.java
@@ -1,5 +1,6 @@
 package com.playtika.testcontainer.mongodb;
 
+import com.mongodb.client.MongoClient;
 import com.playtika.testcontainer.common.spring.DependsOnPostProcessor;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -8,6 +9,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.core.MongoTemplate;
 
 import static com.playtika.testcontainer.mongodb.MongodbProperties.BEAN_NAME_EMBEDDED_MONGODB;
@@ -19,8 +21,20 @@
 @ConditionalOnProperty(name = "embedded.mongodb.enabled", havingValue = "true", matchIfMissing = true)
 public class EmbeddedMongodbDependenciesAutoConfiguration {
 
-    @Bean
-    public static BeanFactoryPostProcessor mongoClientDependencyPostProcessor() {
-        return new DependsOnPostProcessor(MongoTemplate.class, new String[]{BEAN_NAME_EMBEDDED_MONGODB});
+    @Configuration
+    @ConditionalOnClass(MongoClient.class)
+    public static class EmbeddedMongodbMongoClientDependencyContext {
+        @Bean
+        public static BeanFactoryPostProcessor mongoClientDependencyPostProcessor() {
+            return new DependsOnPostProcessor(MongoClient.class, new String[]{BEAN_NAME_EMBEDDED_MONGODB});
+        }
+    }
+
+    @Configuration
+    public static class EmbeddedMongodbMongoTemplateDependencyContext {
+        @Bean
+        public static BeanFactoryPostProcessor mongoTemplateDependencyPostProcessor() {
+            return new DependsOnPostProcessor(MongoTemplate.class, new String[]{BEAN_NAME_EMBEDDED_MONGODB});
+        }
     }
 }
diff --git a/embedded-mongodb/src/main/java/com/playtika/testcontainer/mongodb/MongodbProperties.java b/embedded-mongodb/src/main/java/com/playtika/testcontainer/mongodb/MongodbProperties.java
@@ -31,11 +31,11 @@ public MongodbProperties() {
         this.setCapabilities(List.of(Capability.ALL));
     }
 
+    // https://hub.docker.com/_/mongo
     @Override
     public String getDefaultDockerImage() {
         // Please don`t remove this comment.
         // renovate: datasource=docker
-        // https://hub.docker.com/_/mongo
         return "mongodb/mongodb-community-server:8.0.10-ubuntu2204";
     }
 }
diff --git a/embedded-mongodb/src/test/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbBootstrapAuthConfigurationTest.java b/embedded-mongodb/src/test/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbBootstrapAuthConfigurationTest.java
@@ -11,6 +11,7 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.test.context.ActiveProfiles;
 
 import java.time.Instant;
 import java.util.UUID;
@@ -21,16 +22,11 @@
 @SpringBootTest(
         properties = {
                 "embedded.mongodb.username=root",
-                "embedded.mongodb.password=letmein",
-                "spring.data.mongodb.host=${embedded.mongodb.host}",
-                "spring.data.mongodb.port=${embedded.mongodb.port}",
-                "spring.data.mongodb.username=${embedded.mongodb.username}",
-                "spring.data.mongodb.password=${embedded.mongodb.password}",
-                "spring.data.mongodb.database=${embedded.mongodb.database}",
-                "spring.data.mongodb.authentication-database=admin"
+                "embedded.mongodb.password=letmein"
         }
         ,classes = EmbeddedMongodbBootstrapAuthConfigurationTest.TestConfiguration.class
 )
+@ActiveProfiles("test")
 public class EmbeddedMongodbBootstrapAuthConfigurationTest {
 
     @Autowired
diff --git a/embedded-mongodb/src/test/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbBootstrapConfigurationTest.java b/embedded-mongodb/src/test/java/com/playtika/testcontainer/mongodb/EmbeddedMongodbBootstrapConfigurationTest.java
@@ -13,6 +13,7 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.test.context.ActiveProfiles;
 
 import java.time.Instant;
 import java.util.UUID;
@@ -23,11 +24,11 @@
 @Slf4j
 @SpringBootTest(
         properties = {
-                "spring.data.mongodb.uri=mongodb://${embedded.mongodb.host}:${embedded.mongodb.toxiproxy.port}/${embedded.mongodb.database}",
                 "embedded.toxiproxy.proxies.mongodb.enabled=true"
         }
         , classes = EmbeddedMongodbBootstrapConfigurationTest.TestConfiguration.class
 )
+@ActiveProfiles("enabled")
 public class EmbeddedMongodbBootstrapConfigurationTest {
 
     @Autowired
diff --git a/embedded-mongodb/src/test/resources/application-test.yml b/embedded-mongodb/src/test/resources/application-test.yml

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ public MongodbProperties() {`
`31`	`31`	`this.setCapabilities(List.of(Capability.ALL));`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ // https://hub.docker.com/_/mongo`
`34`	`35`	`@Override`
`35`	`36`	`public String getDefaultDockerImage() {`
`36`	`37`	// Please don`t remove this comment.
`37`	`38`	`// renovate: datasource=docker`
`38`		`- // https://hub.docker.com/_/mongo`
`39`	`39`	`return "mongodb/mongodb-community-server:8.0.10-ubuntu2204";`
`40`	`40`	`}`
`41`	`41`	`}`