Test fixing run_it

Author: jreynard-code

build.gradle.kts

@@ -54,7 +54,7 @@ val springWebVersion = "6.1.4"
 
 // Implementation
 val kotlinJvmTarget = 21
-val cosmotechApiCommonVersion = "1.0.1-SNAPSHOT"
+val cosmotechApiCommonVersion = "1.0.0"
 val cosmotechApiAzureVersion = "1.0.0"
 val jedisVersion = "4.4.6"
 val springOauthVersion = "6.2.2"

run/src/integrationTest/kotlin/com/cosmotech/run/service/CsmRunTestBase.kt

@@ -4,9 +4,14 @@ package com.cosmotech.run.service
 
 import com.cosmotech.api.tests.CsmRedisTestBase
 import com.rabbitmq.client.ConnectionFactory.DEFAULT_AMQP_PORT
+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.junit.jupiter.api.TestInstance
+import org.slf4j.LoggerFactory
 import org.springframework.test.context.DynamicPropertyRegistry
 import org.springframework.test.context.DynamicPropertySource
 import org.testcontainers.containers.PostgreSQLContainer
@@ -18,12 +23,17 @@ import org.testcontainers.utility.MountableFile
 
 @Testcontainers
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-open class CsmRunTestBase : CsmRedisTestBase() {
+@EnableRedisDocumentRepositories(basePackages = ["com.cosmotech"])
+open class CsmRunTestBase : 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 REDIS_STACK_LASTEST_TAG_WITH_GRAPH = "6.2.6-v9"
+
+    private val logger = LoggerFactory.getLogger(CsmRunTestBase::class.java)
 
     var postgres: PostgreSQLContainer<*> =
         PostgreSQLContainer("postgres:alpine3.19")
@@ -33,7 +43,12 @@ open class CsmRunTestBase : CsmRedisTestBase() {
     var rabbit: RabbitMQContainer =
         RabbitMQContainer(DockerImageName.parse("rabbitmq:3.7.25-management-alpine"))
 
+    var redisStackServer =
+        RedisStackContainer(
+            RedisStackContainer.DEFAULT_IMAGE_NAME.withTag(REDIS_STACK_LASTEST_TAG_WITH_GRAPH))
+
     init {
+      redisStackServer.start()
       rabbit.start()
       postgres.start()
     }
@@ -42,9 +57,26 @@ open class CsmRunTestBase : CsmRedisTestBase() {
     @DynamicPropertySource
     fun connectionProperties(registry: DynamicPropertyRegistry) {
       initPostgresConfiguration(registry)
+      initRedisConfiguration(registry)
       initRabbitMQConfiguration(registry)
     }
 
+    private fun initRedisConfiguration(registry: DynamicPropertyRegistry) {
+      logger.error("Override properties to connect to Testcontainers:")
+      val containerIp =
+          redisStackServer.containerInfo.networkSettings.networks.entries
+              .elementAt(0)
+              .value
+              .ipAddress
+      logger.error(
+          "* Test-Container 'Redis': spring.data.redis.host = {} ; spring.data.redis.port = {}",
+          containerIp,
+          DEFAULT_REDIS_PORT)
+
+      registry.add("spring.data.redis.host") { containerIp }
+      registry.add("spring.data.redis.port") { DEFAULT_REDIS_PORT }
+    }
+
     private fun initRabbitMQConfiguration(registry: DynamicPropertyRegistry) {
       registry.add("spring.rabbitmq.host") { rabbit.host }
       registry.add("spring.rabbitmq.port") { rabbit.getMappedPort(DEFAULT_AMQP_PORT) }
@@ -86,6 +118,7 @@ open class CsmRunTestBase : CsmRedisTestBase() {
 
   @BeforeAll
   fun beforeAll() {
+    redisStackServer.start()
     rabbit.start()
     postgres.start()
   }
@@ -95,4 +128,8 @@ open class CsmRunTestBase : CsmRedisTestBase() {
     rabbit.stop()
     postgres.stop()
   }
+
+  override fun redisServers(): MutableCollection<RedisServer> {
+    return mutableListOf(CsmRedisTestBase.redisStackServer)
+  }
 }