improve error message when WDT Operation UPDATE is used on image without a domain (#171)

ddsharpe · web-flow · commit 4a396b93de49 · 2020-05-14T10:23:18.000-05:00
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java
@@ -185,7 +185,7 @@ boolean applyingPatches() {
      */
     boolean shouldUpdateOpatch() {
         if (skipOpatchUpdate) {
-            logger.fine("OPatch update was skipped at user's request");
+            logger.fine("IMG-0065");
         }
         return !skipOpatchUpdate;
     }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/UpdateImage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/UpdateImage.java
@@ -15,7 +15,6 @@
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
 import com.oracle.weblogic.imagetool.cachestore.OPatchFile;
-import com.oracle.weblogic.imagetool.installer.FmwInstallerType;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import com.oracle.weblogic.imagetool.util.Constants;
@@ -68,11 +67,17 @@ public CommandResponse call() throws Exception {
 
             String oracleHome = baseImageProperties.getProperty("ORACLE_HOME", null);
             if (oracleHome == null) {
-                return new CommandResponse(-1, "ORACLE_HOME env variable undefined in base image: " + fromImage);
+                return new CommandResponse(-1, "IMG-0072", fromImage);
             }
             dockerfileOptions.setOracleHome(oracleHome);
-            installerType = FmwInstallerType.valueOf(baseImageProperties.getProperty("WLS_TYPE",
-                FmwInstallerType.WLS.toString()).toUpperCase());
+
+            if (wdtOptions.isUsingWdt()) {
+                String domainHome = baseImageProperties.getProperty("DOMAIN_HOME", null);
+                if (domainHome == null && wdtOperation == WdtOperation.UPDATE) {
+                    return new CommandResponse(-1, "IMG-0071", fromImage);
+                }
+            }
+
             installerVersion = baseImageProperties.getProperty("WLS_VERSION", Constants.DEFAULT_WLS_VERSION);
 
             String opatchVersion = baseImageProperties.getProperty("OPATCH_VERSION");
@@ -174,8 +179,6 @@ String getInstallerVersion() {
 
     private String installerVersion;
 
-    private FmwInstallerType installerType;
-
     @Option(
         names = {"--fromImage"},
         description = "Docker image to use as base image.",
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/WdtOptions.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/WdtOptions.java
@@ -26,6 +26,14 @@ public class WdtOptions {
 
     private static final LoggingFacade logger = LoggingFactory.getLogger(WdtOptions.class);
 
+    /**
+     * Return true if the user specified a WDT model or WDT archive on the command line.
+     * @return true if WDT was selected by the user
+     */
+    boolean isUsingWdt() {
+        return wdtModelPath != null || wdtArchivePath != null;
+    }
+
     /**
      * Checks whether the user requested a domain to be created with WDT.
      * If so,  creates required file links to pass the model, archive, variables file to build process.
diff --git a/imagetool/src/main/resources/ImageTool.properties b/imagetool/src/main/resources/ImageTool.properties
@@ -69,3 +69,5 @@ IMG-0067=Finding patch number for latest PSU along with all its recommended patc
 IMG-0068=Adding patch number {0} to the recommended patches list
 IMG-0069=No recommended patches for {0}, version {1}
 IMG-0070=Failed to find latest patches for {0}, version {1}
+IMG-0071=WDT Operation is set to UPDATE, but the DOMAIN_HOME environment variable was not defined in the base image, {0}.  Did you mean to use "--wdtOperation CREATE" to create a new domain?
+IMG-0072=ORACLE_HOME environment variable is not defined in the base image: {0}
diff --git a/imagetool/src/main/resources/probe-env/test-create-env.sh b/imagetool/src/main/resources/probe-env/test-create-env.sh
@@ -10,17 +10,17 @@ if [[ -f /etc/os-release ]]; then
   cat /etc/os-release | grep -oE '^VERSION_ID=[\"]?[[:digit:]\.]+[\"]?'
 fi
 
-if [[ ! -z "$JAVA_HOME" ]]; then
+if [[ -n "$JAVA_HOME" ]]; then
   echo JAVA_HOME="$JAVA_HOME"
 fi
 
-if [[ ! -z "$ORACLE_HOME" ]]; then
+if [[ -n "$ORACLE_HOME" ]]; then
   echo ORACLE_HOME="$ORACLE_HOME"
-  WLS_TYPE=$(cat $ORACLE_HOME/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
-  if [[ ! -z "$WLS_TYPE" ]]; then
+  WLS_TYPE=$(cat "$ORACLE_HOME"/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
+  if [[ -n "$WLS_TYPE" ]]; then
     echo WLS_TYPE="$WLS_TYPE"
   fi
-  if [[ ! -z "$JAVA_HOME" ]]; then
-    echo WLS_VERSION=$($JAVA_HOME/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)' | head -1)
+  if [[ -n "$JAVA_HOME" ]]; then
+    echo WLS_VERSION="$("$JAVA_HOME"/bin/java -cp "$ORACLE_HOME"/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)' | head -1)"
   fi
 fi
diff --git a/imagetool/src/main/resources/probe-env/test-update-env.sh b/imagetool/src/main/resources/probe-env/test-update-env.sh
@@ -10,33 +10,30 @@ if [[ -f /etc/os-release ]]; then
   cat /etc/os-release | grep -oE '^VERSION_ID=[\"]?[[:digit:]\.]+[\"]?'
 fi
 
-if [[ ! -z "$JAVA_HOME" ]]; then
+if [[ -n "$JAVA_HOME" ]]; then
   echo JAVA_HOME="$JAVA_HOME"
   echo JAVA_PATH="$(readlink -f $JAVA_HOME)"
   echo ADMIN_PORT="${ADMIN_PORT}"
   echo MANAGED_SERVER_PORT="${MANAGED_SERVER_PORT}"
 fi
 
-if [[ ! -z "$ORACLE_HOME" ]]; then
+if [[ -n "$ORACLE_HOME" ]]; then
   echo ORACLE_HOME="$ORACLE_HOME"
-  WLS_TYPE=$(cat $ORACLE_HOME/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
-  if [[ ! -z "$WLS_TYPE" ]]; then
+  WLS_TYPE=$(cat "$ORACLE_HOME"/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
+  if [[ -n "$WLS_TYPE" ]]; then
     echo WLS_TYPE="$WLS_TYPE"
   fi
-  if [[ ! -z "$JAVA_HOME" ]]; then
-    echo WLS_VERSION=$($JAVA_HOME/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)' | head -1)
+  if [[ -n "$JAVA_HOME" ]]; then
+    echo WLS_VERSION="$("$JAVA_HOME"/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)' | head -1)"
   fi
-  echo OPATCH_VERSION=$($ORACLE_HOME/OPatch/opatch version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)')
-  #LSINV_TEXT=$($ORACLE_HOME/OPatch/opatch lsinventory 2> /dev/null)
-  $ORACLE_HOME/OPatch/opatch lsinventory > /tmp/lsout 2> /dev/null
+  echo OPATCH_VERSION="$("$ORACLE_HOME"/OPatch/opatch version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)')"
+  "$ORACLE_HOME"/OPatch/opatch lsinventory > /tmp/lsout 2> /dev/null
 
   if [[  -f "/tmp/lsout" ]]; then
-    #1echo "$LSINV_TEXT" > /tmp_scripts/opatch-lsinventory.txt 2> /dev/null
-    #echo $LSINV_TEXT | base64 > /tmp/b64
-    echo LSINV_TEXT=$(base64 /tmp/lsout)
+    echo LSINV_TEXT="$(base64 /tmp/lsout)"
   fi
 fi
 
-if [[ ! -z "$DOMAIN_HOME" ]]; then
+if [[ -n "$DOMAIN_HOME" ]]; then
   echo DOMAIN_HOME="$DOMAIN_HOME"
 fi

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ boolean applyingPatches() {`
`185`	`185`	`*/`
`186`	`186`	`boolean shouldUpdateOpatch() {`
`187`	`187`	`if (skipOpatchUpdate) {`
`188`		`- logger.fine("OPatch update was skipped at user's request");`
	`188`	`+ logger.fine("IMG-0065");`
`189`	`189`	`}`
`190`	`190`	`return !skipOpatchUpdate;`
`191`	`191`	`}`