refactor(gradle): utility method to find dbImage

zero88 · Mar 30, 2024 · a8aac59 · a8aac59
1 parent 251f854
commit a8aac59
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/jooqx.yml b/.github/workflows/jooqx.yml
@@ -63,8 +63,8 @@ jobs:
 #        java: [ '8', '17', '21' ]
         java: [ '8', '17' ]
         os: [ 'ubuntu-latest' ]
-        itProfile: [ 'pg:10-alpine', 'pg:12-alpine', 'pg:14-alpine', 'pg:16-alpine', 'h2', 'mysql:8.3', 'mysql:8.0', 'mysql:5.7' ]
-        sonarProfile: [ 'pg:16-alpine' ]
+        itProfile: [ 'postgres:12-alpine', 'postgres:14-alpine', 'postgres:16-alpine', 'h2', 'mysql:8.3', 'mysql:8.0' ]
+        sonarProfile: [ 'postgres:16-alpine' ]
       fail-fast: false
     name: Test ${{ matrix.itProfile }} | Java ${{ matrix.java }} (${{ matrix.os }})
     with:

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,3 +1,5 @@
+import org.gradle.api.Project
+
 private fun Map<Int, List<Int>>.ver(minor: Int, patch: Int): String = "${minor}.${this[minor]?.get(patch)}"
 
 object UtilLibs {
@@ -37,7 +39,8 @@ object TestLibs {
     object Version {
 
         const val junit5 = "5.10.2"
-//        const val pioneer = "2.2.0" // java > 11
+
+        //        const val pioneer = "2.2.0" // java > 11
         const val pioneer = "1.9.1" // java 8
         const val testContainer = "1.19.7"
     }
@@ -165,8 +168,25 @@ object DatabaseLibs {
 
 object DatabaseContainer {
 
-    val postgres = listOf("16-alpine", "14-alpine", "12-alpine")
-    val mysql = listOf("8.3", "8.0", "5.7")
+    data class Container(val defaultImage: String, val jdbcPrefix: String, val supportedVersions: List<String>) {}
+
+    enum class Containers(val container: Container) {
+        // https://endoflife.date/postgresql
+        postgres(Container("postgres:16-alpine", "postgresql", listOf("16-alpine", "14-alpine", "12-alpine"))),
+
+        // https://endoflife.date/mysql
+        mysql(Container("mysql:8.3", "mysql", listOf("8.3", "8.0")))
+    }
+
+    fun findImage(project: Project): String {
+        val container = Containers.valueOf(project.name).container
+        val version = project.findProperty("dbVersion");
+        val jdbcDbImage: String = when (version) {
+            in container.supportedVersions -> container.defaultImage.replaceAfter(":", "$version")
+            else                           -> container.defaultImage
+        }
+        return jdbcDbImage.replaceBefore(":", container.jdbcPrefix)
+    }
 }
 
 object ZeroLibs {

diff --git a/integtest/mysql/build.gradle.kts b/integtest/mysql/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 }
 
 val dialect = "org.jooq.meta.mysql.MySQLDatabase"
-val dbImage = "mysql:${prop(project, "dbVersion", DatabaseContainer.mysql[0])}"
+val dbImage = DatabaseContainer.findImage(project)
 fun getSchema(schemaFile: String): String = "${buildDir}/resources/main/${schemaFile}"
 
 jooq {

diff --git a/integtest/postgres/build.gradle.kts b/integtest/postgres/build.gradle.kts
@@ -1,5 +1,4 @@
 import cloud.playio.gradle.jooq.JooqJdbcContainer
-import cloud.playio.gradle.shared.prop
 import nu.studer.gradle.jooq.JooqGenerate
 import org.jooq.meta.jaxb.ForcedType
 import org.jooq.meta.jaxb.Logging
@@ -24,7 +23,7 @@ dependencies {
 }
 
 val dialect = "org.jooq.meta.postgres.PostgresDatabase"
-val dbImage = "postgresql:${prop(project, "dbVersion", DatabaseContainer.postgres[0])}"
+val dbImage = DatabaseContainer.findImage(project)
 fun getSchema(schemaFile: String): String = "${buildDir}/resources/main/${schemaFile}"
 
 jooq {