Merge pull request #460 from renfeiw/env

Fix machineInfo curl validation
adoptium · Jul 18, 2023 · 0647105 · 0647105
2 parents 7c00d51 + 1ef86a8
commit 0647105
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/org/openj9/envInfo/CmdExecutor.java b/src/org/openj9/envInfo/CmdExecutor.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Arrays;
+import java.util.Map;
 
 public class CmdExecutor {
  private static CmdExecutor instance;
@@ -36,9 +37,15 @@ public String execute(String[] commands) {
  String rt = null;
  try {
  ProcessBuilder builder = new ProcessBuilder(Arrays.asList(commands));
+ Map<String, String> env = builder.environment();
+ // clear env and copy from the parent shell environment
+ env.clear();
+ Map<String, String> shellEnv = System.getenv();
+ env.putAll(shellEnv);
  builder.redirectErrorStream(true);
  Process proc = builder.start();
  BufferedReader stdOutput = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+
  StringBuilder sb = new StringBuilder();
  String line = null;
  String newline = ""; 

diff --git a/src/org/openj9/envInfo/MachineInfo.java b/src/org/openj9/envInfo/MachineInfo.java
@@ -142,9 +142,10 @@ private void makeSameLength(ArrayList<Integer> list, int requiredLength){
  }
  }
 
- private boolean validateVersion(String versionName, String actualVersionStr, String requriedVersionStr) {
+ private boolean validateVersion(Info info, String requriedVersionStr) {
  boolean isValid = true;
- try { 
+ String actualVersionStr = parseInfo(info.output);
+ try {
  ArrayList<Integer> accVer = versionStr2ArrList(actualVersionStr);
  ArrayList<Integer> reqVer = versionStr2ArrList(requriedVersionStr);
  int accVerLen = accVer.size();
@@ -162,11 +163,13 @@ private boolean validateVersion(String versionName, String actualVersionStr, Str
  }
  }
  if (!isValid) {
- System.out.println("Error: required " + versionName + ": " + requriedVersionStr + ". Installed version: " + actualVersionStr);
+ System.out.println("Warning: required " + info.name + ": " + requriedVersionStr + ". Output:\n" + info.output);
  }
  } catch (NumberFormatException e){
- System.out.println("Warning: "+ versionName + " information cannot be extracted.");
- System.out.println(versionName + " output: " + actualVersionStr);
+ // We need to add an option to toggle the failure or warning mode.
+ // isValid = false;
+ System.out.println("Warning: "+ info.name + " information cannot be extracted.");
+ System.out.println(info.name + " output: " + actualVersionStr);
  }
  return isValid;
  }
@@ -175,13 +178,15 @@ private void validateInfo() {
  boolean valid = true;
  for (Info info : infoMap.values()) {
  if (info.req != null) {
- String version = parseInfo(info.output);
- valid &= validateVersion(info.name, version, info.req);
+ valid &= validateVersion(info, info.req);
  }
  }
- if (!valid) {
- System.exit(1);
- }
+
+ // Do not fail if the check not pass for the build environment.
+ // We need to add an option to toggle the failure or warning mode.
+ // if (!valid) {
+ // System.exit(1);
+ //}
  }
 
  private void getSysInfo() {