temporary fix for OPatch bug version and metadata change (#130)

ddsharpe · web-flow · commit 2a7fe647a019 · 2020-02-04T15:10:19.000-06:00
* temporary fix for OPatch bug version and metadata change

* changed IT test to use newer OPatch installer

* fixed Update operation to use new/correct OPatch version

* changed IT test to use newer OPatch installer

* treat opatch patches as any other patch

* use ENV for password resolution

* delete OPatch patch from cache in IntegrationTest before adding
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cachestore/CachedPatchFile.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cachestore/CachedPatchFile.java
@@ -49,7 +49,7 @@ public String resolve(CacheStore cacheStore) throws IOException {
         if (fileExists) {
             logger.info("IMG-0017", patchId, filePath);
         } else {
-            logger.fine("Could not find patch in cache patchId={2} version={1} ", patchId, version);
+            logger.fine("Could not find patch in cache patchId={0} version={1} ", patchId, version);
 
             if (userId == null || password == null) {
                 throw new FileNotFoundException(String.format(
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,11 +9,9 @@
 import java.util.List;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-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;
 import com.oracle.weblogic.imagetool.util.Utils;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -67,11 +65,11 @@ private CommandResponse addToCache(String patchNumber) {
         String key = patchNumber;
 
         // Check if it is an Opatch patch
-        String opatchNumber = Utils.getOpatchVersionFromZip(location.toAbsolutePath().toString());
-        if (opatchNumber != null) {
-            int lastSeparator = key.lastIndexOf(CacheStore.CACHE_KEY_SEPARATOR);
-            key = key.substring(0, lastSeparator) + CacheStore.CACHE_KEY_SEPARATOR + Constants.OPATCH_PATCH_TYPE;
-        }
+        //String opatchNumber = Utils.getOpatchVersionFromZip(location.toAbsolutePath().toString());
+        //if (opatchNumber != null) {
+        //    int lastSeparator = key.lastIndexOf(CacheStore.CACHE_KEY_SEPARATOR);
+        //    key = key.substring(0, lastSeparator) + CacheStore.CACHE_KEY_SEPARATOR + Constants.OPATCH_PATCH_TYPE;
+        //}
         logger.info("adding key " + key);
         if (cacheStore.getValueFromCache(key) != null) {
             String error = String.format("Cache key %s already exists, remove it first", key);
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
@@ -403,7 +403,7 @@ String getPassword() {
         names = {"--opatchBugNumber"},
         description = "the patch number for OPatch (patching OPatch)"
     )
-    String opatchBugNumber = "28186730";
+    String opatchBugNumber = "28186730_13.9.4.2.2";
 
     @Unmatched
     List<String> unmatchedOptions;
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
@@ -83,7 +83,7 @@ public CommandResponse call() throws Exception {
                 String opatchBugNumberVersion;
 
                 if (userId == null && password == null) {
-                    String opatchFile = cacheStore.getValueFromCache(opatchBugNumber + "_opatch");
+                    String opatchFile = cacheStore.getValueFromCache(opatchBugNumber);
                     if (opatchFile != null) {
                         opatchBugNumberVersion = Utils.getOpatchVersionFromZip(opatchFile);
                         logger.info("IMG-0008", opatchBugNumber, opatchFile, opatchBugNumberVersion);
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
@@ -319,13 +319,17 @@ private static void checkForMultiplePatches(String bugNumber, String userId, Str
                     if (nodeList.getLength() > 1 && ind < 0) {
                         // only base number is specified and there are multiple patches
                         // ERROR
-                        logger.warning(Utils.getMessage("IMG-0034", baseBugNumber));
+                        List<String> patchVersions = new ArrayList<>();
                         for (int i = 1; i <= nodeList.getLength(); i++) {
                             String xpath = String.format("string(/results/patch[%d]/release/@name)", i);
                             String releaseNumber = XPathUtil.applyXPathReturnString(allPatches, xpath);
-                            logger.warning(bugNumber + "_" + releaseNumber);
+                            patchVersions.add(bugNumber + "_" + releaseNumber);
                         }
-                        throw new IOException(Utils.getMessage("IMG-0035"));
+
+                        IOException ioe = new IOException(Utils.getMessage("IMG-0034", baseBugNumber,
+                            String.join(", ", patchVersions)));
+                        logger.throwing(ioe);
+                        throw ioe;
                     }
 
                 } catch (XPathExpressionException xpe) {
@@ -354,15 +358,16 @@ private static String savePatch(Document allPatches, String userId, String passw
                 if (nodeList.getLength() > 1 && ind < 0) {
                     // only base number is specified and there are multiple patches
                     // ERROR
-                    String message = String.format("There are multiple patches found with id %s, please specify "
-                            + "the format as one of the following for the release you want", baseBugNumber);
-                    logger.warning(message);
+                    List<String> patchVersions = new ArrayList<>();
                     for (int i = 1; i <= nodeList.getLength(); i++) {
                         String xpath = String.format("string(/results/patch[%d]/release/@name)", i);
                         String releaseNumber = XPathUtil.applyXPathReturnString(allPatches, xpath);
-                        logger.warning(bugNumber + "_" + releaseNumber);
+                        patchVersions.add(bugNumber + "_" + releaseNumber);
                     }
-                    throw new IOException("Multiple patches with same patch number detected");
+                    IOException ioe = new IOException(Utils.getMessage("IMG-0034", baseBugNumber,
+                        String.join(", ", patchVersions)));
+                    logger.throwing(ioe);
+                    throw ioe;
                 }
                 if (optionalRelease != null) {
                     // TODO: do we need this ?
diff --git a/imagetool/src/main/resources/ImageTool.properties b/imagetool/src/main/resources/ImageTool.properties
@@ -32,7 +32,7 @@ IMG-0030=Additional build command file does not exist: {0}
 IMG-0031=No credentials provided. Cannot determine latestPSU
 IMG-0032=Failed to find latest PSU for {0}, version {1}
 IMG-0033=No credentials provided, skipping validation of patches
-IMG-0034=There are multiple patches found with id {0}, please specify the format as one of the following for the release you want
+IMG-0034=Patch ID {0} has multiple versions, please retry the command using one of the available patch versions: {1}
 IMG-0035=Multiple patches with the same patch number detected
 IMG-0036=Unable to find installer inventory file: {0}
 IMG-0037=Failed to find patch {0} for version {1}
diff --git a/imagetool/src/main/resources/docker-files/Update_Image.mustache b/imagetool/src/main/resources/docker-files/Update_Image.mustache
@@ -93,18 +93,18 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
 USER {{userid}}
 
 {{#isOpatchPatchingEnabled}}
-    COPY --chown=oracle:oracle p28186730_139400_Generic.zip {{{tempDir}}}/opatch/
+    COPY --chown=oracle:oracle {{{opatchFileName}}} {{{tempDir}}}/opatch/
     RUN cd {{{tempDir}}}/opatch \
-    && $JAVA_HOME/bin/jar -xf {{{tempDir}}}/opatch/p28186730_139400_Generic.zip \
-    && $JAVA_HOME/bin/java -jar {{{tempDir}}}/opatch/6880880/opatch_generic.jar -silent -ignoreSysPrereqs -force -novalidation oracle_home=$ORACLE_HOME \
+    && {{{java_home}}}/bin/jar -xf {{{tempDir}}}/opatch/{{{opatchFileName}}} \
+    && {{{java_home}}}/bin/java -jar {{{tempDir}}}/opatch/6880880/opatch_generic.jar -silent -ignoreSysPrereqs -force -novalidation oracle_home={{{oracle_home}}} \
     && rm -rf {{{tempDir}}}
 {{/isOpatchPatchingEnabled}}
 
 {{#isPatchingEnabled}}
     COPY --chown={{userid}}:{{groupid}} patches/* {{{tempDir}}}/patches/
 
-    RUN $ORACLE_HOME/OPatch/opatch napply -silent -oh $ORACLE_HOME -phBaseDir {{{tempDir}}}/patches \
-    && $ORACLE_HOME/OPatch/opatch util cleanup -silent -oh $ORACLE_HOME \
+    RUN {{{oracle_home}}}/OPatch/opatch napply -silent -oh {{{oracle_home}}} -phBaseDir {{{tempDir}}}/patches \
+    && {{{oracle_home}}}/OPatch/opatch util cleanup -silent -oh {{{oracle_home}}} \
     && rm -rf {{{tempDir}}}
 {{/isPatchingEnabled}}
 
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/integration/ITImagetool.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/integration/ITImagetool.java
@@ -23,7 +23,7 @@ public class ITImagetool extends BaseTest {
     private static final String JDK_INSTALLER_8u212 = "jdk-8u212-linux-x64.tar.gz";
     private static final String WLS_INSTALLER = "fmw_12.2.1.3.0_wls_Disk1_1of1.zip";
     private static final String P27342434_INSTALLER = "p27342434_122130_Generic.zip";
-    private static final String P28186730_INSTALLER = "p28186730_139400_Generic.zip";
+    private static final String P28186730_INSTALLER = "p28186730_139422_Generic.zip";
     private static final String P22987840_INSTALLER = "p22987840_122100_Generic.zip";
     private static final String WDT_INSTALLER = "weblogic-deploy.zip";
     private static final String FMW_INSTALLER = "fmw_12.2.1.3.0_infrastructure_Disk1_1of1.zip";
@@ -34,7 +34,7 @@ public class ITImagetool extends BaseTest {
     private static final String P22987840_ID = "22987840";
     private static final String WLS_VERSION = "12.2.1.3.0";
     private static final String WLS_VERSION_1221 = "12.2.1.0.0";
-    private static final String OPATCH_VERSION = "13.9.4.0.0";
+    private static final String OPATCH_VERSION = "13.9.4.2.2";
     private static final String JDK_VERSION = "8u202";
     private static final String JDK_VERSION_8u212 = "8u212";
     private static final String WDT_VERSION = "1.1.2";
@@ -43,7 +43,6 @@ public class ITImagetool extends BaseTest {
     private static final String WDT_MODEL = "simple-topology.yaml";
     private static final String WDT_MODEL2 = "simple-topology2.yaml";
     private static String oracleSupportUsername;
-    private static String oracleSupportPassword;
 
     @BeforeClass
     public static void staticPrepare() throws Exception {
@@ -65,7 +64,7 @@ public static void staticPrepare() throws Exception {
 
         // get Oracle support credentials
         oracleSupportUsername = System.getenv("ORACLE_SUPPORT_USERNAME");
-        oracleSupportPassword = System.getenv("ORACLE_SUPPORT_PASSWORD");
+        String oracleSupportPassword = System.getenv("ORACLE_SUPPORT_PASSWORD");
         if (oracleSupportUsername == null || oracleSupportPassword == null) {
             throw new Exception("Please set environment variables ORACLE_SUPPORT_USERNAME and ORACLE_SUPPORT_PASSWORD"
                 + " for Oracle Support credentials to download the patches.");
@@ -238,8 +237,11 @@ public void test8CreateWLSImgUseCache() throws Exception {
 
         // need to add the required patches 28186730 for Opatch before create wls images
         String patchPath = getInstallerCacheDir() + FS + P28186730_INSTALLER;
-        deleteEntryFromCache(P28186730_ID + "_opatch");
+        deleteEntryFromCache(P28186730_ID + "_" + OPATCH_VERSION);
         addPatchToCache("wls", P28186730_ID, OPATCH_VERSION, patchPath);
+        ExecResult resultT = listItemsInCache();
+        System.out.println(resultT.stdout());
+        System.out.println(resultT.stderr());
 
         String command = imagetool + " create --jdkVersion " + JDK_VERSION + " --fromImage "
             + BASE_OS_IMG + ":" + BASE_OS_IMG_TAG + " --tag " + build_tag + ":" + testMethodName
@@ -264,6 +266,10 @@ public void test9UpdateWLSImg() throws Exception {
         String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
         logTestBegin(testMethodName);
 
+        ExecResult resultT = listItemsInCache();
+        System.out.println(resultT.stdout());
+        System.out.println(resultT.stderr());
+
         String command = imagetool + " update --fromImage " + build_tag + ":test8CreateWLSImgUseCache --tag "
             + build_tag + ":" + testMethodName + " --patches " + P27342434_ID;
         logger.info("Executing command: " + command);
@@ -307,7 +313,7 @@ public void testACreateWLSImgUsingWDT() throws Exception {
 
         // need to add the required patches 28186730 for Opatch before create wls images
         // delete the cache entry first
-        deleteEntryFromCache(P28186730_ID + "_opatch");
+        deleteEntryFromCache(P28186730_ID + "_" + OPATCH_VERSION);
         String patchPath = getInstallerCacheDir() + FS + P28186730_INSTALLER;
         addPatchToCache("wls", P28186730_ID, OPATCH_VERSION, patchPath);
 
@@ -512,7 +518,7 @@ public void testECreateRestricedJRFDomainImgUsingWDT() throws Exception {
         String command = imagetool + " create --fromImage "
             + BASE_OS_IMG + ":" + BASE_OS_IMG_TAG + " --tag " + build_tag + ":" + testMethodName
             + " --version " + WLS_VERSION + " --latestPSU --user " + oracleSupportUsername
-            + " --password " + oracleSupportPassword + " --wdtVersion " + WDT_VERSION
+            + " --passwordEnv ORACLE_SUPPORT_PASSWORD" + " --wdtVersion " + WDT_VERSION
             + " --wdtArchive " + wdtArchive + " --wdtDomainHome /u01/domains/simple_domain --wdtModel "
             + wdtModel + " --wdtDomainType RestrictedJRF --type fmw --wdtVariables " + wdtVariables;
 
@@ -556,7 +562,7 @@ public void testFCreateWLSImgUsingMultiModels() throws Exception {
 
         // need to add the required patches 28186730 for Opatch before create wls images
         // delete the cache entry first
-        deleteEntryFromCache(P28186730_ID + "_opatch");
+        deleteEntryFromCache(P28186730_ID + "_" + OPATCH_VERSION);
         String patchPath = getInstallerCacheDir() + FS + P28186730_INSTALLER;
         addPatchToCache("wls", P28186730_ID, OPATCH_VERSION, patchPath);
 

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ String getPassword() {`
`403`	`403`	`names = {"--opatchBugNumber"},`
`404`	`404`	`description = "the patch number for OPatch (patching OPatch)"`
`405`	`405`	`)`
`406`		`- String opatchBugNumber = "28186730";`
	`406`	`+ String opatchBugNumber = "28186730_13.9.4.2.2";`
`407`	`407`
`408`	`408`	`@Unmatched`
`409`	`409`	`List<String> unmatchedOptions;`