1

Author: liugddx

seatunnel-common/pom.xml

@@ -74,6 +74,12 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <version>1.9.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

seatunnel-common/src/main/java/org/apache/seatunnel/common/config/EnvConfigParserUtil.java

@@ -17,69 +17,12 @@
 
 package org.apache.seatunnel.common.config;
 
-import org.apache.seatunnel.common.utils.FileUtils;
-
-import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
 public class EnvConfigParserUtil {
 
     public static Map<String, String> parseEnvConfig() {
-        Path path = Common.configDir();
-        String os = System.getProperty("os.name").toLowerCase();
-
-        if (os.startsWith("win")) {
-            String envScript = "seatunnel-env.cmd";
-            Path envScriptPath = path.resolve(envScript);
-            if (envScriptPath.toFile().exists()) {
-                String content = FileUtils.readFileToStr(envScriptPath);
-                Map<String, String> config = new HashMap<>();
-                String[] lines = content.split("\\r?\\n");
-                for (String line : lines) {
-                    line = line.trim();
-                    if (line.startsWith("if") && line.contains("set")) {
-                        int setIndex = line.indexOf("set");
-                        if (setIndex != -1) {
-                            String assignment = line.substring(setIndex + 4).trim();
-                            String[] keyValue = assignment.split("=");
-                            if (keyValue.length == 2) {
-                                String key = keyValue[0].replace("\"", "").trim();
-                                String value = keyValue[1].replace("\"", "").trim();
-                                config.put(key, value);
-                            }
-                        }
-                    }
-                }
-                return config;
-            }
-
-        } else {
-            String envScript = "seatunnel-env.sh";
-            Path envScriptPath = path.resolve(envScript);
-            if (envScriptPath.toFile().exists()) {
-                String content = FileUtils.readFileToStr(envScriptPath);
-                Map<String, String> config = new HashMap<>();
-                String[] lines = content.split("\\r?\\n");
-                for (String line : lines) {
-                    line = line.trim();
-                    if (line.contains("=") && !line.startsWith("#")) {
-                        String[] keyValue = line.split("=", 2);
-                        if (keyValue.length == 2) {
-                            String key = keyValue[0].trim();
-                            String value = keyValue[1].trim();
-                            if (value.startsWith("${") && value.contains(":-")) {
-                                value =
-                                        value.substring(
-                                                value.indexOf(":-") + 2, value.length() - 1);
-                            }
-                            config.put(key, value);
-                        }
-                    }
-                }
-                return config;
-            }
-        }
-        return null;
+        return new HashMap<>(System.getenv());
     }
 }

seatunnel-common/src/test/java/org/apache/seatunnel/common/config/EnvConfigParserUtilTest.java

@@ -17,56 +17,18 @@
 
 package org.apache.seatunnel.common.config;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.SetEnvironmentVariable;
 
-import java.net.URISyntaxException;
-import java.nio.file.Paths;
 import java.util.Map;
 
 public class EnvConfigParserUtilTest {
 
-    private String originSeatunnelHome = null;
-    private DeployMode originMode = null;
-    private static final String seatunnelHome;
-
-    static {
-        try {
-            seatunnelHome =
-                    Paths.get(EnvConfigParserUtilTest.class.getResource("/home").toURI())
-                            .toString();
-        } catch (URISyntaxException e) {
-            throw new RuntimeException("Failed to get seatunnelHome path", e);
-        }
-    }
-
-    @BeforeEach
-    public void before() {
-        originMode = Common.getDeployMode();
-        Common.setDeployMode(DeployMode.CLIENT);
-        originSeatunnelHome = Common.getSeaTunnelHome();
-        Common.setSeaTunnelHome(seatunnelHome);
-    }
-
     @Test
+    @SetEnvironmentVariable(key = "A", value = "B")
     public void testParseEnvConfig() {
         Map<String, String> envMap = EnvConfigParserUtil.parseEnvConfig();
-        Assertions.assertEquals(2, envMap.size());
-        String os = System.getProperty("os.name").toLowerCase();
-        if (os.startsWith("win")) {
-            Assertions.assertEquals("C:\\Program Files\\spark", envMap.get("SPARK_HOME"));
-            Assertions.assertEquals("C:\\Program Files\\flink", envMap.get("FLINK_HOME"));
-            return;
-        }
-        Assertions.assertEquals("/opt/spark", envMap.get("SPARK_HOME"));
-        Assertions.assertEquals("/opt/flink", envMap.get("FLINK_HOME"));
-    }
-
-    @AfterEach
-    public void after() {
-        Common.setSeaTunnelHome(originSeatunnelHome);
-        Common.setDeployMode(originMode);
+        Assertions.assertEquals("B", envMap.get("A"));
     }
 }