change ARU URL for PSU resolution (#104)

ddsharpe · web-flow · commit 156d744b44a5 · 2019-11-05T18:23:14.000-06:00
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/AbstractFile.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/api/model/AbstractFile.java
@@ -42,6 +42,7 @@ public AbstractFile(String id, String version, CachePolicy cachePolicy, String u
 
     public String generateKey(String id, String version) {
 
+        logger.entering(id, version);
         // Note:  this will be invoked by InstallerFile or PatchFile
         //  for patches there are specific format, currently installers are
         //  wls, fmw, jdk.
@@ -56,7 +57,7 @@ public String generateKey(String id, String version) {
             }
         }
 
-        logger.finest("AbstractFile generating key returns " + mykey);
+        logger.exiting(mykey);
         return mykey;
     }
 
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
@@ -118,7 +118,7 @@ public CommandResponse call() throws Exception {
                         byte[] lsinventoryContent = Base64.getDecoder().decode(b64lsout);
                         lsinventoryText = new String(lsinventoryContent);
 
-                        logger.finest("ls inventory = " + lsinventoryText);
+                        logger.finer("ls inventory = " + lsinventoryText);
 
                         // Any better way to do this ?
 
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/InstallerFile.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/InstallerFile.java
@@ -32,12 +32,13 @@ public InstallerFile(CachePolicy cachePolicy, InstallerType type, String version
     @Override
     public String resolve(CacheStore cacheStore) throws Exception {
         // check entry exists in cache
-        logger.finest("InstallerFile resolve " + getKey());
-        String filePath = cacheStore.getValueFromCache(getKey());
+        String key = getKey();
+        logger.entering(key);
+        String filePath = cacheStore.getValueFromCache(key);
         if (!isFileOnDisk(filePath)) {
-            throw new Exception("Please download the installer manually and put it in the cache  " + getKey());
+            throw new Exception("Please download the installer manually and put it in the cache  " + key);
         }
-        logger.finest("InstallerFile resolve " + filePath);
+        logger.exiting(filePath);
 
         return filePath;
     }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/PatchFile.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/PatchFile.java
@@ -43,7 +43,7 @@ public PatchFile(CachePolicy cachePolicy, String category, String version, Strin
     public String resolve(CacheStore cacheStore) throws Exception {
         //patchId is null in case of latestPSU
 
-        logger.entering();
+        logger.entering(patchId);
         String filePath = cacheStore.getValueFromCache(getKey());
         boolean fileExists = isFileOnDisk(filePath);
 
@@ -53,13 +53,15 @@ public String resolve(CacheStore cacheStore) throws Exception {
             logger.fine("Could not find patch in cache category={0} version={1} patchId={2}",
                 category, version, patchId);
 
-            if (userId == null || password == null)
+            if (userId == null || password == null) {
                 throw new Exception(String.format(
-                        "Patch %s is not in the cache store and you have not provide Oracle Support "
-                                + "credentials in the command line.  Please provide --user with one of the password "
-                                + "option or "
-                                + "populate the cache store manually",
-                        patchId));
+                    "Patch %s is not in the cache store and you have not provide Oracle Support "
+                        + "credentials in the command line.  Please provide --user with one of the password "
+                        + "option or "
+                        + "populate the cache store manually",
+                    patchId));
+            }
+            logger.info("IMG-0018", patchId);
             filePath = downloadPatch(cacheStore);
         }
 
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
@@ -43,7 +43,7 @@ public static String getLatestPSUNumber(WLSInstallerType category, String versio
         logger.entering(category, version, userId);
         try {
             String releaseNumber = getReleaseNumber(category, version, userId, password);
-            SearchResult searchResult = getAllPSU(category, releaseNumber, userId, password);
+            SearchResult searchResult = getRecommendedPsuMetadata(category, releaseNumber, userId, password);
             if (searchResult.isSuccess()) {
                 Document results = searchResult.getResults();
                 String result = XPathUtil.applyXPathReturnString(results, "/results/patch[1]/name");
@@ -143,14 +143,14 @@ public static ValidationResult validatePatches(String inventoryContent, List<Str
             for (String patch : patches) {
 
                 if (patch == null) {
-                    logger.finest("Skipping null patch");
+                    logger.finer("Skipping null patch");
                     continue;
                 }
                 checkForMultiplePatches(patch, userId, password);
-                logger.info("Passed patch multiple versions test");
+                logger.fine("IMG-0021");
 
                 String bugReleaseNumber = ARUUtil.getPatchInfo(patch, userId, password);
-                logger.info(String.format("Patch %s release %s found ", patch, bugReleaseNumber));
+                logger.info("IMG-0022", patch, bugReleaseNumber);
                 int ind = patch.indexOf('_');
                 String baseBugNumber = patch;
                 if (ind > 0) {
@@ -265,18 +265,18 @@ private static Document getAllReleases(WLSInstallerType category, String userId,
         }
     }
 
-    private static SearchResult getAllPSU(WLSInstallerType category, String release, String userId, String password)
-        throws IOException {
-
-        String url;
-
-        if (WLSInstallerType.WLS == category)
-            url = String.format(Constants.LATEST_PSU_URL, Constants.WLS_PROD_ID, release);
-        else
-            url = String.format(Constants.LATEST_PSU_URL, Constants.FMW_PROD_ID, release);
+    private static SearchResult getRecommendedPsuMetadata(WLSInstallerType category, String release, String userId,
+                                                          String password) throws IOException {
 
-        return getSearchResult(HttpUtil.getXMLContent(url, userId, password));
+        logger.entering();
+        String productId = WLSInstallerType.WLS == category ? Constants.WLS_PROD_ID : Constants.FMW_PROD_ID;
+        String url = String.format(Constants.RECOMMENDED_PATCHES_URL, productId, release)
+            + Constants.ONLY_GET_RECOMMENDED_PSU;
+        logger.finer("getting PSU info from {0}", url);
 
+        SearchResult result = getSearchResult(HttpUtil.getXMLContent(url, userId, password));
+        logger.exiting();
+        return result;
     }
 
     private static String getPatch(String bugNumber, String userId, String password, String destDir)
@@ -404,7 +404,7 @@ private static String savePatch(Document allPatches, String userId, String passw
     private static String getPatchInfo(String bugNumber, String userId, String password)
             throws
             IOException {
-        logger.finest("Entering getPatchInfo " + bugNumber);
+        logger.entering(bugNumber);
 
         try {
             int ind = bugNumber.indexOf('_');
@@ -425,7 +425,7 @@ private static String getPatchInfo(String bugNumber, String userId, String passw
 
             logger.finest("applying xpath: " + xpath);
             String releaseNumber = XPathUtil.applyXPathReturnString(allPatches, xpath);
-            logger.finest(String.format("Exiting getPatchInfo %s = %s ", bugNumber, releaseNumber));
+            logger.exiting(releaseNumber);
             if (releaseNumber == null || "".equals(releaseNumber)) {
                 String error = String.format("Patch id %s not found", bugNumber);
                 logger.severe(error);
@@ -457,7 +457,7 @@ private static String getReleaseNumber(WLSInstallerType category, String version
         String key = category + CacheStore.CACHE_KEY_SEPARATOR + version;
         String retVal = releaseNumbersMap.getOrDefault(key, null);
         if (Utils.isEmptyString(retVal)) {
-            logger.info("IMG-0011");
+            logger.fine("Retrieving product release numbers from Oracle...");
             Document allReleases = getAllReleases(category, userId, password);
 
             String expression = String.format("string(/results/release[@name = '%s']/@id)", version);
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Constants.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Constants.java
@@ -14,6 +14,8 @@ public final class Constants {
     static final String REL_URL = "https://updates.oracle.com/Orion/Services/metadata?table=aru_releases";
     static final String LATEST_PSU_URL =
             "https://updates.oracle.com/Orion/Services/search?product=%s&release=%s";
+    static final String RECOMMENDED_PATCHES_URL = "https://updates.oracle.com//Orion/Services/search?patch_type=all&life_cycle=Recommended&product=%s&release=%s";
+    static final String ONLY_GET_RECOMMENDED_PSU = "&description=WLS%20PATCH%20SET%20UPDATE";
     static final String ARU_LANG_URL = "https://updates.oracle.com/Orion/Services/metadata?table=aru_languages";
     static final String PATCH_SEARCH_URL = "https://updates.oracle"
             + ".com/Orion/Services/search?product=%s&bug=%s&release=%s";
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/HttpUtil.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/HttpUtil.java
@@ -42,7 +42,7 @@ public class HttpUtil {
     private static final LoggingFacade logger = LoggingFactory.getLogger(HttpUtil.class);
 
     private static Document parseXmlString(String xmlString) throws ClientProtocolException {
-        logger.entering(xmlString);
+        logger.entering();
 
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -107,10 +107,11 @@ private static HttpClient getOraClient(String userId, String password) {
             credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(
                     userId, password));
         }
+        HttpClient result = HttpClientBuilder.create().setDefaultRequestConfig(config.build())
+            .setDefaultCookieStore(cookieStore).useSystemProperties()
+            .setDefaultCredentialsProvider(credentialsProvider).build();
         logger.exiting();
-        return HttpClientBuilder.create().setDefaultRequestConfig(config.build())
-                .setDefaultCookieStore(cookieStore).useSystemProperties()
-                .setDefaultCredentialsProvider(credentialsProvider).build();
+        return result;
     }
 
     /**
@@ -133,7 +134,7 @@ public static void downloadFile(String url, String fileName, String username, St
         } catch (Exception ex) {
             String message = String.format("Failed to download and save file %s from %s: %s", fileName, url,
                     ex.getLocalizedMessage());
-            logger.info(message);
+            logger.severe(message);
             throw new IOException(message, ex);
         }
         logger.exiting(fileName);
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java
@@ -203,11 +203,11 @@ public static void runDockerCommand(List<String> cmdBuilder, Path dockerLog)
         }
 
         ProcessBuilder processBuilder = new ProcessBuilder(cmdBuilder);
-        logger.finest("Starting docker process...");
+        logger.finer("Starting docker process...");
         final Process process = processBuilder.start();
-        logger.finest("Docker process started");
+        logger.finer("Docker process started");
         writeFromInputToOutputStreams(process.getInputStream(), outputStreams.toArray(new OutputStream[0]));
-        logger.finest("Waiting for Docker to finish");
+        logger.finer("Waiting for Docker to finish");
         if (process.waitFor() != 0) {
             processError(process);
         }
@@ -488,7 +488,7 @@ public static List<String> getDockerRunCmd(String hostDirToMount, String dockerI
         byte[] fileBytes = Files.readAllBytes(Paths.get(hostDirToMount + File.separator + scriptToRun));
         String encodedFile = Base64.getEncoder().encodeToString(fileBytes);
         String oneCommand = String.format("echo %s | base64 -d | /bin/bash", encodedFile);
-        logger.finest("ONE COMMAND [" + oneCommand + "]");
+        logger.finer("ONE COMMAND [" + oneCommand + "]");
         final List<String> retVal = Stream.of(
             "docker", "run",
             dockerImage, "/bin/bash", "-c", oneCommand).collect(Collectors.toList());
@@ -644,7 +644,7 @@ public static String getOpatchVersionFromZip(String fileName) {
             }
         } catch (IOException ioe) {
             logger.warning("Cannot read opatch file " + fileName);
-            logger.finest(ioe.getLocalizedMessage());
+            logger.finer(ioe.getLocalizedMessage());
         }
         return null;
     }
@@ -666,11 +666,10 @@ public static boolean validatePatchIds(List<String> patches, boolean rigid) {
         }
         if (patches != null && !patches.isEmpty()) {
             for (String patchId : patches) {
-                logger.finest("pattern match id " + patchId);
+                logger.finer("pattern match id " + patchId);
                 Matcher matcher = patchIdPattern.matcher(patchId);
                 if (!matcher.matches()) {
                     String errorFormat;
-                    String error;
                     if (rigid) {
                         errorFormat = "12345678_12.2.1.3.0";
                     } else {
@@ -702,7 +701,7 @@ public static void setOracleHome(String installerResponse, DockerfileOptions opt
         Path installerResponseFile = Paths.get(installerResponse);
         Pattern pattern = Pattern.compile("^\\s*ORACLE_HOME=(.*)?");
         Matcher matcher = pattern.matcher("");
-        logger.finest("Reading installer response file: {0}", installerResponseFile.getFileName());
+        logger.finer("Reading installer response file: {0}", installerResponseFile.getFileName());
 
         try {
             BufferedReader reader = new BufferedReader(new FileReader(installerResponseFile.toFile()));
diff --git a/imagetool/src/main/resources/ImageTool.properties b/imagetool/src/main/resources/ImageTool.properties
@@ -4,15 +4,20 @@ IMG-0002=User specified fromImage {0}
 IMG-0003=Temporary directory used for docker build context: {0}
 IMG-0004=Invalid patch id {0}. The patch id must be in the format of {1}.  Where the first part is the 8 digit patch ID, and the second half, after the underscore, is the release version for the patch. The release version needs to be specified with 5 places such as 12.2.1.3.0 or 12.2.1.3.190416. Release version is required when adding a patch to the cache or when multiple versions of the same patch number exist for different versions.
 IMG-0005=Installer response file: {0}
-IMG-0006=patch conflict check successful
+IMG-0006=No patch conflicts detected
 IMG-0007=WDT Download link = {0}
 IMG-0008=OPatch patch number {0} cached file {1} version {2}
 IMG-0009=skipping patch conflict check, no support credentials provided
 IMG-0010=Oracle Home will be set to {0}
-IMG-0011=Retrieving latest release information from Oracle
+IMG-0011=XXXX NOT USED
 IMG-0012=Validating patches
 IMG-0013=Error parsing additional build commands file {0}
 IMG-0014=Additional build command section, {0}, was not one of the valid sections: {1}
 IMG-0015=Additional build commands, adding {0} lines to section [{1}]
 IMG-0016=Image Tool build ID: {0}
 IMG-0017=Using {0} patch {1} from cache: {2}
+IMG-0018=Downloading patch {0}...
+IMG-0019=Finding patch number for latest PSU...
+IMG-0020=Latest PSU patch number is {0}
+IMG-0021=Passed patch multiple versions test
+IMG-0022=Patch {0} found for release {1}

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public AbstractFile(String id, String version, CachePolicy cachePolicy, String u`
`42`	`42`
`43`	`43`	`public String generateKey(String id, String version) {`
`44`	`44`
	`45`	`+ logger.entering(id, version);`
`45`	`46`	`// Note: this will be invoked by InstallerFile or PatchFile`
`46`	`47`	`// for patches there are specific format, currently installers are`
`47`	`48`	`// wls, fmw, jdk.`
`@@ -56,7 +57,7 @@ public String generateKey(String id, String version) {`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`
`59`		`- logger.finest("AbstractFile generating key returns " + mykey);`
	`60`	`+ logger.exiting(mykey);`
`60`	`61`	`return mykey;`
`61`	`62`	`}`
`62`	`63`