Unit tests

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

@@ -412,9 +412,8 @@ final void updateForDeepSubstitution(V1Pod pod) {
     getContainer(pod)
         .ifPresent(
             c -> {
-              doDeepSubstitution(deepSubVars(c.getEnv()), pod.getSpec());
-            }
-        );
+              doDeepSubstitution(deepSubVars(c.getEnv()), pod);
+            });
   }
 
   final Map<String, String> deepSubVars(List<V1EnvVar> envVars) {

operator/src/main/java/oracle/kubernetes/operator/helpers/StepContextBase.java

@@ -8,9 +8,11 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Set;
 
 import io.kubernetes.client.models.V1EnvVar;
 import io.kubernetes.client.models.V1Pod;
@@ -100,6 +102,11 @@ protected void doDeepSubstitution(final Map<String, String> substitutionVariable
             for (Pair<Method, Method> item : stringBeans) {
               item.getRight().invoke(obj, translate(substitutionVariables, (String) item.getLeft().invoke(obj)));
             }
+
+            List<Pair<Method, Method>> mapBeans = mapBeans(cls);
+            for (Pair<Method, Method> item : mapBeans) {
+              item.getRight().invoke(obj, translate(substitutionVariables, (Map) item.getLeft().invoke(obj)));
+            }
           }
         } catch (IllegalAccessException | InvocationTargetException e) {
           LOGGER.severe(MessageKeys.EXCEPTION, e);
@@ -136,15 +143,23 @@ && isModelOrListClass(m.getReturnType())
   }
 
   private List<Pair<Method, Method>> stringBeans(Class cls) {
+    return typeBeans(cls, String.class);
+  }
+
+  private List<Pair<Method, Method>> mapBeans(Class cls) {
+    return typeBeans(cls, Map.class);
+  }
+
+  private List<Pair<Method, Method>> typeBeans(Class cls, Class type) {
     List<Pair<Method, Method>> results = new ArrayList<>();
     Method[] methods = cls.getMethods();
     if (methods != null) {
       for (Method m : methods) {
         if (m.getName().startsWith("get")
-            && m.getReturnType().equals(String.class)
+            && m.getReturnType().equals(type)
             && m.getParameterCount() == 0) {
           try {
-            Method set = cls.getMethod("set" + m.getName().substring(3), String.class);
+            Method set = cls.getMethod("set" + m.getName().substring(3), type);
             if (set != null) {
               results.add(new Pair<>(m, set));
             }
@@ -167,6 +182,26 @@ private String translate(final Map<String, String> substitutionVariables, String
     return result;
   }
 
+  private Map<String, Object> translate(final Map<String, String> substitutionVariables, Map<String, Object> rawValue) {
+    if (rawValue == null)
+      return null;
+
+    Map<String, Object> trans = new HashMap<>();
+    for (Map.Entry<String, ?> entry : rawValue.entrySet()) {
+      Object value = entry.getValue();
+      if (value instanceof String) {
+        value = translate(substitutionVariables, (String) value);
+      } else if (value instanceof Map) {
+        value = translate(substitutionVariables, (Map) value);
+      } else {
+        doDeepSubstitution(substitutionVariables, value);
+      }
+      trans.put(translate(substitutionVariables, entry.getKey()), value);
+    }
+
+    return trans;
+  }
+
   protected void addEnvVar(List<V1EnvVar> vars, String name, String value) {
     vars.add(new V1EnvVar().name(name).value(value));
   }

operator/src/test/java/oracle/kubernetes/operator/helpers/ManagedPodHelperTest.java

@@ -9,7 +9,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
+import io.kubernetes.client.models.V1Container;
 import io.kubernetes.client.models.V1EnvVar;
 import io.kubernetes.client.models.V1Pod;
 import oracle.kubernetes.operator.LabelConstants;
@@ -35,6 +37,7 @@
 import static org.hamcrest.Matchers.anEmptyMap;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -174,17 +177,33 @@ public void whenClusterHasAdditionalVolumesWithVariables_createManagedPodWithSub
 
   @Test
   public void whenClusterHasLabelsWithVariables_createManagedPodWithSubstitutions() {
+    V1EnvVar envVar = toEnvVar("TEST_ENV", "test-value");
+    testSupport.addToPacket(ProcessingConstants.ENVVARS, Arrays.asList(envVar));
+
     testSupport.addToPacket(ProcessingConstants.CLUSTER_NAME, CLUSTER_NAME);
     getConfigurator()
+        .withLogHomeEnabled(true)
+        .withContainer(new V1Container()
+            .name("test")
+            .addCommandItem("/bin/bash")
+            .addArgsItem("echo")
+            .addArgsItem("This server is $(SERVER_NAME) and has $(TEST_ENV)"))
         .configureCluster(CLUSTER_NAME)
         .withPodLabel("myCluster", "my-$(CLUSTER_NAME)")
         .withPodLabel("logHome", "$(LOG_HOME)");
 
+    V1Pod pod = getCreatedPod();
     assertThat(
-        getCreatedPod().getMetadata().getLabels(),
+        pod.getMetadata().getLabels(),
         allOf(
-            hasEntry("myCluster", "my" + CLUSTER_NAME),
+            hasEntry("myCluster", "my-" + CLUSTER_NAME),
             hasEntry("logHome", "/shared/logs/" +  UID)));
+    Optional<V1Container> o = pod.getSpec().getContainers()
+        .stream().filter(c -> "test".equals(c.getName())).findFirst();
+    assertThat(
+        o.orElseThrow().getArgs(),
+        allOf(
+            hasItem("This server is " +  SERVER_NAME + " and has test-value")));
   }
 
   @Test