Allow UPDATE to process fromImage with some unknown ARU products (#301)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruProduct.java

@@ -3,6 +3,8 @@
 
 package com.oracle.weblogic.imagetool.aru;
 
+import java.util.Arrays;
+
 /**
  * ARU product codes for patching.
  */
@@ -52,4 +54,8 @@ public static AruProduct fromProductId(String value) {
         }
         throw new IllegalArgumentException("Invalid ARU data found in patch product ID: " + value);
     }
+
+    public static boolean isKnownAruProduct(String value) {
+        return Arrays.stream(values()).anyMatch(p -> p.toString().equals(value));
+    }
 }

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

@@ -137,9 +137,8 @@ public static FmwInstallerType fromProductList(String products) {
 
         // create a set from the comma-separated list
         Set<AruProduct> productSet = Stream.of(products.split(","))
-            .filter(e -> !"TOPLINK".equals(e)) // skip TOPLINK product (WLS always contains TOPLINK)
-            .filter(e -> !"BPM".equals(e)) // skip BPM product (SOA always contains BPM)
             .map(e -> "INFRA".equals(e) ? "JRF" : e) // map -> replaces any occurrence of INFRA with JRF
+            .filter(AruProduct::isKnownAruProduct) // drop any products that cannot be patched individually (or unknown)
             .map(AruProduct::valueOf) // convert String to AruProduct enum
             .collect(Collectors.toSet());
 

imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java

@@ -59,6 +59,8 @@ void fromProductList() {
         assertEquals(FmwInstallerType.WLS, FmwInstallerType.fromProductList("WLS,COH,TOPLINK"));
         assertEquals(FmwInstallerType.FMW, FmwInstallerType.fromProductList("INFRA,WLS,COH,TOPLINK"));
         assertEquals(FmwInstallerType.SOA_OSB, FmwInstallerType.fromProductList("INFRA,WLS,COH,TOPLINK,BPM,SOA,OSB"));
+        // Ignore unsupported products, but keep as many products as possible that ARE known
+        assertEquals(FmwInstallerType.FMW, FmwInstallerType.fromProductList("INFRA,WLS,COH,TOPLINK,OIM"));
         assertNull(FmwInstallerType.fromProductList(""));
         assertNull(FmwInstallerType.fromProductList(null));
     }