From 11e20edb593e301244348b60ba03fc420bc0f8aa Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 6 Jul 2022 20:47:54 +1200
Subject: [PATCH] #2741 - Bump avaje-config to 2.1 and modify ebean-test to
 support use of ${docker.host} in test container jdbc urls

---
 ebean-api/pom.xml                                        | 2 +-
 .../io/ebean/test/config/AutoConfigureForTesting.java    | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index fc1ccc676..436d95abc 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
     </dependency>
 
     <!--
diff --git a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
index c751732cf..fbe48318d 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
@@ -5,6 +5,7 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.test.config.platform.PlatformAutoConfig;
 import io.ebean.test.config.provider.ProviderAutoConfig;
+import io.ebean.test.containers.DockerHost;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,11 +30,17 @@ public class AutoConfigureForTesting implements AutoConfigure {
 
   @Override
   public void preConfigure(DatabaseConfig config) {
+    Properties properties = config.getProperties();
+    if (properties != null) {
+      // trigger determination of docker.host system property if not already done
+      // and re-evaluate properties in case there is use of ${docker.host} in jdbc url etc
+      DockerHost.host();
+      io.avaje.config.Config.asConfiguration().evalModify(properties);
+    }
     if (!config.isDefaultServer()) {
       log.info("skip automatic testing config on non-default server name:{} register:{}", config.getName(), config.isRegister());
       return;
     }
-    Properties properties = config.getProperties();
     if (isExtraServer(config, properties)) {
       setupExtraDataSourceIfNecessary(config);
       return;