support linux env varable for working dir

Author: Yang Guo

platform-cmd-runner/src/main/java/com/flow/platform/cmd/CmdExecutor.java

@@ -18,12 +18,14 @@
 
 import com.flow.platform.domain.CmdResult;
 import com.flow.platform.util.DateUtil;
+import com.flow.platform.util.SystemUtil;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 
 import java.io.*;
 import java.lang.reflect.Field;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -153,17 +155,17 @@ public CmdExecutor(final ProcListener procListener,
 
         // check and init working dir
         if (workingDir != null) {
-            File dir = new File(workingDir);
+            Path dir = SystemUtil.replacePathWithEnv(workingDir);
 
-            if (!dir.exists()) {
+            if (!Files.exists(dir)) {
                 try {
-                    Files.createDirectories(dir.toPath());
+                    Files.createDirectories(dir);
                 } catch (IOException e) {
                     throw new IllegalArgumentException("Unable to create working dir: " + dir);
                 }
             }
 
-            this.pBuilder.directory(dir);
+            this.pBuilder.directory(dir.toFile());
         }
 
         // init inputs env

…m/flow/platform/api/util/SystemUtil.java …a/com/flow/platform/util/SystemUtil.javaplatform-api/src/main/java/com/flow/platform/api/util/SystemUtil.java renamed to platform-util/src/main/java/com/flow/platform/util/SystemUtil.java platform-api/src/main/java/com/flow/platform/api/util/SystemUtil.java renamed to platform-util/src/main/java/com/flow/platform/util/SystemUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.flow.platform.api.util;
+package com.flow.platform.util;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -26,6 +26,10 @@
  */
 public class SystemUtil {
 
+    private final static char ENV_VAR_START_CHAR = '$';
+    private final static char ENV_VAR_LEFT_BRACKET = '{';
+    private final static char ENV_VAR_RIGHT_BRACKET = '}';
+
     /**
      * Parse path with ${xxx} variable to absolute path
      *
@@ -38,19 +42,38 @@ public static Path replacePathWithEnv(String pathWithEnv) {
 
         for (String pathItem : paths) {
             int index = pathItem.indexOf("$", 0);
-            int leftBracket = pathItem.indexOf("{", 0);
-            int rightBracket = pathItem.indexOf("}", 0);
 
-            if (index < 0 || leftBracket < 0 || rightBracket < 0) {
+            if (index < 0) {
                 path = Paths.get(path.toString(), pathItem);
                 continue;
             }
 
-            String envName = pathItem.substring(leftBracket + 1, rightBracket);
-            String envValue = System.getenv(envName);
-            path = Paths.get(path.toString(), envValue);
+            path = Paths.get(path.toString(), parseEnv(pathItem));
         }
 
         return path;
     }
+
+    /**
+     * Parse ${xx} variable to exact value
+     */
+    public static String parseEnv(String env) {
+        if (env == null) {
+            throw new IllegalArgumentException();
+        }
+
+        if (env.charAt(0) != ENV_VAR_START_CHAR) {
+            throw new IllegalArgumentException();
+        }
+
+        boolean hasBracket = env.charAt(1) == ENV_VAR_LEFT_BRACKET;
+        env = env.substring(1);
+
+        if (!hasBracket) {
+            return System.getenv(env);
+        }
+
+        env = env.substring(1, env.length() - 1);
+        return System.getenv(env);
+    }
 }

…atform/api/test/util/SystemUtilTest.java …w/platform/util/test/SystemUtilTest.javaplatform-api/src/test/java/com/flow/platform/api/test/util/SystemUtilTest.java renamed to platform-util/src/test/java/com/flow/platform/util/test/SystemUtilTest.java platform-api/src/test/java/com/flow/platform/api/test/util/SystemUtilTest.java renamed to platform-util/src/test/java/com/flow/platform/util/test/SystemUtilTest.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.flow.platform.api.test.util;
+package com.flow.platform.util.test;
 
-import com.flow.platform.api.util.SystemUtil;
+import com.flow.platform.util.SystemUtil;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.junit.Assert;
@@ -27,6 +27,18 @@
  */
 public class SystemUtilTest {
 
+    @Test
+    public void should_parse_linux_env() throws Throwable {
+        String home = SystemUtil.parseEnv("${HOME}");
+        Assert.assertEquals(System.getenv("HOME"), home);
+
+        home = SystemUtil.parseEnv("$HOME");
+        Assert.assertEquals(System.getenv("HOME"), home);
+
+        home = SystemUtil.parseEnv("${HOME");
+        Assert.assertNull(home);
+    }
+
     @Test
     public void should_replace_path_with_env() throws Throwable {
         // single placeholder