chore(dependencies): Autobump korkVersion (#6155)

* chore(dependencies): Autobump korkVersion * fix(sql/test): render list as a string in saga_ids field of tasks table in SqlTaskCleanupAgentTest jooq 3.14.16 complains: Caused by: java.sql.SQLException: Error while writing value at JDBC bind index: 5 at org.jooq.impl.DefaultBindContext.bindValue0(DefaultBindContext.java:67) at org.jooq.impl.AbstractBindContext.bindValue(AbstractBindContext.java:124) ... 120 more Caused by: org.jooq.exception.SQLDialectNotSupportedException: Type class java.util.ArrayList is not supported in dialect MYSQL Even if jooq doesn't complain, this feels like the more correct way to provide a value for this field, and matches what SqlTaskRepository does. * fix(cats/sql): keep up with API changes from jooq 3.13 to 3.14 See https://www.jooq.org/api-diff/3.13-3.14, jOOQ/jOOQ#10512 and jOOQ/jOOQ#10064. --------- Co-authored-by: root <root@2b5a6b05cb3f> Co-authored-by: David Byron <dbyron@salesforce.com>
spinnaker · Feb 20, 2024 · 3f31190 · 3f31190
1 parent 9ee7ca1
commit 3f31190
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/cats/cats-sql/src/test/groovy/com/netflix/spinnaker/cats/sql/SqlCacheSpec.groovy b/cats/cats-sql/src/test/groovy/com/netflix/spinnaker/cats/sql/SqlCacheSpec.groovy
@@ -117,6 +117,6 @@ abstract class SqlCacheSpec extends WriteableCacheSpec {
     null                                                   || DSL.field("meowdy").eq("partner") || "meowdy = 'partner'"
     RelationshipCacheFilter.include("instances", "images") || null                              || "(\n  rel_type like 'instances%'\n  or rel_type like 'images%'\n)"
     RelationshipCacheFilter.include("images")              || DSL.field("meowdy").eq("partner") || "(\n  meowdy = 'partner'\n  and rel_type like 'images%'\n)"
-    null                                                   || null                              || "1 = 1"
+    null                                                   || null                              || "true"
   }
 }
diff --git a/...l/src/test/kotlin/com/netflix/spinnaker/cats/sql/cache/SqlUnknownAgentCleanupAgentTest.kt b/...l/src/test/kotlin/com/netflix/spinnaker/cats/sql/cache/SqlUnknownAgentCleanupAgentTest.kt
@@ -56,7 +56,6 @@ class SqlUnknownAgentCleanupAgentTest : JUnit5Minutests {
 
     after {
       SqlTestUtil.cleanupDb(dslContext)
-      dslContext.close()
     }
 
     context("test and prod accounts exist") {

diff --git a/...iver-sql/src/test/kotlin/com/netflix/spinnaker/clouddriver/sql/SqlTaskCleanupAgentTest.kt b/...iver-sql/src/test/kotlin/com/netflix/spinnaker/clouddriver/sql/SqlTaskCleanupAgentTest.kt
@@ -17,6 +17,7 @@
 
 package com.netflix.spinnaker.clouddriver.sql
 
+import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spectator.api.NoopRegistry
 import com.netflix.spinnaker.clouddriver.sql.event.SqlEventCleanupAgent
 import com.netflix.spinnaker.config.SqlEventCleanupAgentConfigProperties
@@ -43,6 +44,7 @@ class SqlTaskCleanupAgentTest : JUnit5Minutests {
     }
 
     before {
+
       listOf(
         Instant.now().minus(3, ChronoUnit.DAYS),
         Instant.now().minus(10, ChronoUnit.DAYS),
@@ -54,7 +56,7 @@ class SqlTaskCleanupAgentTest : JUnit5Minutests {
             "7b96fe8de1e5e8e8620036480771195b8e25c583c9f4f0098a23e97bf2ba013b",
             "95637b33-6699-4abf-b1ab-d4077e1cf867@spin-clouddriver-7847bc646b-hgkfd",
             ts.toEpochMilli(),
-            mutableListOf<String>()
+            objectMapper.writeValueAsString(mutableListOf<String>())
           )
           .execute()
 
@@ -153,5 +155,7 @@ class SqlTaskCleanupAgentTest : JUnit5Minutests {
       registry = NoopRegistry(),
       SqlTaskCleanupAgentProperties()
     )
+
+    val objectMapper = ObjectMapper()
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 fiatVersion=1.43.0
-korkVersion=7.213.0
+korkVersion=7.214.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
 targetJava11=true