1

Author: liugddx

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

@@ -513,6 +513,9 @@ public void testGetRunningJobs() {
 
     @Test
     public void testGetJobInfoByJobId() {
+        String os = System.getProperty("os.name").toLowerCase();
+        boolean isWindows = os.contains("win");
+        String sparkHomeValue = isWindows ? "C:\\Program Files\\spark" : "/opt/spark";
         Arrays.asList(node2, node1)
                 .forEach(
                         instance -> {
@@ -578,6 +581,9 @@ public void testGetJobInfoByJobId() {
                                                 .body(
                                                         "jobDag.envOptions.'job.mode'",
                                                         equalTo("BATCH"))
+                                                .body(
+                                                        "[0].jobDag.envOptions.'SPARK_HOME'",
+                                                        equalTo(sparkHomeValue))
                                                 .body("jobName", equalTo("fake_to_console"))
                                                 .body("jobStatus", equalTo("FINISHED"));
 
@@ -644,6 +650,9 @@ public void testGetJobInfoByJobId() {
                                                 .body(
                                                         "jobDag.envOptions.'job.mode'",
                                                         equalTo("BATCH"))
+                                                .body(
+                                                        "[0].jobDag.envOptions.'SPARK_HOME'",
+                                                        equalTo(sparkHomeValue))
                                                 .body("jobName", equalTo("fake_to_console"))
                                                 .body("jobStatus", equalTo("FINISHED"));
                                     });