temporary workaround to skip ADR patch if recommended for WLS (#200)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java

@@ -254,11 +254,13 @@ void handlePatchFiles(FmwInstallerType installerType, String previousInventory,
 
             if (patchList.isEmpty()) {
                 recommendedPatches = false;
-                logger.fine("Latest PSU and recommended patches NOT FOUND, ignoring recommendedPatches flag");
+                logger.info("IMG-0084", getInstallerVersion());
             } else {
                 for (String patchId: patchList) {
-                    logger.fine("Add latest recommended patch {0} to list", patchId);
-                    patchFiles.add(new PatchFile(patchId, getInstallerVersion(), psuVersion, userId, password));
+                    if (isOkToApply(installerType, patchId)) {
+                        logger.fine("Add latest recommended patch {0} to list", patchId);
+                        patchFiles.add(new PatchFile(patchId, getInstallerVersion(), psuVersion, userId, password));
+                    }
                 }
             }
         } else if (latestPSU) {
@@ -307,6 +309,24 @@ void handlePatchFiles(FmwInstallerType installerType, String previousInventory,
         logger.exiting();
     }
 
+    /**
+     * Returns false if the patch ID needs to be omitted/skipped and should not be applied.
+     * @param installerType FMW installer type
+     * @param patchId patch number
+     * @return true if the patch should be applied
+     */
+    static boolean isOkToApply(FmwInstallerType installerType, String patchId) {
+        if (Utils.isEmptyString(patchId)) {
+            return false;
+        }
+        if (FmwInstallerType.getWeblogicServerTypes().contains(installerType)
+            && patchId.startsWith("31544353")) {
+            logger.info("IMG-0083", patchId);
+            return false;
+        }
+        return true;
+    }
+
     private Path createPatchesTempDirectory() throws IOException {
         Path tmpPatchesDir = Files.createDirectory(Paths.get(getTempDirectory(), "patches"));
         Files.createFile(Paths.get(tmpPatchesDir.toAbsolutePath().toString(), "dummy.txt"));

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java

@@ -98,4 +98,14 @@ public static FmwInstallerType fromValue(String value) {
         }
         throw new IllegalArgumentException(Utils.getMessage("IMG-0080", value));
     }
+
+    private static final List<FmwInstallerType> weblogicServerTypes = Arrays.asList(WLS, WLSDEV, WLSSLIM);
+
+    /**
+     * Return a list of all WebLogic Server types (not JRF types).
+     * @return list of WLS enum types.
+     */
+    public static List<FmwInstallerType> getWeblogicServerTypes() {
+        return weblogicServerTypes;
+    }
 }

imagetool/src/main/resources/ImageTool.properties

@@ -81,3 +81,5 @@ IMG-0079=OS Package Manager override, changed from {0} to {1}
 IMG-0080=Argument {0} does not match any FmwInstallerType names
 IMG-0081=Unable to retrieve list of Oracle releases from Oracle Updates (ARU). Try again later.
 IMG-0082=Failed to determine release number for product {0}, version {1}
+IMG-0083=Recommended ADR patch was skipped for WLS installer, use --patch {0} to apply this patch
+IMG-0084=No recommended patches found for {0}

imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptionsTest.java

@@ -18,6 +18,7 @@
 import java.util.stream.Stream;
 
 import com.oracle.weblogic.imagetool.api.model.CachedFile;
+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.DockerfileOptions;
@@ -27,6 +28,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -172,4 +174,13 @@ void testResolveOptions() throws Exception {
 
         }
     }
+
+    @Test
+    void testSkipAdrPatch() {
+        assertFalse(CommonOptions.isOkToApply(FmwInstallerType.WLS, "31544353"));
+        assertFalse(CommonOptions.isOkToApply(FmwInstallerType.WLS, "31544353_12.2.1.4.0"));
+        assertFalse(CommonOptions.isOkToApply(FmwInstallerType.WLSSLIM, "31544353"));
+        assertTrue(CommonOptions.isOkToApply(FmwInstallerType.FMW, "31544353"));
+        assertTrue(CommonOptions.isOkToApply(FmwInstallerType.FMW, "31544353_12.2.1.3.0"));
+    }
 }