Allow FMW installers (#114)

Author: ddsharpe

build-tools/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.oracle.weblogic.lifecycle</groupId>
   <artifactId>build-tools</artifactId>
-  <version>1.1</version>
+  <version>1.2</version>
   <name>Build Tools</name>
 
 </project>

build-tools/src/main/resources/weblogic-image-tool/checkstyle/customized_google_checks.xml

@@ -51,6 +51,7 @@
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="AvoidStarImport"/>
+        <module name="UnusedImports"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">

imagetool/src/main/java/com/oracle/weblogic/imagetool/api/FileResolver.java

@@ -0,0 +1,110 @@
+// Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+package com.oracle.weblogic.imagetool.api.model;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import com.oracle.weblogic.imagetool.cachestore.CacheStore;
+import com.oracle.weblogic.imagetool.logging.LoggingFacade;
+import com.oracle.weblogic.imagetool.logging.LoggingFactory;
+import com.oracle.weblogic.imagetool.util.Utils;
+
+/**
+ * Base class to represent either an installer or a patch file.
+ */
+public class CachedFile {
+
+    private static final LoggingFacade logger = LoggingFactory.getLogger(CachedFile.class);
+
+    private String key;
+
+    /**
+     * Represents a locally cached file.
+     *
+     * @param id          cache ID (like installer type or patchId)
+     * @param version     version number for the patch or installer.
+     */
+    public CachedFile(String id, String version) {
+        key = generateKey(id, version);
+    }
+
+    /**
+     * Represents a locally cached file.
+     *
+     * @param id          cache ID (like installer type)
+     * @param version     version number for the patch or installer.
+     */
+    public CachedFile(InstallerType id, String version) {
+        this(id.toString(), version);
+    }
+
+    public static boolean isFileOnDisk(String filePath) {
+        return filePath != null && Files.isRegularFile(Paths.get(filePath));
+    }
+
+    private String generateKey(String id, String version) {
+
+        logger.entering(id, version);
+        String mykey = id;
+        if (id == null) {  // should never happens
+            mykey = id + CacheStore.CACHE_KEY_SEPARATOR + version;
+        } else if (id.indexOf('_') < 0) {
+            if (version != null) {
+                mykey = mykey + CacheStore.CACHE_KEY_SEPARATOR + version;
+            }
+        }
+
+        logger.exiting(mykey);
+        return mykey;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Get the path of the file stored locally in the cache.
+     * @param cacheStore the cache store to search
+     * @return the Path of the file, if found
+     * @throws IOException throws FileNotFoundException, if this cached file (key) could not be located in the cache
+     */
+    public String resolve(CacheStore cacheStore) throws IOException {
+        // check entry exists in cache
+        String key = getKey();
+        logger.entering(key);
+        String filePath = cacheStore.getValueFromCache(key);
+        if (!isFileOnDisk(filePath)) {
+            throw new FileNotFoundException(Utils.getMessage("IMG-0011", key));
+        }
+
+        logger.exiting(filePath);
+        return filePath;
+    }
+
+    /**
+     * Copy file from cacheStore to Docker build context directory.
+     * @param cacheStore cache to copy file from
+     * @param buildContextDir directory to copy file to
+     * @return the path of the file copied to the Docker build context directory
+     */
+    public Path copyFile(CacheStore cacheStore, String buildContextDir) throws IOException {
+        logger.entering();
+        Path result = null;
+        String sourceFile = resolve(cacheStore);
+        logger.info("copying {0} to build context folder.", sourceFile);
+        String targetFilename = new File(sourceFile).getName();
+        try {
+            result = Files.copy(Paths.get(sourceFile), Paths.get(buildContextDir, targetFilename));
+        } catch (Exception ee) {
+            ee.printStackTrace();
+        }
+        logger.exiting(result);
+        return result;
+    }
+}

imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/AbstractFile.java

@@ -0,0 +1,40 @@
+// Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+package com.oracle.weblogic.imagetool.api.model;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Supported Fusion Middleware installer sets.
+ */
+public enum FmwInstallerType {
+    WLS(InstallerType.WLS), //WebLogic Server
+    FMW(InstallerType.FMW), //WebLogic Server Infrastructure (JRF)
+    OSB(InstallerType.FMW, InstallerType.OSB),  //Service Bus
+    SOA(InstallerType.FMW, InstallerType.SOA),  //SOA Suite
+    SOAOSB(InstallerType.FMW, InstallerType.SOA, InstallerType.OSB),
+    OAM(InstallerType.FMW, InstallerType.IDM),
+    BI(InstallerType.FMW, InstallerType.BI),
+    ODI(InstallerType.FMW, InstallerType.ODI),
+    EDQ(InstallerType.FMW, InstallerType.EDQ),
+    OHSSA(InstallerType.OHS),
+    OHS(InstallerType.FMW, InstallerType.OHS),
+    OIG(InstallerType.FMW, InstallerType.SOA, InstallerType.OSB, InstallerType.IDM),
+    OUD(InstallerType.OUD),
+    OUDSM(InstallerType.FMW, InstallerType.OUD),
+    WCC(InstallerType.FMW, InstallerType.WCC), //Web Center Content
+    WCP(InstallerType.FMW, InstallerType.WCP), //Web Center Portal
+    WCS(InstallerType.FMW, InstallerType.WCS)  //Web Center Sites
+    ;
+
+    private InstallerType[] installers;
+    FmwInstallerType(InstallerType... installers) {
+        this.installers = installers;
+    }
+
+    public List<InstallerType> getInstallerList() {
+        return Arrays.asList(installers);
+    }
+}

imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/CachedFile.java

@@ -1,22 +1,31 @@
-// Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package com.oracle.weblogic.imagetool.api.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.oracle.weblogic.imagetool.util.Constants;
-
 /**
- * An enum to represent installer type.
+ * Supported installer types in the local cache.
+ * Provides list of types to the CLI for the addInstaller type flag.
  */
 public enum InstallerType {
 
-    FMW(WLSInstallerType.FMW.toString()),
+    //Values are used to resolve response files and lookup installers in the cache
+    //There must be a matching (default) response file in {resources}/response-files/
+    WLS("wls"),
+    FMW("fmw"),
+    SOA("soa"),
+    OSB("osb"),
+    IDM("idm"),
+    ODI("odi"),
+    BI("bi"),
+    OHS("ohs"),
+    OUD("oud"),
+    EDQ("edq"),
+    WCC("wcc"),
+    WCP("wcp"),
+    WCS("wcs"),
     JDK("jdk"),
-    WDT("wdt"),
-    WLS(WLSInstallerType.WLS.toString());
+    WDT("wdt");
 
     private String value;
 
@@ -29,24 +38,6 @@ public String toString() {
         return value;
     }
 
-    /**
-     * Get the Dockerfile build argument for this installer type.
-     * @param location the location of the installer.
-     * @return --build-arg and this installer type argument and location.
-     */
-    public List<String> getBuildArg(String location) {
-        List<String> retVal = new ArrayList<>(2);
-        retVal.add(Constants.BUILD_ARG);
-        if (this == WLS || this == FMW) {
-            retVal.add("WLS_PKG=" + location);
-        } else if (this == JDK) {
-            retVal.add("JAVA_PKG=" + location);
-        } else {
-            retVal.add("WDT_PKG=" + location);
-        }
-        return retVal;
-    }
-
     /**
      * Create the installer type Enum from the String value.
      * @param value the installer type string, ignoring case.

imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/FmwInstallerType.java

@@ -1,7 +1,7 @@
-// Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-package com.oracle.weblogic.imagetool.api.meta;
+package com.oracle.weblogic.imagetool.cachestore;
 
 import java.util.Map;