Replace CsmRedisTestBase with CsmTestBase to extend support for PostgreSQL and LocalStack test containers, and update dependencies for Testcontainers in Redis, PostgreSQL, and LocalStack.

Author: jreynard-code

build.gradle.kts

@@ -178,7 +178,9 @@ val detektVersion = "1.23.8"
 val jUnitBomVersion = "5.12.2"
 val mockkVersion = "1.14.0"
 val awaitilityKVersion = "4.3.0"
-val testcontainersRedis = "1.6.4"
+val testContainersRedisVersion = "1.6.4"
+val testContainersPostgreSQLVersion = "1.20.6"
+val testContainersLocalStackVersion = "1.20.6"
 
 dependencies {
   // https://youtrack.jetbrains.com/issue/KT-71057/POM-file-unusable-after-upgrading-to-2.0.20-from-2.0.10
@@ -231,8 +233,11 @@ dependencies {
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesCoreVersion")
   implementation("com.redis.om:redis-om-spring:${redisOMVersion}")
 
-  implementation("com.redis.testcontainers:testcontainers-redis-junit:$testcontainersRedis")
   implementation("org.springframework.boot:spring-boot-starter-test")
+  implementation(
+      "com.redis.testcontainers:testcontainers-redis-junit:${testContainersRedisVersion}")
+  implementation("org.testcontainers:postgresql:${testContainersPostgreSQLVersion}")
+  implementation("org.testcontainers:localstack:${testContainersLocalStackVersion}")
 
   testImplementation(kotlin("test"))
   testImplementation(platform("org.junit:junit-bom:${jUnitBomVersion}"))

src/main/kotlin/com/cosmotech/api/tests/CsmRedisTestBase.kt

@@ -0,0 +1,113 @@
+// Copyright (c) Cosmo Tech.
+// Licensed under the MIT license.
+package com.cosmotech.api.tests
+
+import com.redis.om.spring.annotations.EnableRedisDocumentRepositories
+import com.redis.testcontainers.RedisServer
+import com.redis.testcontainers.RedisStackContainer
+import com.redis.testcontainers.junit.AbstractTestcontainersRedisTestBase
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.BeforeAll
+import org.springframework.test.context.DynamicPropertyRegistry
+import org.springframework.test.context.DynamicPropertySource
+import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT
+import org.testcontainers.containers.localstack.LocalStackContainer
+import org.testcontainers.utility.DockerImageName
+import org.testcontainers.utility.MountableFile
+
+@EnableRedisDocumentRepositories(basePackages = ["com.cosmotech"])
+open class CsmTestBase : AbstractTestcontainersRedisTestBase() {
+
+  companion object {
+    private const val ADMIN_USER_CREDENTIALS = "adminusertest"
+    private const val READER_USER_CREDENTIALS = "readusertest"
+    private const val WRITER_USER_CREDENTIALS = "writeusertest"
+    private const val DEFAULT_REDIS_PORT = 6379
+    private const val LOCALSTACK_FULL_IMAGE_NAME = "localstack/localstack:3.5.0"
+
+    var postgres: PostgreSQLContainer<*> =
+        PostgreSQLContainer("postgres:alpine3.19")
+            .withCopyFileToContainer(
+                MountableFile.forClasspathResource("init-db.sql"), "/docker-entrypoint-initdb.d/")
+
+    var redisStackServer = RedisStackContainer(RedisStackContainer.DEFAULT_IMAGE_NAME)
+
+    val localStackServer =
+        LocalStackContainer(DockerImageName.parse(LOCALSTACK_FULL_IMAGE_NAME))
+            .withServices(LocalStackContainer.Service.S3)
+
+    init {
+      redisStackServer.start()
+      postgres.start()
+      localStackServer.start()
+      localStackServer.execInContainer("awslocal", "s3", "mb", "s3://test-bucket")
+    }
+
+    @JvmStatic
+    @DynamicPropertySource
+    fun connectionProperties(registry: DynamicPropertyRegistry) {
+      initPostgresConfiguration(registry)
+      initRedisConfiguration(registry)
+      initS3Configuration(registry)
+    }
+
+    private fun initRedisConfiguration(registry: DynamicPropertyRegistry) {
+      val containerIp =
+          redisStackServer.containerInfo.networkSettings.networks.entries
+              .elementAt(0)
+              .value
+              .ipAddress
+
+      registry.add("spring.data.redis.host") { containerIp }
+      registry.add("spring.data.redis.port") { DEFAULT_REDIS_PORT }
+    }
+
+    private fun initS3Configuration(registry: DynamicPropertyRegistry) {
+      registry.add("spring.cloud.aws.s3.endpoint") { localStackServer.endpoint }
+      registry.add("spring.cloud.aws.credentials.access-key") { localStackServer.accessKey }
+      registry.add("spring.cloud.aws.credentials.secret-key") { localStackServer.secretKey }
+      registry.add("spring.cloud.aws.s3.region") { localStackServer.region }
+    }
+
+    private fun initPostgresConfiguration(registry: DynamicPropertyRegistry) {
+      registry.add("csm.platform.internalResultServices.storage.host") { postgres.host }
+      registry.add("csm.platform.internalResultServices.storage.port") {
+        postgres.getMappedPort(POSTGRESQL_PORT)
+      }
+      registry.add("csm.platform.internalResultServices.storage.admin.username") {
+        ADMIN_USER_CREDENTIALS
+      }
+      registry.add("csm.platform.internalResultServices.storage.admin.password") {
+        ADMIN_USER_CREDENTIALS
+      }
+      registry.add("csm.platform.internalResultServices.storage.writer.username") {
+        WRITER_USER_CREDENTIALS
+      }
+      registry.add("csm.platform.internalResultServices.storage.writer.password") {
+        WRITER_USER_CREDENTIALS
+      }
+      registry.add("csm.platform.internalResultServices.storage.reader.username") {
+        READER_USER_CREDENTIALS
+      }
+      registry.add("csm.platform.internalResultServices.storage.reader.password") {
+        READER_USER_CREDENTIALS
+      }
+    }
+  }
+
+  @BeforeAll
+  fun beforeAll() {
+    redisStackServer.start()
+    postgres.start()
+  }
+
+  @AfterAll
+  fun afterAll() {
+    postgres.stop()
+  }
+
+  override fun redisServers(): MutableCollection<RedisServer> {
+    return mutableListOf(redisStackServer)
+  }
+}