Changes based on thoughts from Tom B

Author: lennyphan

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

@@ -14,6 +14,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -269,9 +270,8 @@ public NextAction apply(Packet packet) {
       if (topologyYaml != null) {
         LOGGER.fine("topology.yaml: " + topologyYaml);
         DomainTopology domainTopology = parseDomainTopologyYaml(topologyYaml);
-        if (!domainTopology.getDomainValid()) {
-          // If introspector determines Domain is invalid then log and validation errors
-          // and terminate the fiber
+        if (domainTopology.isDomainInvalid()) {
+          // If introspector determines Domain is invalid then log erros and terminate the fiber
           logValidationErrors(domainTopology.getValidationErrors());
           return doNext(null, packet);
         }
@@ -607,7 +607,19 @@ public void setDomain(WlsDomainConfig domain) {
     }
 
     public List<String> getValidationErrors() {
-      return validationErrors == null ? Collections.emptyList() : validationErrors;
+      if (validationErrors == null) {
+        validationErrors = Collections.emptyList();
+      }
+
+      if (!domainValid && validationErrors.isEmpty()) {
+        // add a log message that domain was marked invalid since we have no validation
+        // errors from introspector.
+        validationErrors = new ArrayList<>();
+        validationErrors.add(
+            "Error, domain is marked invalid without error messages from introspector job.");
+      }
+
+      return validationErrors;
     }
 
     public void setValidationErrors(List<String> validationErrors) {
@@ -620,5 +632,13 @@ public String toString() {
       }
       return "domainValid: " + domainValid + ", validationErrors: " + validationErrors;
     }
+
+    boolean isDomainInvalid() {
+      // domainValid = false OR validation errors exist
+      if (!domainValid || !getValidationErrors().isEmpty()) {
+        return true;
+      }
+      return false;
+    }
   }
 }

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

@@ -466,6 +466,9 @@ public boolean containsAll(V1ConfigMap actual, V1ConfigMap expected) {
           + "validationErrors:\n"
           + "  - \"The dynamic cluster \\\"mycluster\\\"'s dynamic servers use calculated listen ports.\"";
 
+  private static final String DOMAIN_INVALID_NO_ERRORS =
+      "domainValid: false\n" + "validationErrors:\n";
+
   @Test
   public void parseDomainTopologyYaml() {
     ConfigMapHelper.DomainTopology domainTopology =
@@ -564,6 +567,7 @@ public void parseMixedClusterTopologyYaml() {
 
     assertNotNull(domainTopology);
     assertTrue(domainTopology.getDomainValid());
+    assertFalse(domainTopology.isDomainInvalid());
 
     WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
     assertNotNull(wlsDomainConfig);
@@ -593,8 +597,19 @@ public void parseInvalidTopologyYamlWithValidationErrors() {
 
     assertFalse(domainTopology.getValidationErrors().isEmpty());
     assertFalse(domainTopology.getDomainValid());
+    assertTrue(domainTopology.isDomainInvalid());
     assertEquals(
         "The dynamic cluster \"mycluster\"'s dynamic servers use calculated listen ports.",
         domainTopology.getValidationErrors().get(0));
   }
+
+  @Test
+  public void parseInvalidTopologyYamlWithNoValidationErrors() {
+    ConfigMapHelper.DomainTopology domainTopology =
+        ConfigMapHelper.parseDomainTopologyYaml(DOMAIN_INVALID_NO_ERRORS);
+
+    assertFalse(domainTopology.getValidationErrors().isEmpty());
+    assertFalse(domainTopology.getDomainValid());
+    assertTrue(domainTopology.isDomainInvalid());
+  }
 }