Pass in additional env vars that are needed by WDT

Author: pfmackin

integration-tests/src/test/java/oracle/kubernetes/operator/ITCoherenceTests.java

@@ -4,6 +4,7 @@
 
 package oracle.kubernetes.operator;
 
+import java.util.HashMap;
 import java.util.Map;
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.Operator;
@@ -15,18 +16,15 @@
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
+
 /**
- * Simple JUnit test file used for testing Operator.
- *
- * <p>This test is used for testing pods being restarted by some properties change.
+ * This class contains Coherence relates integraiton tests.
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ITCoherenceTests extends BaseTest {
 
   private static Domain domain = null;
-  private static Operator operator1;
-
-  private static final String testAppName = "coherence-proxy-client";
+  private static Operator operator1 = null;
 
   private static final String PROXY_CLIENT_SCRIPT = "buildRunProxyClient.sh";
   private static final String PROXY_CLIENT_APP_NAME = "coherence-proxy-client";
@@ -37,8 +35,7 @@ public class ITCoherenceTests extends BaseTest {
   /**
    * This method gets called only once before any of the test methods are executed. It does the
    * initialization of the integration test properties defined in OperatorIT.properties and setting
-   * the resultRoot, pvRoot and projectRoot attributes. Create Operator1 and domainOnPVUsingWLST
-   * with admin server and 1 managed server if they are not running
+   * the resultRoot, pvRoot and projectRoot attributes. Also, create the operator.
    *
    * @throws Exception
    */
@@ -47,22 +44,20 @@ public static void staticPrepare() throws Exception {
     // initialize test properties and create the directories
     if (!QUICKTEST) {
       initialize(APP_PROPS_FILE);
-
-      if (operator1 == null) {
-        operator1 = TestUtils.createOperator(OPERATOR1_YAML);
-      }
+      operator1 = TestUtils.createOperator(OPERATOR1_YAML);
     }
   }
 
   /**
-   * Releases k8s cluster lease, archives result, pv directories
+   * Releases k8s cluster lease, archives result, pv directories and destroy the operator
    *
    * @throws Exception
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
     if (!QUICKTEST) {
       tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
+      operator1.destroy();
     }
   }
 
@@ -88,11 +83,10 @@ public void testRollingRestart() throws Exception {
   }
 
   /**
-   * Copy the shell script file and all App files over to the admin pod the run the script to build
-   * the proxy client and run the proxy test.
+   * Copy the shell script file and all coherence app files over to the admin pod.
+   * Then run the script to build the proxy client and run the proxy test.
    *
    * @param cacheOp - cache operation
-   * @throws Exception exception
    */
   private static void copyAndExecuteProxyClientInPod(String cacheOp) {
     try {
@@ -159,21 +153,25 @@ private void restartDomainByChangingEnvProperty() throws Exception {
         "\"-Dweblogic.StdoutDebugEnabled=false\"", "\"-Dweblogic.StdoutDebugEnabled=true\"");
   }
 
-  private static void destroyDomain() throws Exception {
-    if (domain != null) {
-      domain.destroy();
-    }
-  }
-
+  /**
+   * Create the domain
+   *
+   * @return
+   * @throws Exception
+   */
   private Domain createDomain() throws Exception {
 
-    //    System.getenv().put("CUSTOM_WDT_ARCHIVE", "/Users/pmackin/archive-proxy.zip");
+// TODO - Don't hardcode the archive location
+    Map<String, String> envMap = new HashMap();
+    envMap.put("CUSTOM_WDT_ARCHIVE", "/Users/pmackin/archive-proxy.zip");
 
     // create domain
     Domain domain = null;
     Map<String, Object> domainMap = TestUtils.loadYaml(DOMAININIMAGE_WDT_YAML);
     domainMap.put("namespace", "test1");
     domainMap.put("domainUID", "coh");
+    domainMap.put("additionalEnvMap", envMap);
+
     domainMap.put(
         "customWdtTemplate",
         BaseTest.getProjectRoot()
@@ -182,4 +180,16 @@ private Domain createDomain() throws Exception {
     domain.verifyDomainCreated();
     return domain;
   }
+
+  /**
+   * Destroy the domain
+   *
+   * @throws Exception
+   */
+  private static void destroyDomain() throws Exception {
+    if (domain != null) {
+      domain.destroy();
+    }
+  }
+
 }

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -77,7 +77,7 @@ public class Domain {
   private String imageName;
   private boolean voyager;
   private boolean createDomainResource = true;
-  
+
   public Domain() throws Exception {
     domainMap = new HashMap<>();
   }
@@ -95,7 +95,7 @@ public Domain(String inputYaml, boolean createDomainResource) throws Exception {
   public Domain(Map<String, Object> inputDomainMap) throws Exception {
     this(inputDomainMap, true);
   }
-  
+
   public Domain(Map<String, Object> inputDomainMap, boolean createDomainResource) throws Exception {
     initialize(inputDomainMap);
     this.createDomainResource = createDomainResource;
@@ -1242,8 +1242,11 @@ protected void callCreateDomainScript(String outputDir) throws Exception {
     // as samples only support DYNAMIC cluster or copy config cluster topology for domain in image
     changeClusterTypeInCreateDomainJobTemplate();
 
+    // Get the map of any additional environment vars, or null
+    Map<String, String> additionalEnvMap = (Map<String, String>)domainMap.get("additionalEnvMap");;
+
     logger.info("Running " + createDomainScriptCmd);
-    ExecResult result = ExecCommand.exec(createDomainScriptCmd, true);
+    ExecResult result = ExecCommand.exec(createDomainScriptCmd, true, additionalEnvMap);
     if (result.exitValue() != 0) {
       throw new RuntimeException(
           "FAILURE: command "

integration-tests/src/test/java/oracle/kubernetes/operator/utils/ExecCommand.java

@@ -4,28 +4,44 @@
 
 package oracle.kubernetes.operator.utils;
 
+import com.google.common.io.ByteStreams;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.google.common.io.ByteStreams;
-
-/**
- * Class for executing shell commands from java.
- */
+/** Class for executing shell commands from java. */
 public class ExecCommand {
 
   public static ExecResult exec(String command) throws Exception {
-    return exec(command, false);
+    return exec(command, false, null);
   }
 
   public static ExecResult exec(String command, boolean isRedirectToOut) throws Exception {
-    Process p = Runtime.getRuntime().exec(new String[] {"/bin/sh", "-c", command});
+    return exec(command, isRedirectToOut, null);
+  }
+
+  public static ExecResult exec(String command, boolean isRedirectToOut, Map<String,String> additionalEnvMap)
+      throws Exception {
+
+    Process p = null;
+    if (additionalEnvMap == null) {
+      p = Runtime.getRuntime().exec(new String[] {"/bin/sh", "-c", command});
+    } else {
+      // Combine new env vars with existing ones and generate a string array with those values
+      // If the 2 maps have a dup key then the additional env map entry will replace the existing.
+      Map<String, String> combinedEnvMap = new HashMap();
+      combinedEnvMap.putAll(System.getenv());
+      combinedEnvMap.putAll(additionalEnvMap);
+      String[] envParams = generateNameValueArrayFromMap(combinedEnvMap);
+      p = Runtime.getRuntime().exec(new String[] {"/bin/sh", "-c", command}, envParams);
+    }
 
     InputStreamWrapper in = new SimpleInputStreamWrapper(p.getInputStream());
     Thread out = null;
@@ -38,13 +54,14 @@ public static ExecResult exec(String command, boolean isRedirectToOut) throws Ex
         // this makes sense because CopyingOutputStream is an InputStreamWrapper
         in = copyOut;
         out =
-            new Thread(() -> {
-              try {
-                ByteStreams.copy(i, copyOut);
-              } catch (IOException ex) {
-                ex.printStackTrace();
-              }
-            });
+            new Thread(
+                () -> {
+                  try {
+                    ByteStreams.copy(i, copyOut);
+                  } catch (IOException ex) {
+                    ex.printStackTrace();
+                  }
+                });
         out.start();
       }
 
@@ -58,6 +75,20 @@ public static ExecResult exec(String command, boolean isRedirectToOut) throws Ex
     }
   }
 
+  /**
+   * Generate a string array of name=value items, one for each env map entry.
+   * @return
+   */
+  private static String[]  generateNameValueArrayFromMap(Map<String, String> map) {
+    int mapSize = map.size();
+    String[] strArrary = new String[mapSize];
+    int i = 0;
+    for (Map.Entry<String,String> entry : map.entrySet()) {
+      strArrary[i++] = entry.getKey() + "=" + entry.getValue();
+    }
+    return strArrary;
+  }
+
   private static String read(InputStream is) throws Exception {
     return new BufferedReader(new InputStreamReader(is)).lines().collect(Collectors.joining("\n"));
   }