Merge pull request #32 from FigureTechnologies/flyway-default-removal

Flyway default removal
FigureTechnologies · Nov 2, 2022 · 94885f3 · 94885f3
2 parents 952994c + ab1b559
commit 94885f3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/server/src/main/kotlin/tech/figure/objectstore/gateway/configuration/AppProperties.kt b/server/src/main/kotlin/tech/figure/objectstore/gateway/configuration/AppProperties.kt
@@ -52,6 +52,6 @@ data class DatabaseProperties(
     val port: String,
     val schema: String,
     @Pattern(value = "\\d{1,2}") val connectionPoolSize: String,
-    val baselineOnMigrate: Boolean,
-    val repairFlywayChecksums: Boolean,
+    val baselineOnMigrate: Boolean = false,
+    val repairFlywayChecksums: Boolean = false,
 )
diff --git a/server/src/main/kotlin/tech/figure/objectstore/gateway/configuration/DataConfig.kt b/server/src/main/kotlin/tech/figure/objectstore/gateway/configuration/DataConfig.kt
@@ -85,17 +85,17 @@ class DataConfig {
         if (databaseProperties.type != "postgresql") {
             baseline()
         }
+        if (databaseProperties.repairFlywayChecksums) {
+            logger.warn("Flyway checksum repair has been requested! This should only be enabled temporarily. Set db.repairFlywayChecks=false or omit the value ASAP")
+            repair()
+        }
     }
 
     @Bean
     fun flywayInitializer(flyway: Flyway): FlywayMigrationInitializer = FlywayMigrationInitializer(flyway)
 
     @Bean("MigrationsExecuted")
     fun flywayMigration(dataSource: DataSource, databaseProperties: DatabaseProperties, flyway: Flyway): Int {
-        if (databaseProperties.repairFlywayChecksums) {
-            logger.warn("Flyway checksum repair has been requested! This should only be enabled temporarily. Set db.repairFlywayChecks=false or omit the value ASAP")
-            flyway.repair()
-        }
         flyway.info().all().forEach { logger.info("Flyway migration: ${it.script}") }
         return flyway.migrate().migrationsExecuted
     }

diff --git a/server/src/test/kotlin/tech/figure/objectstore/gateway/db/MemoryMigrationsTest.kt b/server/src/test/kotlin/tech/figure/objectstore/gateway/db/MemoryMigrationsTest.kt
@@ -22,7 +22,6 @@ class MemoryMigrationsTest {
             schema = "object-store-gateway",
             connectionPoolSize = "1",
             baselineOnMigrate = false,
-            repairFlywayChecksums = false,
         )
         DbMigrationTester(properties).removeDatabaseTables().testMigrations()
     }

diff --git a/server/src/test/kotlin/tech/figure/objectstore/gateway/db/PostgresqlMigrationsTest.kt b/server/src/test/kotlin/tech/figure/objectstore/gateway/db/PostgresqlMigrationsTest.kt
@@ -61,6 +61,5 @@ class PostgresqlMigrationsTest {
         schema = "object-store-gateway",
         connectionPoolSize = "1",
         baselineOnMigrate = false,
-        repairFlywayChecksums = false,
     )
 }
diff --git a/server/src/test/kotlin/tech/figure/objectstore/gateway/db/SqliteMigrationsTest.kt b/server/src/test/kotlin/tech/figure/objectstore/gateway/db/SqliteMigrationsTest.kt
@@ -19,7 +19,6 @@ class SqliteMigrationsTest {
             schema = "object-store-gateway",
             connectionPoolSize = "1",
             baselineOnMigrate = false,
-            repairFlywayChecksums = false,
         )
         DbMigrationTester(properties).testMigrations()
     }

diff --git a/server/src/test/resources/application.properties b/server/src/test/resources/application.properties
@@ -25,4 +25,3 @@ db.port=""
 db.schema=object-store-gateway
 db.connectionPoolSize=1
 db.baselineOnMigrate=true
-db.repairFlywayChecksums=false