Fix #1479: Expand environment variables in config

flyway · Oct 18, 2019 · 042b9da · 042b9da
1 parent ae43814
commit 042b9da
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/ConfigUtils.java b/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/ConfigUtils.java
@@ -31,6 +31,8 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Configuration-related utilities.
@@ -311,13 +313,31 @@ public static Map<String, String> loadConfigurationFile(File configFile, String
         try {
             String contents = FileCopyUtils.copyToString(new InputStreamReader(new FileInputStream(configFile), encoding));
             Properties properties = new Properties();
+            contents = expandEnvironmentVariables(contents, System.getenv());
             properties.load(new StringReader(contents.replace("\\", "\\\\")));
             return propertiesToMap(properties);
         } catch (IOException e) {
             throw new FlywayException(errorMessage, e);
         }
     }
 
+    static String expandEnvironmentVariables(String value, Map<String, String> environmentVariables) {
+        Pattern pattern = Pattern.compile("\\$\\{([A-Za-z0-9_]+)}");
+        Matcher matcher = pattern.matcher(value);
+        String expandedValue = value;
+
+        while (matcher.find()) {
+            String variableName = matcher.group(1);
+            String variableValue = environmentVariables.containsKey(variableName)
+                    ? environmentVariables.get(variableName)
+                    : "";
+
+            expandedValue = expandedValue.replaceAll(Pattern.quote(matcher.group(0)), variableValue);
+        }
+
+        return expandedValue;
+    }
+
     /**
      * Converts this Properties object into a map.
      *