Fix Dev Deployment Failure due to Flyway DB Migration Issue (#1104)

build/docker/.env

@@ -17,3 +17,4 @@ JDBC_URL=jdbc:mariadb://vinyldns-integration:19002/vinyldns?user=root&password=p
 JDBC_MIGRATION_URL=jdbc:mariadb://vinyldns-integration:19002/?user=root&password=pass
 JDBC_USER=root
 JDBC_PASSWORD=pass
+FLYWAY_OUT_OF_ORDER=false

build/docker/api/application.conf

@@ -186,6 +186,8 @@ vinyldns {
       user = ${?JDBC_USER}
       password = "pass"
       password = ${?JDBC_PASSWORD}
+      flyway-out-of-order = false
+      flyway-out-of-order = ${?FLYWAY_OUT_OF_ORDER}
     }
 
     # TODO: Remove the need for these useless configuration blocks

modules/api/src/it/resources/application.conf

@@ -186,6 +186,8 @@ vinyldns {
       user = ${?JDBC_USER}
       password = "pass"
       password = ${?JDBC_PASSWORD}
+      flyway-out-of-order = false
+      flyway-out-of-order = ${?FLYWAY_OUT_OF_ORDER}
     }
 
     # TODO: Remove the need for these useless configuration blocks

modules/api/src/main/resources/application.conf

@@ -186,6 +186,8 @@ vinyldns {
       user = ${?JDBC_USER}
       password = "pass"
       password = ${?JDBC_PASSWORD}
+      flyway-out-of-order = false
+      flyway-out-of-order = ${?FLYWAY_OUT_OF_ORDER}
     }
 
     # TODO: Remove the need for these useless configuration blocks

modules/api/src/test/resources/application.conf

@@ -195,6 +195,8 @@ vinyldns {
       user = ${?JDBC_USER}
       password = "pass"
       password = ${?JDBC_PASSWORD}
+      flyway-out-of-order = false
+      flyway-out-of-order = ${?FLYWAY_OUT_OF_ORDER}
     }
 
     # TODO: Remove the need for these useless configuration blocks

modules/api/src/universal/conf/application.conf

@@ -186,6 +186,8 @@ vinyldns {
       user = ${?JDBC_USER}
       password = "pass"
       password = ${?JDBC_PASSWORD}
+      flyway-out-of-order = false
+      flyway-out-of-order = ${?FLYWAY_OUT_OF_ORDER}
     }
 
     # TODO: Remove the need for these useless configuration blocks

modules/mysql/src/it/resources/application.conf

@@ -13,6 +13,7 @@ mysql {
     url = "jdbc:mariadb://"${mysql.endpoint}"/vinyldns2"
     user = "root"
     password = "pass"
+    flyway-out-of-order = false
 
     # see https://github.com/brettwooldridge/HikariCP
     connection-timeout-millis = 1000
@@ -49,6 +50,7 @@ queue {
     url = "jdbc:mariadb://"${mysql.endpoint}"/vinyldns2?user=root&password=pass"
     user = "root"
     password = "pass"
+    flyway-out-of-order = false
 
     # see https://github.com/brettwooldridge/HikariCP
     connection-timeout-millis = 1000

modules/mysql/src/main/scala/vinyldns/mysql/MySqlConnectionConfig.scala

@@ -35,6 +35,7 @@ final case class MySqlConnectionConfig(
     url: String,
     user: String,
     password: String,
+    flywayOutOfOrder: Boolean,
     migrationSchemaTable: Option[String],
     // Optional settings, will use Hikari defaults if unset
     // see https://github.com/brettwooldridge/HikariCP#frequently-used

modules/mysql/src/main/scala/vinyldns/mysql/MySqlConnector.scala

@@ -48,6 +48,7 @@ object MySqlConnector {
         val placeholders = Map("dbName" -> config.name)
         val migration = Flyway
           .configure()
+          .outOfOrder(config.flywayOutOfOrder)
           .dataSource(migrationDataSource)
           .placeholders(placeholders.asJava)
           .schemas(config.name)

modules/mysql/src/test/resources/application.conf

@@ -11,6 +11,7 @@ mysql {
     url = "url"
     user = "some-user"
     password = "some-pass"
+    flyway-out-of-order = false
 
     # see https://github.com/brettwooldridge/HikariCP
     connection-timeout-millis = 1000

modules/mysql/src/test/scala/vinyldns/mysql/MySqlConnectionConfigSpec.scala

@@ -55,6 +55,7 @@ class MySqlConnectionConfigSpec extends AnyWordSpec with Matchers {
           |    url = "url"
           |    user = "some-user"
           |    password = "some-pass"
+          |    flyway-out-of-order = false
           |  }
           |  """.stripMargin)
 

modules/portal/conf/application-test.conf

@@ -18,6 +18,7 @@ mysql {
     url = "http://foo.bar"
     user = "root"
     password = "pass"
+    flyway-out-of-order = false
   }
 
   repositories {

quickstart/.env

@@ -23,3 +23,4 @@ JDBC_URL=jdbc:mariadb://vinyldns-integration:19002/vinyldns?user=root&password=p
 JDBC_MIGRATION_URL=jdbc:mariadb://vinyldns-integration:19002/?user=root&password=pass
 JDBC_USER=root
 JDBC_PASSWORD=pass
+FLYWAY_OUT_OF_ORDER=false

test/api/functional/application.conf

@@ -132,6 +132,8 @@ vinyldns {
       user = ${?JDBC_USER}
       password = "pass"
       password = ${?JDBC_PASSWORD}
+      flyway-out-of-order = false
+      flyway-out-of-order = ${?FLYWAY_OUT_OF_ORDER}
       # see https://github.com/brettwooldridge/HikariCP
       connection-timeout-millis = 1000
       idle-timeout = 10000

test/api/integration/application.conf

@@ -187,6 +187,8 @@ vinyldns {
       user = ${?JDBC_USER}
       password = "pass"
       password = ${?JDBC_PASSWORD}
+      flyway-out-of-order = false
+      flyway-out-of-order = ${?FLYWAY_OUT_OF_ORDER}
       # see https://github.com/brettwooldridge/HikariCP
       connection-timeout-millis = 1000
       idle-timeout = 10000