do not ask password if useCache set to always

Author: gosurya-oracle

src/main/java/com/oracle/weblogicx/imagebuilder/cli/menu/ImageOperation.java

@@ -30,9 +30,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.oracle.weblogicx.imagebuilder.api.model.CachePolicy.ALWAYS;
 import static com.oracle.weblogicx.imagebuilder.util.Constants.BUILD_ARG;
 import static com.oracle.weblogicx.imagebuilder.util.Constants.HTTP;
 import static com.oracle.weblogicx.imagebuilder.util.Constants.HTTPS;
@@ -57,9 +60,12 @@ public abstract class ImageOperation implements Callable<CommandResponse> {
     @Override
     public CommandResponse call() throws Exception {
         handleProxyUrls();
-        // check user support credentials if we are applying any patches
-        if (latestPSU || !patches.isEmpty()) {
-            password = handlePasswordOptions();
+        password = handlePasswordOptions();
+        // check user support credentials if useCache not set to always and we are applying any patches
+        if (latestPSU || (!patches.isEmpty() && useCache != ALWAYS)) {
+            if (Utils.isEmptyString(password)) {
+                return new CommandResponse(-1, "Failed to determine password. use one of the options to input password");
+            }
             if (!ARUUtil.checkCredentials(userId, password)) {
                 return new CommandResponse(-1, "user Oracle support credentials do not match");
             }
@@ -96,11 +102,12 @@ List<String> handlePatchFiles(Path tmpDir, Path tmpPatchesDir) throws Exception
             patchLocations.add(psuResolver.resolve(cacheStore));
         }
         if (patches != null && !patches.isEmpty()) {
+            Pattern patchIdPattern = Pattern.compile(PATCH_ID_REGEX);
             for (String patchId : patches) {
-                if (patchId.matches(PATCH_ID_REGEX)) {
-                    patchId = patchId.substring(1);
-                    patchLocations.add(new PatchFile(useCache, installerType.toString(), installerVersion, patchId, userId,
-                            password).resolve(cacheStore));
+                Matcher matcher = patchIdPattern.matcher(patchId);
+                if (matcher.matches() && matcher.groupCount() > 0) {
+                    patchLocations.add(new PatchFile(useCache, installerType.toString(), installerVersion,
+                            matcher.group(1), userId, password).resolve(cacheStore));
                 } else {
                     logger.severe("Ignoring invalid patch id format: " + patchId);
                 }

src/main/java/com/oracle/weblogicx/imagebuilder/impl/PatchFile.java

@@ -13,7 +13,6 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.logging.Logger;
 
 import static com.oracle.weblogicx.imagebuilder.api.meta.CacheStore.CACHE_KEY_SEPARATOR;
@@ -28,10 +27,6 @@ public class PatchFile extends AbstractFile {
 
     public PatchFile(CachePolicy cachePolicy, String category, String version, String patchId, String userId, String password) {
         super(null, cachePolicy, userId, password);
-//        if (cachePolicy != ALWAYS) {
-//            Objects.requireNonNull(userId, "userId cannot be null");
-//            Objects.requireNonNull(password, "password cannot be null");
-//        }
         this.category = category;
         this.version = version;
         this.patchId = patchId;

src/main/java/com/oracle/weblogicx/imagebuilder/util/Constants.java

@@ -40,7 +40,7 @@ public final class Constants {
     public static final String CACHE_STORE_TYPE = "cacheStoreType";
     public static final String HTTP = "http";
     public static final String HTTPS = "https";
-    public static final String PATCH_ID_REGEX = "^[pP]\\d+";
+    public static final String PATCH_ID_REGEX = "^[pP]?(\\d+)";
 
     private Constants() {
         //restrict access

src/main/java/com/oracle/weblogicx/imagebuilder/util/Utils.java

@@ -531,6 +531,6 @@ public static String getPasswordFromInputs(String passwordStr, Path passwordFile
         } else if (!isEmptyString(passwordEnv) && !isEmptyString(System.getenv(passwordEnv))) {
             return System.getenv(passwordEnv);
         }
-        throw new IOException("Failed to determine password. use one of the options to input password");
+        return null;
     }
 }