Added default response files for FMW installers (#126)

ddsharpe · web-flow · commit 593bc1cb2ae6 · 2020-01-29T11:02:32.000-06:00
* use template for silent install response file

* moved installer types to installer package/folder

* move default response strings to DefaultResponseFile to support multiple default response files per installer

* correct import ordering after moving packages

* corrected default response file for OHS_WLS

* added response files for IDM and managed IDM
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/CachedFile.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/CachedFile.java
@@ -11,6 +11,7 @@
 import java.nio.file.Paths;
 
 import com.oracle.weblogic.imagetool.cachestore.CacheStore;
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import com.oracle.weblogic.imagetool.util.Utils;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddInstallerEntry.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddInstallerEntry.java
@@ -7,8 +7,8 @@
 import java.nio.file.Path;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-import com.oracle.weblogic.imagetool.api.model.InstallerType;
 import com.oracle.weblogic.imagetool.cachestore.CacheStore;
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import com.oracle.weblogic.imagetool.util.Utils;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntry.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntry.java
@@ -9,8 +9,8 @@
 import java.util.List;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
 import com.oracle.weblogic.imagetool.cachestore.CacheStore;
+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;
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
@@ -18,10 +18,10 @@
 import java.util.stream.Stream;
 
 import com.oracle.weblogic.imagetool.api.model.CachedFile;
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
 import com.oracle.weblogic.imagetool.cachestore.CacheStore;
 import com.oracle.weblogic.imagetool.cachestore.CacheStoreFactory;
 import com.oracle.weblogic.imagetool.cachestore.CachedPatchFile;
+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.ARUUtil;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java
@@ -13,8 +13,8 @@
 
 import com.oracle.weblogic.imagetool.api.model.CachedFile;
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
-import com.oracle.weblogic.imagetool.api.model.InstallerType;
+import com.oracle.weblogic.imagetool.installer.FmwInstallerType;
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import com.oracle.weblogic.imagetool.installer.MiddlewareInstall;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/RebaseImage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/RebaseImage.java
@@ -13,7 +13,7 @@
 import java.util.concurrent.Callable;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
+import com.oracle.weblogic.imagetool.installer.FmwInstallerType;
 import com.oracle.weblogic.imagetool.installer.MiddlewareInstall;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
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
@@ -14,7 +14,7 @@
 import java.util.concurrent.Callable;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
+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.ARUUtil;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/WLSInstallHelper.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/WLSInstallHelper.java
@@ -8,7 +8,7 @@
 import java.util.Properties;
 
 import com.oracle.weblogic.imagetool.api.model.CachedFile;
-import com.oracle.weblogic.imagetool.api.model.InstallerType;
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import com.oracle.weblogic.imagetool.util.Constants;
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
@@ -12,10 +12,10 @@
 import java.util.List;
 
 import com.oracle.weblogic.imagetool.api.model.CachedFile;
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
-import com.oracle.weblogic.imagetool.api.model.InstallerType;
 import com.oracle.weblogic.imagetool.cachestore.CacheStore;
 import com.oracle.weblogic.imagetool.cachestore.CacheStoreFactory;
+import com.oracle.weblogic.imagetool.installer.FmwInstallerType;
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import com.oracle.weblogic.imagetool.util.DockerfileOptions;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/DefaultResponseFile.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/DefaultResponseFile.java
@@ -3,38 +3,125 @@
 
 package com.oracle.weblogic.imagetool.installer;
 
+import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 
+import com.github.mustachejava.DefaultMustacheFactory;
+import com.github.mustachejava.Mustache;
+import com.github.mustachejava.MustacheFactory;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
-import com.oracle.weblogic.imagetool.util.Utils;
 
 public class DefaultResponseFile implements ResponseFile {
     private static final LoggingFacade logger = LoggingFactory.getLogger(DefaultResponseFile.class);
 
-    private String resource;
-    private String filename;
+    private static final String R_WLS = "WebLogic Server";
+    private static final String R_FMW = "Fusion Middleware Infrastructure";
+    private static final String R_SOA = "SOA Suite";
+    private static final String R_OSB = "Service Bus";
+    private static final String R_OHS = "Standalone HTTP Server (Managed independently of WebLogic server)";
+    private static final String R_OHS_WLS = "Collocated HTTP Server (Managed through WebLogic server)";
+    private static final String R_IDM =
+        "Standalone Oracle Identity and Access Manager(Managed independently of WebLogic server)";
+    private static final String R_IDM_WLS =
+        "Collocated Oracle Identity and Access Manager (Managed through WebLogic server)";
+    private static final String R_OAM =
+        "Collocated Oracle Identity and Access Manager (Managed through WebLogic server)";
+    private static final String R_OUD = "Installation for Oracle Unified Directory";
+    private static final String R_WCC = "WebCenter Content";
+    private static final String R_WCP = "WebCenter Portal";
+    private static final String R_WCS = "WebCenter Sites";
+
+    private final String installTypeResponse;
+    private final String filename;
 
     /**
-     * Use one of the default response files provided in the tool.
-     * @param resource the resource path to the response file in this tool
+     * Use the default response file for FMW installers.
+     * @param installerType the installer type with which this response file will be used
      */
-    public DefaultResponseFile(String resource) {
-        this.resource = resource;
-        if (resource.contains("/")) {
-            filename = resource.substring(resource.lastIndexOf("/") + 1);
-        } else {
-            filename = resource;
+    public DefaultResponseFile(InstallerType installerType, FmwInstallerType fmwInstallerType) {
+        filename = installerType.toString() + ".rsp";
+        installTypeResponse = getInstallTypeResponse(installerType, fmwInstallerType);
+    }
+
+    private static String getInstallTypeResponse(InstallerType installerType, FmwInstallerType fmwInstallerType) {
+        String response;
+
+        switch (installerType) {
+            case FMW:
+                response = R_FMW;
+                break;
+            case SOA:
+                response = R_SOA;
+                break;
+            case OSB:
+                response = R_OSB;
+                break;
+            case OHS:
+                if (FmwInstallerType.OHS == fmwInstallerType) {
+                    response = R_OHS;
+                } else {
+                    response = R_OHS_WLS;
+                }
+                break;
+            case IDM:
+                if (FmwInstallerType.IDM == fmwInstallerType) {
+                    response = R_IDM;
+                } else {
+                    response = R_IDM_WLS;
+                }
+                break;
+            case OAM:
+                response = R_OAM;
+                break;
+            case OUD:
+                response = R_OUD;
+                break;
+            case WCC:
+                response = R_WCC;
+                break;
+            case WCP:
+                response = R_WCP;
+                break;
+            case WCS:
+                response = R_WCS;
+                break;
+            case WLS:
+            default:
+                response = R_WLS;
+                break;
         }
+
+
+        return response;
     }
 
+    /**
+     * Name for the response file FILE.
+     * @return filename to use
+     */
     @Override
     public String name() {
         return filename;
     }
 
     @Override
     public void copyFile(String buildContextDir) throws IOException {
-        Utils.copyResourceAsFile(resource, buildContextDir, false);
+        logger.entering(buildContextDir, filename, installTypeResponse);
+        MustacheFactory mf = new DefaultMustacheFactory("response-files");
+        Mustache mustache = mf.compile("default-response.mustache");
+        mustache.execute(new FileWriter(buildContextDir + File.separator + filename), this).flush();
+        logger.exiting();
+    }
+
+    /**
+     * Get the INPUT_TYPE for the silent install response file.
+     * Used by response file Mustache template.
+     * @return the value for the response file's input type field
+     */
+    @SuppressWarnings("unused")
+    public String installType() {
+        return installTypeResponse;
     }
 }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java
@@ -1,7 +1,7 @@
 // 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;
+package com.oracle.weblogic.imagetool.installer;
 
 import java.util.Arrays;
 import java.util.List;
@@ -14,16 +14,15 @@ public enum FmwInstallerType {
     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),
+    SOA_OSB(InstallerType.FMW, InstallerType.SOA, InstallerType.OSB),
+    IDM(InstallerType.FMW, InstallerType.IDM),
+    IDM_WLS(InstallerType.IDM),
+    OAM(InstallerType.FMW, InstallerType.OAM), //Identity and Access Manager
+    OHS(InstallerType.OHS),
+    OHS_WLS(InstallerType.FMW, InstallerType.OHS),
     OIG(InstallerType.FMW, InstallerType.SOA, InstallerType.OSB, InstallerType.IDM),
-    OUD(InstallerType.OUD),
-    OUDSM(InstallerType.FMW, InstallerType.OUD),
+    OUD(InstallerType.OUD), //Oracle Unified Directory
+    OUD_WLS(InstallerType.FMW, InstallerType.OUD), //Oracle Unified Directory
     WCC(InstallerType.FMW, InstallerType.WCC), //Web Center Content
     WCP(InstallerType.FMW, InstallerType.WCP), //Web Center Portal
     WCS(InstallerType.FMW, InstallerType.WCS)  //Web Center Sites
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/InstallerType.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/InstallerType.java
@@ -1,26 +1,22 @@
 // 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;
+package com.oracle.weblogic.imagetool.installer;
 
 /**
  * Supported installer types in the local cache.
  * Provides list of types to the CLI for the addInstaller type flag.
  */
 public enum InstallerType {
 
-    //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"),
+    IDM("idm"),
+    OAM("oam"),
     OUD("oud"),
-    EDQ("edq"),
     WCC("wcc"),
     WCP("wcp"),
     WCS("wcs"),
@@ -29,6 +25,11 @@ public enum InstallerType {
 
     private String value;
 
+    /**
+     * Create an Enum value for the installer type.
+     * @param value value is the first part of the key for the installer in the cache, and the filename of the
+     *              response file
+     */
     InstallerType(String value) {
         this.value = value;
     }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstall.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstall.java
@@ -15,8 +15,6 @@
 import java.util.zip.ZipFile;
 
 import com.oracle.weblogic.imagetool.api.model.CachedFile;
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
-import com.oracle.weblogic.imagetool.api.model.InstallerType;
 import com.oracle.weblogic.imagetool.cachestore.CacheStore;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
@@ -45,7 +43,7 @@ public MiddlewareInstall(FmwInstallerType type, String version, List<Path> respo
             MiddlewareInstallPackage pkg = new MiddlewareInstallPackage();
             pkg.type = installer;
             pkg.installer = new CachedFile(installer, version);
-            pkg.responseFile = new DefaultResponseFile("/response-files/" + installer.toString() + ".rsp");
+            pkg.responseFile = new DefaultResponseFile(installer, type);
             addInstaller(pkg);
         }
         setResponseFiles(responseFiles);
@@ -92,7 +90,7 @@ public List<MiddlewareInstallPackage> getInstallers() {
         return installerFiles;
     }
 
-    boolean addInstaller(MiddlewareInstallPackage installPackage) {
+    private boolean addInstaller(MiddlewareInstallPackage installPackage) {
         return installerFiles.add(installPackage);
     }
 
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstallPackage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstallPackage.java
@@ -4,7 +4,6 @@
 package com.oracle.weblogic.imagetool.installer;
 
 import com.oracle.weblogic.imagetool.api.model.CachedFile;
-import com.oracle.weblogic.imagetool.api.model.InstallerType;
 
 public class MiddlewareInstallPackage {
     public InstallerType type;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/ARUUtil.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/ARUUtil.java
@@ -14,8 +14,8 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPathExpressionException;
 
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
 import com.oracle.weblogic.imagetool.cachestore.CacheStore;
+import com.oracle.weblogic.imagetool.installer.FmwInstallerType;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import org.apache.http.HttpStatus;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/wdt/DomainType.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/wdt/DomainType.java
@@ -3,7 +3,7 @@
 
 package com.oracle.weblogic.imagetool.wdt;
 
-import com.oracle.weblogic.imagetool.api.model.FmwInstallerType;
+import com.oracle.weblogic.imagetool.installer.FmwInstallerType;
 
 /**
  * Supported domain type. wls, jrf or restricted jrf.
diff --git a/imagetool/src/main/resources/response-files/default-response.mustache b/imagetool/src/main/resources/response-files/default-response.mustache
@@ -1,6 +1,6 @@
 [ENGINE]
 Response File Version=1.0.0.0.0
 [GENERIC]
-INSTALL_TYPE=WebLogic Server
+INSTALL_TYPE={{{installType}}}
 DECLINE_SECURITY_UPDATES=true
 SECURITY_UPDATES_VIA_MYORACLESUPPORT=false
diff --git a/imagetool/src/main/resources/response-files/fmw.rsp b/imagetool/src/main/resources/response-files/fmw.rsp
diff --git a/imagetool/src/main/resources/response-files/osb.rsp b/imagetool/src/main/resources/response-files/osb.rsp
diff --git a/imagetool/src/main/resources/response-files/soa.rsp b/imagetool/src/main/resources/response-files/soa.rsp
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/cache/AddInstallerEntryTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/cache/AddInstallerEntryTest.java
@@ -7,8 +7,8 @@
 import java.io.PrintStream;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-import com.oracle.weblogic.imagetool.api.model.InstallerType;
 import com.oracle.weblogic.imagetool.cli.WLSCommandLine;
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/util/DockerfileBuilderTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/util/DockerfileBuilderTest.java
