Refactor InternalResultServices

- Deleted RabbitMQ-related configurations, services, models, listeners, and associated event handling logic.
- Removed AMQP client implementation, event bus dependencies, and integration tests.
- Refactored remaining components to eliminate references to `InternalResultServices`, `eventBus`, and AMQP-related environments.
- Replace property `internalResultServices` by `databases` that now include `twincache` configuration and `storage` configuration
- Adjust configurations

Author: jreynard-code

api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestBase.kt

@@ -150,40 +150,29 @@ abstract class ControllerTestBase : AbstractTestcontainersRedisTestBase() {
     }
 
     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
-      }
+      registry.add("csm.platform.databases.data.host") { postgres.host }
+      registry.add("csm.platform.databases.data.port") { postgres.getMappedPort(POSTGRESQL_PORT) }
+      registry.add("csm.platform.databases.data.admin.username") { ADMIN_USER_CREDENTIALS }
+      registry.add("csm.platform.databases.data.admin.password") { ADMIN_USER_CREDENTIALS }
+      registry.add("csm.platform.databases.data.writer.username") { WRITER_USER_CREDENTIALS }
+      registry.add("csm.platform.databases.data.writer.password") { WRITER_USER_CREDENTIALS }
+      registry.add("csm.platform.databases.data.reader.username") { READER_USER_CREDENTIALS }
+      registry.add("csm.platform.databases.data.reader.password") { READER_USER_CREDENTIALS }
     }
   }
 
   @BeforeAll
   fun beforeAll() {
     redisStackServer.start()
+    localStackServer.start()
     postgres.start()
   }
 
   @AfterAll
   fun afterAll() {
     postgres.stop()
+    localStackServer.stop()
+    redisStackServer.stop()
   }
 
   override fun redisServers(): MutableCollection<RedisServer> {

api/src/integrationTest/resources/application-test.yml

@@ -29,14 +29,9 @@ spring:
 
 csm:
   platform:
-    internalResultServices:
-      enabled: true
-      eventBus:
-        enabled: false
     containerRegistry:
       checkSolutionImage: false
     identityProvider:
-      code: keycloak
       authorizationUrl: "http://fake_url:8080/authorize"
       tokenUrl: "http://fake_url:8080/token"
       containerScopes:
@@ -102,17 +97,30 @@ csm:
           - ReadWriteOnce
         requests:
           storage: 1Gi
-    twincache:
-      host: "localhost"
-      port: "6379"
-      username: "default"
-      # Leave it as blank as there's no auth with test container
-      password:
-      tls:
-        enabled: false
-        bundle: ""
-      connector:
-        default-page-size: 5
+    databases:
+      resources:
+        host: "localhost"
+        port: "6379"
+        username: "default"
+        # Leave it as blank as there's no auth with test container
+        password:
+        tls:
+          enabled: false
+          bundle: ""
+        connector:
+          default-page-size: 5
+      data:
+        admin:
+          password: "password"
+          username: cosmotech_api_admin
+        host: "localhost"
+        port: 5432
+        reader:
+          password: "password"
+          username: cosmotech_api_reader
+        writer:
+          password: "password"
+          username: cosmotech_api_writer
     rbac:
       enabled: true
     s3:

api/src/main/resources/application.yml

@@ -5,21 +5,14 @@ logging:
       OkHttpClient: WARN
 
 spring:
-  rabbitmq:
-    host: ${csm.platform.internalResultServices.eventBus.host}
-    port: ${csm.platform.internalResultServices.eventBus.port}
-    password: ${csm.platform.internalResultServices.eventBus.listener.password}
-    username: ${csm.platform.internalResultServices.eventBus.listener.username}
-    ssl:
-      enabled: ${csm.platform.internalResultServices.eventBus.tls.enabled}
   data:
     redis:
-      host: ${csm.platform.twincache.host}
-      port: ${csm.platform.twincache.port}
+      host: ${csm.platform.databases.resources.host}
+      port: ${csm.platform.databases.resources.port}
       ssl:
-        enabled: ${csm.platform.twincache.tls.enabled}
-      password: ${csm.platform.twincache.password}
-      username: ${csm.platform.twincache.username}
+        enabled: ${csm.platform.databases.resources.tls.enabled}
+      password: ${csm.platform.databases.resources.password}
+      username: ${csm.platform.databases.resources.username}
       timeout: 60000
       client-type: jedis
   servlet:
@@ -86,23 +79,23 @@ csm:
       downSamplingDefaultEnabled: false
       downSamplingRetentionDays: 400
       downSamplingBucketDurationMs: 3600000
-    twincache:
-      host: "localhost"
-      port: "6379"
-      username: "default_user"
-      password: "default_password"
-      tls:
-        enabled: false
-        bundle: ""
-      run:
-        maxResult: 200
-      runner:
-        maxResult: 200
-    internalResultServices:
-      enabled: false
-      storage:
+    databases:
+      resources:
+        host: "localhost"
+        port: "6379"
+        username: "default_user"
+        password: "default_password"
+        tls:
+          enabled: false
+          bundle: ""
+        run:
+          defaultPageSize: 200
+        runner:
+          defaultPageSize: 200
+      data:
         host: "localhost"
         port: 5432
+        schema: "cosmotech"
         reader:
           username: "storage_reader_username"
           password: "storage_reader_password"
@@ -112,22 +105,6 @@ csm:
         admin:
           username: "storage_admin_username"
           password: "storage_admin_password"
-      eventBus:
-        enabled: true
-        tls:
-          enabled: false
-          bundle: ""
-        host: "localhost"
-        port: 5672
-        default-exchange: "csm-exchange"
-        default-queue: "csm"
-        default-routing-key: "csm"
-        listener:
-          username: "eventbus_admin_username"
-          password: "eventbus_admin_password"
-        sender:
-          username: "eventbus_sender_username"
-          password: "eventbus_sender_password"
     s3:
       endpointUrl: "http://localhost:9000"
       bucketName: "cosmotech-api"