Fixed #1477 Add -n flag to suppress credentials prompt

flyway · Jan 31, 2017 · 40e97af · 40e97af
1 parent 564f158
commit 40e97af
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java
@@ -85,7 +85,11 @@ public static void main(String[] args) {
             initializeDefaults(properties);
             loadConfiguration(properties, args);
             overrideConfiguration(properties, args);
-            promptForCredentialsIfMissing(properties);
+
+            if (!isSuppressPrompt(args)) {
+                promptForCredentialsIfMissing(properties);
+            }
+
             dumpConfiguration(properties);
 
             loadJdbcDrivers();
@@ -113,8 +117,16 @@ public static void main(String[] args) {
     }
 
     private static boolean isPrintVersionAndExit(String[] args) {
+        return isFlagSet(args, "-v");
+    }
+
+    private static boolean isSuppressPrompt(String[] args) {
+        return isFlagSet(args, "-n");
+    }
+
+    private static boolean isFlagSet(String[] args, String flag) {
         for (String arg : args) {
-            if ("-v".equals(arg)) {
+            if (flag.equals(arg)) {
                 return true;
             }
         }
@@ -257,6 +269,7 @@ private static void printUsage() {
         LOG.info("");
         LOG.info("Add -X to print debug output");
         LOG.info("Add -q to suppress all output, except for errors and warnings");
+        LOG.info("Add -n to suppress prompting for a user and password");
         LOG.info("Add -v to print the Flyway version and exit");
         LOG.info("");
         LOG.info("Example");