fix: update dynamic property registration and configuration for embedded services

admitrov · admitrov · commit 1ee2c5c18c8e · 2025-11-13T15:55:18.000+01:00
diff --git a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java
@@ -34,7 +34,7 @@ public class SetupEnterpriseAerospikeBootstrapConfiguration {
     private GenericContainer<?> aerospikeContainer;
     private AerospikeProperties aerospikeProperties;
     private AerospikeEnterpriseProperties aerospikeEnterpriseProperties;
-    @Value("embedded.aerospike.dockerImage:")
+    @Value("${embedded.aerospike.dockerImage:}")
     private String dockerImage;
 
     @Autowired
diff --git a/embedded-azurite/src/main/java/com/playtika/testcontainer/azurite/EmbeddedAzuriteBootstrapConfiguration.java b/embedded-azurite/src/main/java/com/playtika/testcontainer/azurite/EmbeddedAzuriteBootstrapConfiguration.java
@@ -41,6 +41,7 @@ ToxiproxyContainer.ContainerProxy azuriteQueueContainerProxy(ToxiproxyContainer
     }
 
     @Bean
+    @ConditionalOnToxiProxyEnabled(module = "azurite")
     public DynamicPropertyRegistrar azuriteBlobToxiProxyDynamicPropertyRegistrar(ToxiproxyContainer.ContainerProxy proxy) {
         return registry -> {
             registry.add("embedded.azurite.toxiproxy.host", proxy::getContainerIpAddress);
diff --git a/embedded-couchbase/src/test/resources/application-test.properties b/embedded-couchbase/src/test/resources/application-test.properties
diff --git a/embedded-elasticsearch/src/test/resources/application-enabled.properties b/embedded-elasticsearch/src/test/resources/application-enabled.properties
@@ -1 +1,3 @@
 spring.elasticsearch.uris=http://${embedded.elasticsearch.host}:${embedded.elasticsearch.httpPort}
+embedded.elasticsearch.indices=test_index
+
diff --git a/embedded-google-pubsub/README.adoc b/embedded-google-pubsub/README.adoc
@@ -58,7 +58,7 @@ embedded.google.pubsub:
 
 ==== Example
 
-To auto-configure `spring-cloud-gcp-starter-pubsub` use these properties in your test `application.yaml`:
+To auto-configure `spring-cloud-gcp-starter-pubsub` use these properties in your test `application-test.yaml`:
 
 ./src/test/resources/application.yaml
 [source,yaml]
diff --git a/embedded-influxdb/README.adoc b/embedded-influxdb/README.adoc
@@ -45,7 +45,7 @@
 ==== Example
 
 There is currently no starter library for using InfluxDB server version 1.x because it uses basic HTTP protocol to communicate.
-You can anyway create your own properties using those values for example in your test `application.yaml`:
+You can anyway create your own properties using those values for example in your test `application-test.yaml`:
 
 ./src/test/resources/application.yaml
 [source,yaml]
diff --git a/embedded-keycloak/README.adoc b/embedded-keycloak/README.adoc
@@ -37,7 +37,7 @@
 * Bean `ToxiproxyContainer.ContainerProxy keycloakContainerProxy`
 
 ==== Example
-To configure for example the `keycloak-spring-boot-starter` use these properties in your test `application.yaml`:
+To configure for example the `keycloak-spring-boot-starter` use these properties in your test `application-test.yaml`:
 
 ./src/test/resources/application.yaml
 [source,yaml]
diff --git a/embedded-keycloak/src/test/resources/application-test.yml b/embedded-keycloak/src/test/resources/application-test.yml
diff --git a/embedded-mailhog/src/main/java/com/playtika/testcontainer/mailhog/EmbeddedMailHogBootstrapConfiguration.java b/embedded-mailhog/src/main/java/com/playtika/testcontainer/mailhog/EmbeddedMailHogBootstrapConfiguration.java
@@ -45,11 +45,16 @@ public ToxiproxyContainer.ContainerProxy mailhogSmtpContainerProxy(ToxiproxyCont
 
     @Bean
     @ConditionalOnToxiProxyEnabled(module = "mailhog")
-    public DynamicPropertyRegistrar mailhogSmtpToxiProxyDynamicPropertyRegistrar(@Qualifier("mailhogSmtpContainerProxy") ToxiproxyContainer.ContainerProxy proxy) {
+    public DynamicPropertyRegistrar mailhogSmtpToxiProxyDynamicPropertyRegistrar(
+        @Qualifier("mailhogSmtpContainerProxy") ToxiproxyContainer.ContainerProxy proxy) {
         return registry -> {
             registry.add("embedded.mailhog.smtp.toxiproxy.host", proxy::getContainerIpAddress);
             registry.add("embedded.mailhog.smtp.toxiproxy.port", proxy::getProxyPort);
             registry.add("embedded.mailhog.smtp.toxiproxy.proxyName", proxy::getName);
+
+            log.info("Started MailHog SMTP ToxiProxy connection details embedded.mailhog.smtp.toxiproxy.host={}, " +
+                     "embedded.mailhog.smtp.toxiproxy.port={}, embedded.mailhog.smtp.toxiproxy.proxyName={}",
+                proxy.getContainerIpAddress(), proxy.getProxyPort(), proxy.getName());
         };
     }
 
@@ -78,6 +83,13 @@ public DynamicPropertyRegistrar mailhogDynamicPropertyRegistrar(@Qualifier(BEAN_
             registry.add("embedded.mailhog.networkAlias", () -> MAILHOG_NETWORK_ALIAS);
             registry.add("embedded.mailhog.internalSmtpPort", properties::getSmtpPort);
             registry.add("embedded.mailhog.internalHttpPort", properties::getHttpPort);
+
+            log.info("Started MailHog. Connection details: embedded.mailhog.host={}, " +
+                     "embedded.mailhog.smtp-port={}, embedded.mailhog.http-port={}, " +
+                     "embedded.mailhog.networkAlias={}, embedded.mailhog.internalSmtpPort={}, " +
+                     "embedded.mailhog.internalHttpPort={}", mailHog.getHost(), smtpMappedPort, httpMappedPort,
+                MAILHOG_NETWORK_ALIAS, properties.getSmtpPort(), properties.getHttpPort());
+
         };
     }
 
diff --git a/embedded-mailhog/src/test/resources/application-test.properties b/embedded-mailhog/src/test/resources/application-test.properties
diff --git a/embedded-mssqlserver/src/main/java/com/playtika/testcontainer/mssqlserver/EmbeddedMSSQLServerBootstrapConfiguration.java b/embedded-mssqlserver/src/main/java/com/playtika/testcontainer/mssqlserver/EmbeddedMSSQLServerBootstrapConfiguration.java
@@ -12,13 +12,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.DynamicPropertyRegistrar;
+import org.springframework.util.StringUtils;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.ToxiproxyContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
 import java.util.Optional;
 
 import static com.playtika.testcontainer.common.utils.ContainerUtils.configureCommonsAndStart;
 import static com.playtika.testcontainer.mssqlserver.MSSQLServerProperties.BEAN_NAME_EMBEDDED_MSSQLSERVER;
+import static org.testcontainers.containers.MSSQLServerContainer.MS_SQL_SERVER_PORT;
 
 @Slf4j
 @Configuration
@@ -28,6 +32,8 @@
 @EnableConfigurationProperties(MSSQLServerProperties.class)
 public class EmbeddedMSSQLServerBootstrapConfiguration {
 
+    private static final String MSSQLSERVER_NETWORK_ALIAS = "mssqlserver.testcontainer.docker";
+
     @Bean
     @ConditionalOnToxiProxyEnabled(module = "mssqlserver")
     public ToxiproxyContainer.ContainerProxy mssqlServerContainerProxy(ToxiproxyContainer toxiproxyContainer,
@@ -39,21 +45,47 @@ public ToxiproxyContainer.ContainerProxy mssqlServerContainerProxy(ToxiproxyCont
     public EmbeddedMSSQLServerContainer mssqlServer(MSSQLServerProperties properties,
                                                     Optional<Network> network) {
         EmbeddedMSSQLServerContainer mssqlServerContainer = new EmbeddedMSSQLServerContainer(ContainerUtils.getDockerImageName(properties))
-                .withNetworkAliases("mssqlserver.testcontainer.docker");
+            .withPassword(properties.getPassword())
+            .withInitScript(properties.getInitScriptPath())
+            .withNetworkAliases(MSSQLSERVER_NETWORK_ALIAS);
+
         network.ifPresent(mssqlServerContainer::withNetwork);
-        configureCommonsAndStart(mssqlServerContainer, properties, log);
+
+        String startupLogCheckRegex = properties.getStartupLogCheckRegex();
+        if (StringUtils.hasLength(startupLogCheckRegex)) {
+            WaitStrategy waitStrategy = new LogMessageWaitStrategy()
+                .withRegEx(startupLogCheckRegex);
+            mssqlServerContainer.waitingFor(waitStrategy);
+        }
+
+        if (properties.isAcceptLicence()) {
+            mssqlServerContainer.acceptLicense();
+        }
+
+        mssqlServerContainer = (EmbeddedMSSQLServerContainer) configureCommonsAndStart(mssqlServerContainer, properties, log);
+
         return mssqlServerContainer;
     }
 
     @Bean
     public DynamicPropertyRegistrar mssqlServerDynamicPropertyRegistrar(
-            @Qualifier(BEAN_NAME_EMBEDDED_MSSQLSERVER) EmbeddedMSSQLServerContainer mssqlServer,
+            @Qualifier(BEAN_NAME_EMBEDDED_MSSQLSERVER) EmbeddedMSSQLServerContainer mssqlServerContainer,
             MSSQLServerProperties properties) {
         return registry -> {
-            registry.add("embedded.mssqlserver.host", mssqlServer::getHost);
-            registry.add("embedded.mssqlserver.port", () -> mssqlServer.getMappedPort(1433));
-            registry.add("embedded.mssqlserver.networkAlias", () -> "mssqlserver.testcontainer.docker");
-            registry.add("embedded.mssqlserver.internalPort", () -> 1433);
+            Integer mappedPort = mssqlServerContainer.getMappedPort(MS_SQL_SERVER_PORT);
+            String host = mssqlServerContainer.getHost();
+
+            registry.add("embedded.mssqlserver.port", () -> mappedPort);
+            registry.add("embedded.mssqlserver.host", () -> host);
+            registry.add("embedded.mssqlserver.database", () -> "master");
+            registry.add("embedded.mssqlserver.user", () -> "sa");
+            registry.add("embedded.mssqlserver.password", properties::getPassword);
+            registry.add("embedded.mssqlserver.networkAlias", () -> MSSQLSERVER_NETWORK_ALIAS);
+            registry.add("embedded.mssqlserver.internalPort", () -> MS_SQL_SERVER_PORT);
+
+            log.info("""
+                Started mssql server. Connection details: embedded.mssqlserver.user=sa, embedded.mssqlserver.password={}, embedded.mssqlserver.database = master,
+                JDBC connection url: jdbc:sqlserver://{}:{};databaseName={};trustServerCertificate=true""", properties.getPassword(), host, mappedPort, "master");
         };
     }
 
diff --git a/embedded-mssqlserver/src/test/java/com/playtika/testcontainer/mssqlserver/EmbeddedMSSQLServerDependenciesAutoConfigurationTest.java b/embedded-mssqlserver/src/test/java/com/playtika/testcontainer/mssqlserver/EmbeddedMSSQLServerDependenciesAutoConfigurationTest.java
@@ -15,7 +15,10 @@
 @SpringBootTest(
         classes = EmbeddedMSSQLServerDependenciesAutoConfigurationTest.TestConfiguration.class,
         properties = {
-                "embedded.mssqlserver.enabled=true"
+                "embedded.mssqlserver.enabled=true",
+                "embedded.mssqlserver.password=Foobar1234!",
+                "embedded.mssqlserver.accept-licence=true",
+                "embedded.mssqlserver.init-script-path=initScript.sql"
         }
 )
 class EmbeddedMSSQLServerDependenciesAutoConfigurationTest {
@@ -46,4 +49,4 @@ void testCreateDb() {
     static class TestConfiguration {
     }
 
-}
+}
diff --git a/embedded-mssqlserver/src/test/resources/application-test.properties b/embedded-mssqlserver/src/test/resources/application-test.properties
diff --git a/embedded-vault/README.adoc b/embedded-vault/README.adoc
@@ -41,7 +41,7 @@
 
 ==== Example
 
-To auto-configure `spring-cloud-vault-config` use these properties in your test `application.yaml`:
+To auto-configure `spring-cloud-vault-config` use these properties in your test `application-test.yaml`:
 
 ./src/test/resources/application.yaml
 [source,yaml]
diff --git a/embedded-vault/src/test/resources/application-test.properties b/embedded-vault/src/test/resources/application-test.properties
diff --git a/embedded-wiremock/src/main/java/com/playtika/testcontainers/wiremock/EmbeddedWiremockBootstrapConfiguration.java b/embedded-wiremock/src/main/java/com/playtika/testcontainers/wiremock/EmbeddedWiremockBootstrapConfiguration.java
@@ -36,12 +36,15 @@ public class EmbeddedWiremockBootstrapConfiguration {
 
     @Bean(name = BEAN_NAME_EMBEDDED_WIREMOCK, destroyMethod = "stop")
     public GenericContainer<?> wiremock(WiremockProperties properties, Optional<Network> network) {
-        GenericContainer<?> container = new GenericContainer<>(ContainerUtils.getDockerImageName(properties))
+        GenericContainer<?> wiremock =
+            new GenericContainer<>(ContainerUtils.getDockerImageName(properties))
+                .waitingFor(DEFAULT_WAITER)
+                .withCommand("--port " + properties.getPort())
                 .withExposedPorts(properties.getPort())
                 .withNetworkAliases(WIREMOCK_NETWORK_ALIAS);
-        network.ifPresent(container::withNetwork);
-        configureCommonsAndStart(container, properties, log);
-        return container;
+        network.ifPresent(wiremock::withNetwork);
+        configureCommonsAndStart(wiremock, properties, log);
+        return wiremock;
     }
 
     @Bean
@@ -53,6 +56,10 @@ public DynamicPropertyRegistrar wiremockDynamicPropertyRegistrar(
             registry.add("embedded.wiremock.port", () -> container.getMappedPort(properties.getPort()));
             registry.add("embedded.wiremock.networkAlias", () -> WIREMOCK_NETWORK_ALIAS);
             registry.add("embedded.wiremock.internalPort", properties::getPort);
+
+            log.info("Started wiremock. Connection Details: embedded.wiremock.host={}, embedded.wiremock.port={}," +
+                     "embedded.wiremock.networkAlias={}, embedded.wiremock.internalPort={}",
+                container.getHost(), container.getMappedPort(properties.getPort()), WIREMOCK_NETWORK_ALIAS, properties.getPort());
         };
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ ToxiproxyContainer.ContainerProxy azuriteQueueContainerProxy(ToxiproxyContainer`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Bean`
	`44`	`+ @ConditionalOnToxiProxyEnabled(module = "azurite")`
`44`	`45`	`public DynamicPropertyRegistrar azuriteBlobToxiProxyDynamicPropertyRegistrar(ToxiproxyContainer.ContainerProxy proxy) {`
`45`	`46`	`return registry -> {`
`46`	`47`	`registry.add("embedded.azurite.toxiproxy.host", proxy::getContainerIpAddress);`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`spring.elasticsearch.uris=http://${embedded.elasticsearch.host}:${embedded.elasticsearch.httpPort}`
	`2`	`+embedded.elasticsearch.indices=test_index`
	`3`	`+`