Support computed Properties in @containers

quarkus-qe · May 10, 2021 · 94c5f38 · 94c5f38
1 parent 8bc2dd7
commit 94c5f38
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/...rs/src/main/java/io/quarkus/test/services/containers/ContainerManagedResourceBuilder.java b/...rs/src/main/java/io/quarkus/test/services/containers/ContainerManagedResourceBuilder.java
@@ -7,6 +7,7 @@
 import io.quarkus.test.bootstrap.ManagedResourceBuilder;
 import io.quarkus.test.bootstrap.ServiceContext;
 import io.quarkus.test.services.Container;
+import io.quarkus.test.utils.PropertiesUtils;
 
 public class ContainerManagedResourceBuilder implements ManagedResourceBuilder {
 
@@ -42,9 +43,9 @@ protected ServiceContext getContext() {
     @Override
     public void init(Annotation annotation) {
         Container metadata = (Container) annotation;
-        this.image = metadata.image();
+        this.image = PropertiesUtils.resolveProperty(metadata.image());
         this.command = metadata.command();
-        this.expectedLog = metadata.expectedLog();
+        this.expectedLog = PropertiesUtils.resolveProperty(metadata.expectedLog());
         this.port = metadata.port();
     }
 

diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/utils/PropertiesUtils.java b/quarkus-test-core/src/main/java/io/quarkus/test/utils/PropertiesUtils.java
@@ -10,15 +10,42 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.commons.lang3.StringUtils;
+
 public final class PropertiesUtils {
 
     private static final String AUTOGENERATED_COMMENT = "This properties file has been auto generated "
             + "by Quarkus QE Test Framework";
+    private static final String PROPERTY_START_TAG = "${";
+    private static final String PROPERTY_END_TAG = "}";
+    private static final String PROPERTY_WITH_OPTIONAL = ":";
 
     private PropertiesUtils() {
 
     }
 
+    /**
+     * Try to resolve the value property from the value if the content is contained between ${xxx}.
+     *
+     * @param value
+     * @return
+     */
+    public static String resolveProperty(String value) {
+        if (StringUtils.startsWith(value, PROPERTY_START_TAG)) {
+            String propertyKey = StringUtils.substringBetween(value, PROPERTY_START_TAG, PROPERTY_END_TAG);
+            String defaultValue = StringUtils.EMPTY;
+            if (StringUtils.contains(propertyKey, PROPERTY_WITH_OPTIONAL)) {
+                String[] propertyKeySplit = propertyKey.split(PROPERTY_WITH_OPTIONAL);
+                propertyKey = propertyKeySplit[0];
+                defaultValue = propertyKeySplit[1];
+            }
+
+            return System.getProperty(propertyKey, defaultValue);
+        }
+
+        return value;
+    }
+
     public static Map<String, String> toMap(String propertiesFile) {
         try (InputStream in = ClassLoader.getSystemResourceAsStream(propertiesFile)) {
             return toMap(in);

diff --git a/...src/main/java/io/quarkus/test/services/containers/AmqContainerManagedResourceBuilder.java b/...src/main/java/io/quarkus/test/services/containers/AmqContainerManagedResourceBuilder.java
@@ -7,6 +7,7 @@
 import io.quarkus.test.bootstrap.ServiceContext;
 import io.quarkus.test.services.AmqContainer;
 import io.quarkus.test.services.containers.model.AmqProtocol;
+import io.quarkus.test.utils.PropertiesUtils;
 
 public class AmqContainerManagedResourceBuilder extends ContainerManagedResourceBuilder {
 
@@ -45,8 +46,8 @@ protected AmqProtocol getProtocol() {
     @Override
     public void init(Annotation annotation) {
         AmqContainer metadata = (AmqContainer) annotation;
-        this.image = metadata.image();
-        this.expectedLog = metadata.expectedLog();
+        this.image = PropertiesUtils.resolveProperty(metadata.image());
+        this.expectedLog = PropertiesUtils.resolveProperty(metadata.expectedLog());
         this.protocol = metadata.protocol();
     }
 

diff --git a/...c/main/java/io/quarkus/test/services/containers/KafkaContainerManagedResourceBuilder.java b/...c/main/java/io/quarkus/test/services/containers/KafkaContainerManagedResourceBuilder.java
@@ -8,6 +8,7 @@
 import io.quarkus.test.bootstrap.ServiceContext;
 import io.quarkus.test.services.KafkaContainer;
 import io.quarkus.test.services.containers.model.KafkaVendor;
+import io.quarkus.test.utils.PropertiesUtils;
 
 public class KafkaContainerManagedResourceBuilder implements ManagedResourceBuilder {
 
@@ -44,8 +45,8 @@ protected boolean isWithRegistry() {
     public void init(Annotation annotation) {
         KafkaContainer metadata = (KafkaContainer) annotation;
         this.vendor = metadata.vendor();
-        this.image = metadata.image();
-        this.version = metadata.version();
+        this.image = PropertiesUtils.resolveProperty(metadata.image());
+        this.version = PropertiesUtils.resolveProperty(metadata.version());
         this.withRegistry = metadata.withRegistry();
     }