gs: still working on it

gosurya-oracle · gosurya-oracle · commit 065c424bfaab · 2019-02-04T10:20:16.000-06:00
Former-commit-id: c22476e5a6ad035633301a4116f0a686df89359f
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,6 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <shade-plugin-version>3.2.1</shade-plugin-version>
-        <JAVA8_HOME></JAVA8_HOME>
     </properties>
 
     <dependencies>
@@ -32,6 +31,11 @@
             <artifactId>picocli</artifactId>
             <version>3.8.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.dagger</groupId>
+            <artifactId>dagger</artifactId>
+            <version>2.19</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/FileResolver.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/FileResolver.java
@@ -0,0 +1,9 @@
+package com.oracle.weblogicx.imagebuilder.builder.api;
+
+import com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver;
+
+public interface FileResolver {
+
+    String resolve(MetaDataResolver metaDataResolver) throws Exception;
+
+}
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/meta/MetaDataResolver.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/meta/MetaDataResolver.java
@@ -3,14 +3,15 @@
 package com.oracle.weblogicx.imagebuilder.builder.api.meta;
 
 import java.util.Map;
-import java.util.Optional;
 
 /**
  * This is the interface that helps keep track of application metadata like
  * which patches have been downloaded and their location on disk.
  */
 public interface MetaDataResolver {
 
+    String CACHE_KEY_SEPARATOR = "_";
+
     /**
      * Cache dir used by this application. cache dir is where the application downloads
      * artifacts to.
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/model/AbstractFile.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/model/AbstractFile.java
@@ -0,0 +1,19 @@
+package com.oracle.weblogicx.imagebuilder.builder.api.model;
+
+import com.oracle.weblogicx.imagebuilder.builder.api.FileResolver;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public abstract class AbstractFile implements FileResolver {
+
+    protected String key;
+
+    public AbstractFile(String key) {
+        this.key = key;
+    }
+
+    protected boolean isFileOnDisk(String filePath) {
+        return filePath != null && Files.isRegularFile(Paths.get(filePath));
+    }
+}
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/CLIDriver.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/CLIDriver.java
@@ -1,7 +1,8 @@
 package com.oracle.weblogicx.imagebuilder.builder.cli;
 
 import com.oracle.weblogicx.imagebuilder.builder.api.model.CommandResponse;
-import com.oracle.weblogicx.imagebuilder.builder.cli.build.BuildWLSImage;
+import com.oracle.weblogicx.imagebuilder.builder.cli.build.CreateImage;
+import com.oracle.weblogicx.imagebuilder.builder.cli.build.UpdateImage;
 import com.oracle.weblogicx.imagebuilder.builder.cli.cache.CacheCLI;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
@@ -15,15 +16,16 @@
 import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CLI_OPTION;
 
 @Command(
-        name = "builder",
+        name = "imagebuilder",
         mixinStandardHelpOptions = true,
         description = "%nImageBuilder is a tool to help build docker images of WebLogic with selected " +
                       "patches and/or psu(s) applied.%n",
         version = "1.0",
         sortOptions = false,
         subcommands = {
                 CacheCLI.class,
-                BuildWLSImage.class,
+                CreateImage.class,
+                UpdateImage.class,
                 HelpCommand.class
         },
         requiredOptionMarker = '*',
@@ -45,7 +47,7 @@ public static void main(String[] args) {
         } else {
             List<String> argsList = Stream.of(args).collect(Collectors.toList());
             argsList.add(CLI_OPTION);
-//            CommandLine commandLine = new CommandLine(new BuildWLSImage())
+//            CommandLine commandLine = new CommandLine(new CreateImage())
 //                    .setCaseInsensitiveEnumValuesAllowed(true)
 //                    .setUsageHelpWidth(120);
 //
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddEntry.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddEntry.java
@@ -33,10 +33,10 @@ public class AddEntry implements Callable<CommandResponse> {
 
     @Option(
             names = {"--path"},
-            description = "Value for the cache entry. A file path on the local disk",
+            description = "Value for the cache entry",
             required = true
     )
-    private Path location;
+    private String location;
 
     @Unmatched
     List<String> unmatcheOptions;
@@ -46,15 +46,15 @@ public class AddEntry implements Callable<CommandResponse> {
 
     @Override
     public CommandResponse call() throws Exception {
-        if (key != null && !key.isEmpty() && location != null && Files.exists(location)) {
+        if (key != null && !key.isEmpty() && location != null && !location.isEmpty()) {
             String oldValue = META_RESOLVER.getValueFromCache(key);
             String msg;
             if (oldValue != null) {
                 msg = String.format("Replaced old value %s with new value %s for key %s", oldValue, location, key);
             } else {
                 msg = String.format("Added entry %s=%s", key, location);
             }
-            if (META_RESOLVER.addToCache(key, location.toAbsolutePath().toString())) {
+            if (META_RESOLVER.addToCache(key, location)) {
                 return new CommandResponse(0, msg);
             } else {
                 return new CommandResponse(-1, "Command Failed");
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddInstallerEntry.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddInstallerEntry.java
@@ -2,7 +2,6 @@
 
 import com.oracle.weblogicx.imagebuilder.builder.api.model.CommandResponse;
 import com.oracle.weblogicx.imagebuilder.builder.api.model.InstallerType;
-import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Unmatched;
@@ -13,7 +12,7 @@
 import java.util.concurrent.Callable;
 
 import static com.oracle.weblogicx.imagebuilder.builder.impl.meta.FileMetaDataResolver.META_RESOLVER;
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CACHE_KEY_SEPARATOR;
+import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
 import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.DEFAULT_WLS_VERSION;
 
 @Command(
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddPatchEntry.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddPatchEntry.java
@@ -18,7 +18,7 @@
 import java.util.concurrent.Callable;
 
 import static com.oracle.weblogicx.imagebuilder.builder.impl.meta.FileMetaDataResolver.META_RESOLVER;
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CACHE_KEY_SEPARATOR;
+import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
 import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.DEFAULT_WLS_VERSION;
 
 @Command(
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/impl/InstallerFile.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/impl/InstallerFile.java
@@ -0,0 +1,63 @@
+package com.oracle.weblogicx.imagebuilder.builder.impl;
+
+import com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver;
+import com.oracle.weblogicx.imagebuilder.builder.api.model.AbstractFile;
+import com.oracle.weblogicx.imagebuilder.builder.api.model.InstallerType;
+import com.oracle.weblogicx.imagebuilder.builder.util.HttpUtil;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Objects;
+
+import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
+
+public class InstallerFile extends AbstractFile {
+
+    private boolean tryToDownload;
+    private String userId;
+    private String password;
+
+    public InstallerFile(String key, boolean tryToDownload) {
+        super(key);
+        this.tryToDownload = tryToDownload;
+    }
+
+    public InstallerFile(String key, boolean tryToDownload, String userId, String password) {
+        this(key, tryToDownload);
+        Objects.requireNonNull(userId, "userId cannot be null");
+        Objects.requireNonNull(password, "password cannot be null");
+        this.userId = userId;
+        this.password = password;
+    }
+
+    public InstallerFile(InstallerType type, String version, boolean tryToDownload, String userId, String password) {
+        this(type.toString() + CACHE_KEY_SEPARATOR + version, tryToDownload, userId, password);
+    }
+
+    @Override
+    public String resolve(MetaDataResolver metaDataResolver) throws Exception {
+        // check entry exists in cache
+        String filePath = metaDataResolver.getValueFromCache(key);
+        // check if the file exists on disk
+        if (!isFileOnDisk(filePath)) {
+            if (tryToDownload) {
+                String urlPath = metaDataResolver.getValueFromCache(key + "_url");
+                if (urlPath != null) {
+                    String fileName = new URL(urlPath).getPath();
+                    fileName = fileName.substring(fileName.lastIndexOf('/') + 1);
+                    String targetFilePath = metaDataResolver.getCacheDir() + File.separator + fileName;
+                    System.out.println("1. Downloading from " + urlPath + " to " + targetFilePath);
+                    HttpUtil.downloadFile(urlPath, targetFilePath, userId, password);
+                    metaDataResolver.addToCache(key, targetFilePath);
+                    return targetFilePath;
+                } else {
+                    throw new Exception("Cannot find download link for entry " + key + "_url in cache");
+                }
+            } else {
+                //not allowed to download
+                throw new Exception("CachePolicy prohibits download. Please add cache entry for key: " + key);
+            }
+        }
+        return filePath;
+    }
+}
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/impl/PatchFile.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/impl/PatchFile.java
@@ -0,0 +1,74 @@
+package com.oracle.weblogicx.imagebuilder.builder.impl;
+
+import com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver;
+import com.oracle.weblogicx.imagebuilder.builder.api.model.AbstractFile;
+import com.oracle.weblogicx.imagebuilder.builder.api.model.WLSInstallerType;
+import com.oracle.weblogicx.imagebuilder.builder.util.ARUUtil;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+public class PatchFile extends AbstractFile {
+
+    private String userId;
+    private String password;
+    private String patchId;
+    private WLSInstallerType type;
+    private String version;
+
+    public PatchFile(String key) {
+        super(key);
+    }
+
+    private PatchFile(String key, String userId, String password) {
+        this(key);
+        this.userId = userId;
+        this.password = password;
+    }
+
+    public PatchFile(WLSInstallerType type, String version, String patchId, String userId, String password) {
+        super(null);
+        Objects.requireNonNull(userId, "userId cannot be null");
+        Objects.requireNonNull(password, "password cannot be null");
+        this.type = type;
+        this.version = version;
+        this.patchId = patchId;
+        this.userId = userId;
+        this.password = password;
+    }
+
+    @Override
+    public String resolve(MetaDataResolver metaDataResolver) throws Exception {
+        if (patchId == null || patchId.isEmpty()) {
+            //this implies get latest psu
+            this.key = ARUUtil.getLatestPSUFor(type.toString(), version, userId, password);
+        } else {
+            List<String> patches = ARUUtil.getPatchesFor(type.toString(), version, Collections.singletonList(patchId),
+                    userId, password);
+            if (patches != null && !patches.isEmpty()) {
+                this.key = patches.get(0);
+            }
+        }
+
+        if (this.key == null || this.key.isEmpty()) {
+            if (this.patchId == null || this.patchId.isEmpty()) {
+                throw new Exception(String.format("Failed to find latest psu for product type %s, version %s",
+                        this.type, this.version));
+            } else {
+                throw new Exception(String.format("Failed to find patch %s for product type %s, version %s",
+                        this.patchId, this.type, this.version));
+            }
+        } else {
+            String filePath = metaDataResolver.getValueFromCache(this.key);
+            if (filePath == null || !Files.isRegularFile(Paths.get(filePath))) {
+                throw new Exception(String.format(
+                        "File doesn't exist at location %s for product type %s, version %s, patch %s", filePath,
+                        this.type, this.version, this.patchId));
+            }
+            return filePath;
+        }
+    }
+}
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/ARUConstants.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/ARUConstants.java
@@ -16,7 +16,6 @@ public final class ARUConstants {
     static final String CONFLICTCHECKER_URL = "https://updates.oracle.com/Orion/Services/conflict_checks";
     static final String WLS_PROD_ID = "15991";
     static final String FMW_PROD_ID = "27638";
-    public static final String CACHE_KEY_SEPARATOR = "_";
     public static final String CACHE_DIR_KEY = "cache.dir";
     public static final String DEFAULT_WLS_VERSION = "12.2.1.3.0";
     public static final String DEFAULT_JDK_VERSION = "8u201";
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/ARUUtil.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/ARUUtil.java
@@ -21,7 +21,7 @@
 
 import static com.oracle.weblogicx.imagebuilder.builder.impl.meta.FileMetaDataResolver.META_RESOLVER;
 import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.ARU_LANG_URL;
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CACHE_KEY_SEPARATOR;
+import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
 import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CONFLICTCHECKER_URL;
 import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.FMW_PROD_ID;
 import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.LATEST_PSU_URL;
@@ -112,7 +112,27 @@ public static SearchResult getAllPSUFor(String category, String version, String
         return getAllPSU(category, releaseNumber, userId, password);
     }
 
-
+    /**
+     * Get list of PSU available for given category and release
+     * @param category wls or fmw
+     * @param version version number like 12.2.1.3.0
+     * @param userId user
+     * @return Document listing of all patches (full details)
+     * @throws IOException when failed
+     */
+    public static String getLatestPSUNumber(String category, String version, String userId, String password) {
+        try {
+            String releaseNumber = getReleaseNumber(category, version, userId, password);
+            SearchResult searchResult = getAllPSU(category, releaseNumber, userId, password);
+            if (searchResult.isSuccess()) {
+                Document results = searchResult.getResults();
+                return XPathUtil.applyXPathReturnString(results, "/results/patch[1]/name");
+            }
+        } catch (IOException | XPathExpressionException e) {
+            //suppress exception
+        }
+        return null;
+    }
 
     /**
      * Download a list of FMW patches
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/Tester.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/Tester.java
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/Utils.java b/src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/Utils.java
diff --git a/src/main/resources/Dockerfile.create b/src/main/resources/Dockerfile.create
diff --git a/src/main/resources/Dockerfile.dtemplate b/src/main/resources/Dockerfile.dtemplate
