Merge pull request #635 from oracle/OWLS-68437

OWLS-68437: handle the introspection validation errors at operator runtime

Author: rjeberhard

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.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -274,6 +275,12 @@ public NextAction apply(Packet packet) {
       if (topologyYaml != null) {
         LOGGER.fine("topology.yaml: " + topologyYaml);
         DomainTopology domainTopology = parseDomainTopologyYaml(topologyYaml);
+        if (!domainTopology.getValidationErrors().isEmpty()) {
+          for (String err : domainTopology.getValidationErrors()) {
+            LOGGER.severe(err);
+          }
+          doNext(null, packet);
+        }
         WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
         ScanCache.INSTANCE.registerScan(
             info.getNamespace(), info.getDomainUID(), new Scan(wlsDomainConfig, new DateTime()));
@@ -590,7 +597,7 @@ public void setDomain(WlsDomainConfig domain) {
     }
 
     public List<String> getValidationErrors() {
-      return validationErrors;
+      return validationErrors == null ? Collections.emptyList() : validationErrors;
     }
 
     public void setValidationErrors(List<String> validationErrors) {

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

@@ -591,7 +591,7 @@ public void parseInvalidTopologyYamlWithValidationErrors() {
     ConfigMapHelper.DomainTopology domainTopology =
         ConfigMapHelper.parseDomainTopologyYaml(INVALID_TOPOLOGY);
 
-    assertNotNull(domainTopology.getValidationErrors());
+    assertFalse(domainTopology.getValidationErrors().isEmpty());
     assertFalse(domainTopology.getDomainValid());
     assertEquals(
         "The dynamic cluster \"mycluster\"'s dynamic servers use calculated listen ports.",