chore(dependencies): upgrade liquibase to 4.24.0

kirangodishala · Nov 13, 2023 · 3aecb75 · 3aecb75
1 parent 5403c6a
commit 3aecb75
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/kork-sql/src/main/kotlin/com/netflix/spinnaker/kork/sql/config/SqlMigrationProperties.kt b/kork-sql/src/main/kotlin/com/netflix/spinnaker/kork/sql/config/SqlMigrationProperties.kt
@@ -15,6 +15,8 @@
  */
 package com.netflix.spinnaker.kork.sql.config
 
+import liquibase.GlobalConfiguration
+
 /**
  * Defines the configuration properties for connecting to a SQL database for schema migration purposes.
  *
@@ -23,11 +25,14 @@ package com.netflix.spinnaker.kork.sql.config
  * @param password The password to authenticate the [user]
  * @param driver The JDBC driver name
  * @param additionalChangeLogs A list of additional change log paths. This is useful for libraries and extensions.
+ * @param duplicateFileMode flag to handle if multiple files are found in the search path that have duplicate paths.
  */
 data class SqlMigrationProperties(
   var jdbcUrl: String? = null,
   var user: String? = null,
   var password: String? = null,
   var driver: String? = null,
-  var additionalChangeLogs: List<String> = mutableListOf()
+  var additionalChangeLogs: List<String> = mutableListOf(),
+  var duplicateFileMode: GlobalConfiguration.DuplicateFileMode = GlobalConfiguration.DUPLICATE_FILE_MODE.defaultValue
+
 )
diff --git a/kork-sql/src/main/kotlin/com/netflix/spinnaker/kork/sql/migration/SpringLiquibaseProxy.kt b/kork-sql/src/main/kotlin/com/netflix/spinnaker/kork/sql/migration/SpringLiquibaseProxy.kt
@@ -16,6 +16,8 @@
 package com.netflix.spinnaker.kork.sql.migration
 
 import com.netflix.spinnaker.kork.sql.config.SqlMigrationProperties
+import liquibase.GlobalConfiguration
+import liquibase.Scope
 import javax.sql.DataSource
 import liquibase.integration.spring.SpringLiquibase
 import org.springframework.jdbc.datasource.SingleConnectionDataSource
@@ -41,6 +43,7 @@ class SpringLiquibaseProxy(
   init {
     changeLog = "classpath:db/changelog-master.yml"
     dataSource = createDataSource()
+    labelFilter = "test" // this field is added to align with Liquibase versions 4.21.0 and above
   }
 
   /**
@@ -52,18 +55,20 @@ class SpringLiquibaseProxy(
     super.afterPropertiesSet()
 
     // Then if anything else has been defined, do that afterwards
-    (sqlMigrationProperties.additionalChangeLogs + korkAdditionalChangelogs)
-      .map {
-        SpringLiquibase().apply {
-          changeLog = "classpath:$it"
-          dataSource = createDataSource()
-          resourceLoader = this@SpringLiquibaseProxy.resourceLoader
-          shouldRun = !sqlReadOnly
+    Scope.child(GlobalConfiguration.DUPLICATE_FILE_MODE.key, sqlMigrationProperties.duplicateFileMode) {
+      (sqlMigrationProperties.additionalChangeLogs + korkAdditionalChangelogs)
+        .map {
+          SpringLiquibase().apply {
+            changeLog = "classpath:$it"
+            dataSource = createDataSource()
+            resourceLoader = this@SpringLiquibaseProxy.resourceLoader
+            shouldRun = !sqlReadOnly
+          }
         }
-      }
-      .forEach {
-        it.afterPropertiesSet()
-      }
+        .forEach {
+          it.afterPropertiesSet()
+        }
+    }
   }
 
   private fun createDataSource(): DataSource =

diff --git a/kork-sql/src/test/kotlin/com/netflix/spinnaker/kork/sql/SpringStartupTests.kt b/kork-sql/src/test/kotlin/com/netflix/spinnaker/kork/sql/SpringStartupTests.kt
@@ -30,6 +30,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Import
+import org.springframework.test.context.TestPropertySource
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import strikt.api.expectThat
 import strikt.assertions.isA
@@ -43,6 +44,7 @@ import strikt.assertions.isNotNull
     "sql.enabled=true",
     "sql.migration.jdbcUrl=jdbc:h2:mem:test",
     "sql.migration.dialect=H2",
+    "sql.migration.duplicateFileMode=WARN",
     "sql.connectionPool.jdbcUrl=jdbc:h2:mem:test",
     "sql.connectionPool.dialect=H2"
   ]

diff --git a/kork-sql/src/test/resources/application-test.yml b/kork-sql/src/test/resources/application-test.yml
@@ -26,10 +26,12 @@ sql:
     jdbcUrl: "jdbc:h2:mem:test"
     user:
     password:
+    duplicateFileMode: WARN
   secondaryMigration:
     jdbcUrl: "jdbc:h2:mem:test"
     user:
     password:
+    duplicateFileMode: WARN
 ---
 
 spring:
@@ -52,3 +54,4 @@ sql:
     jdbcUrl: "jdbc:h2:mem:test"
     user:
     password:
+    duplicateFileMode: WARN
diff --git a/spinnaker-dependencies/spinnaker-dependencies.gradle b/spinnaker-dependencies/spinnaker-dependencies.gradle
@@ -188,7 +188,7 @@ dependencies {
     // containing `afterColumn` construct, with a validation error for postgresql. So pin with 3.10.3
     api("org.liquibase:liquibase-core"){
        version {
-         strictly "3.10.3"
+         strictly "4.24.0"
        }
     }
     api("org.objenesis:objenesis:2.5.1")
@@ -204,7 +204,11 @@ dependencies {
     // when we upgrade to spring boot 2.6.x.  It's safe to upgrade beyond 1.29
     // with spring boot >= 2.6.12.  See
     // https://github.com/spring-projects/spring-boot/issues/32228#issue-136185850.0.
-    api("org.yaml:snakeyaml:1.27")
+    api("org.yaml:snakeyaml"){
+      version {
+        strictly "1.30"
+      }
+    }
     api("org.springdoc:springdoc-openapi-webmvc-core:${versions.openapi}")
     api("org.springdoc:springdoc-openapi-kotlin:${versions.openapi}")
     api("org.springframework.boot:spring-boot-configuration-processor:${versions.springBoot}")