WIP Issue 368: actually prompt user again if pending migration detected

Author: kmanning

src/FlywayMigrationPlugin.groovy

@@ -20,9 +20,6 @@ class FlywayMigrationPlugin implements TerraformEnvironmentStagePlugin, Resettab
             withEnv(environmentVariables) {
                 def command = new FlywayCommand('info')
                 sh buildFlywayCommand(command)
-                if (confirmBeforeApply && hasPendingMigration(delegate)) {
-                    confirmMigration(delegate)
-                }
             }
         }
     }
@@ -42,7 +39,15 @@ class FlywayMigrationPlugin implements TerraformEnvironmentStagePlugin, Resettab
 
     public void confirmMigration(workflowScript) {
         def closure = {
-            sh "echo Pending migration detected, prompt again"
+            def userInput
+            try {
+                timeout(time: 1, unit: 'MINUTES') {
+                    userInput = input("There is a pending migration that will be applied immediately if you continue.  Please review the flyway info output.  Are you sure you want to continue?")
+                    sh "echo userInput was: ${userInput}"
+                }
+            } catch (ex) {
+                throw ex
+            }
         }
 
         closure.delegate = workflowScript
@@ -51,6 +56,10 @@ class FlywayMigrationPlugin implements TerraformEnvironmentStagePlugin, Resettab
 
     public Closure flywayMigrateClosure() {
         return { innerClosure ->
+            if (confirmBeforeApply && hasPendingMigration(delegate)) {
+                confirmMigration(delegate)
+            }
+
             innerClosure()
 
             def environmentVariables = buildEnvironmentVariableList(env)

test/FlywayMigrationPluginTest.groovy

@@ -103,73 +103,73 @@ class FlywayMigrationPluginTest {
 
             verify(mockWorkflowScript).withEnv(eq(expectedList), any(Closure.class))
         }
+    }
 
+    @Nested
+    public class FlywayMigrateClosure {
         @Test
-        void runsConfirmMigrationIfConfirmBeforeApplyAndHasPendingMigration() {
-            def plugin = spy(new FlywayMigrationPlugin())
-            doReturn(true).when(plugin).hasPendingMigration(any(Object.class))
-            FlywayMigrationPlugin.confirmBeforeApplyingMigration()
+        void runsTheNestedClosure() {
+            def plugin = new FlywayMigrationPlugin()
+            def iWasCalled = false
+            def nestedClosure = { -> iWasCalled = true }
 
-            def flywayClosure = plugin.flywayInfoClosure()
+            def flywayClosure = plugin.flywayMigrateClosure()
             flywayClosure.delegate = new MockWorkflowScript()
-            flywayClosure { -> }
+            flywayClosure(nestedClosure)
 
-            verify(plugin).confirmMigration(any(Object.class))
+            assertThat(iWasCalled, equalTo(true))
         }
 
         @Test
-        void doesNotRunConfirmMigrationIfNotConfirmBeforeApplyAndHasPendingMigration() {
+        void setsTheListOfOptionalEnvironmentVariables() {
             def plugin = spy(new FlywayMigrationPlugin())
-            doReturn(true).when(plugin).hasPendingMigration(any(Object.class))
+            def expectedList = ['KEY=value']
+            doReturn(expectedList).when(plugin).buildEnvironmentVariableList(any(List.class))
+            def flywayClosure = plugin.flywayMigrateClosure()
+            def mockWorkflowScript = spy(new MockWorkflowScript())
+            flywayClosure.delegate = mockWorkflowScript
 
-            def flywayClosure = plugin.flywayInfoClosure()
-            flywayClosure.delegate = new MockWorkflowScript()
             flywayClosure { -> }
 
-            verify(plugin, times(0)).confirmMigration(any(Object.class))
+            verify(mockWorkflowScript).withEnv(eq(expectedList), any(Closure.class))
         }
 
         @Test
-        void doesNotRunConfirmMigrationIfConfirmBeforeApplyAndDoesNotHavePendingMigration() {
+        void runsConfirmMigrationIfConfirmBeforeApplyAndHasPendingMigration() {
             def plugin = spy(new FlywayMigrationPlugin())
-            doReturn(false).when(plugin).hasPendingMigration(any(Object.class))
+            doReturn(true).when(plugin).hasPendingMigration(any(Object.class))
             FlywayMigrationPlugin.confirmBeforeApplyingMigration()
 
-            def flywayClosure = plugin.flywayInfoClosure()
+            def flywayClosure = plugin.flywayMigrateClosure()
             flywayClosure.delegate = new MockWorkflowScript()
             flywayClosure { -> }
 
-            verify(plugin, times(0)).confirmMigration(any(Object.class))
+            verify(plugin).confirmMigration(any(Object.class))
         }
-    }
 
-    @Nested
-    public class FlywayMigrateClosure {
         @Test
-        void runsTheNestedClosure() {
-            def plugin = new FlywayMigrationPlugin()
-            def iWasCalled = false
-            def nestedClosure = { -> iWasCalled = true }
+        void doesNotRunConfirmMigrationIfNotConfirmBeforeApplyAndHasPendingMigration() {
+            def plugin = spy(new FlywayMigrationPlugin())
+            doReturn(true).when(plugin).hasPendingMigration(any(Object.class))
 
             def flywayClosure = plugin.flywayMigrateClosure()
             flywayClosure.delegate = new MockWorkflowScript()
-            flywayClosure(nestedClosure)
+            flywayClosure { -> }
 
-            assertThat(iWasCalled, equalTo(true))
+            verify(plugin, times(0)).confirmMigration(any(Object.class))
         }
 
         @Test
-        void setsTheListOfOptionalEnvironmentVariables() {
+        void doesNotRunConfirmMigrationIfConfirmBeforeApplyAndDoesNotHavePendingMigration() {
             def plugin = spy(new FlywayMigrationPlugin())
-            def expectedList = ['KEY=value']
-            doReturn(expectedList).when(plugin).buildEnvironmentVariableList(any(List.class))
-            def flywayClosure = plugin.flywayMigrateClosure()
-            def mockWorkflowScript = spy(new MockWorkflowScript())
-            flywayClosure.delegate = mockWorkflowScript
+            doReturn(false).when(plugin).hasPendingMigration(any(Object.class))
+            FlywayMigrationPlugin.confirmBeforeApplyingMigration()
 
+            def flywayClosure = plugin.flywayMigrateClosure()
+            flywayClosure.delegate = new MockWorkflowScript()
             flywayClosure { -> }
 
-            verify(mockWorkflowScript).withEnv(eq(expectedList), any(Closure.class))
+            verify(plugin, times(0)).confirmMigration(any(Object.class))
         }
     }