[NO_MERGE] Rebase postgres on master

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "james-project"]
 	path = james-project
 	url = https://github.com/apache/james-project
+	branch = postgresql

Jenkinsfile

@@ -44,22 +44,15 @@ pipeline {
         stage('Deliver Docker images') {
           when {
             anyOf {
-              branch 'master'
+              branch 'postgresql'
               buildingTag()
             }
           }
           steps {
             script {
-              env.DOCKER_TAG = 'branch-master'
-              if (env.TAG_NAME) {
-                env.DOCKER_TAG = env.TAG_NAME
-              }
-
-              echo "Docker tag: ${env.DOCKER_TAG}"
               // build and push docker images
               dir("tmail-backend") {
-                sh 'mvn -Pci jib:build -Djib.to.auth.username=$DOCKER_HUB_CREDENTIAL_USR -Djib.to.auth.password=$DOCKER_HUB_CREDENTIAL_PSW -Djib.to.tags=distributed-$DOCKER_TAG -pl apps/distributed -X'
-                sh 'mvn -Pci jib:build -Djib.to.auth.username=$DOCKER_HUB_CREDENTIAL_USR -Djib.to.auth.password=$DOCKER_HUB_CREDENTIAL_PSW -Djib.to.tags=memory-$DOCKER_TAG -pl apps/memory -X'
+                sh 'mvn -Pci jib:build -Djib.to.auth.username=$DOCKER_HUB_CREDENTIAL_USR -Djib.to.auth.password=$DOCKER_HUB_CREDENTIAL_PSW -Djib.to.image=linagora/tmail-backend:postgresql-experimental -Djib.to.tags=postgresql-experimental -pl apps/postgres -X'
               }
             }
           }

tmail-backend/apps/distributed/pom.xml

@@ -73,6 +73,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>team-mailboxes-guice</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tmail-guice-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>tmail-guice-distributed</artifactId>

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedEmailAddressContactEventDeadLettersModule.java

@@ -1,28 +1,21 @@
 package com.linagora.tmail.james.app;
 
-
-import org.apache.james.events.CassandraEventDeadLetters;
-import org.apache.james.events.CassandraEventDeadLettersDAO;
-import org.apache.james.events.CassandraEventDeadLettersGroupDAO;
 import org.apache.james.events.EventDeadLetters;
 
-import com.datastax.oss.driver.api.core.CqlSession;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 import com.linagora.tmail.james.jmap.EmailAddressContactInjectKeys;
-import com.linagora.tmail.james.jmap.contact.TmailJmapEventSerializer;
 
 public class DistributedEmailAddressContactEventDeadLettersModule extends AbstractModule {
 
+    // TODO: for pass ci on postgresql branch,
+    // It should be replaced by https://github.com/linagora/tmail-backend/pull/1016  (when rebase master branch)
     @Provides
     @Singleton
     @Named(EmailAddressContactInjectKeys.AUTOCOMPLETE)
-    EventDeadLetters provideEventDeadLetters(CassandraEventDeadLettersGroupDAO cassandraEventDeadLettersGroupDAO,
-                                             CqlSession session,
-                                             TmailJmapEventSerializer tmailJmapEventSerializer) {
-        return new CassandraEventDeadLetters(new CassandraEventDeadLettersDAO(session, tmailJmapEventSerializer),
-            cassandraEventDeadLettersGroupDAO);
+    EventDeadLetters provideEventDeadLetters(EventDeadLetters eventDeadLetters) {
+        return eventDeadLetters;
     }
 }

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedJamesConfiguration.java

@@ -20,8 +20,8 @@
 
 import com.github.fge.lambdas.Throwing;
 import com.linagora.tmail.OpenPaasModuleChooserConfiguration;
+import com.linagora.tmail.UsersRepositoryModuleChooser;
 import com.linagora.tmail.blob.guice.BlobStoreConfiguration;
-import com.linagora.tmail.combined.identity.UsersRepositoryModuleChooser;
 import com.linagora.tmail.encrypted.MailboxConfiguration;
 import com.linagora.tmail.james.jmap.firebase.FirebaseModuleChooserConfiguration;
 import com.linagora.tmail.james.jmap.service.discovery.LinagoraServicesDiscoveryModuleChooserConfiguration;

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java

@@ -49,6 +49,7 @@
 import org.apache.james.modules.data.CassandraSieveQuotaLegacyModule;
 import org.apache.james.modules.data.CassandraSieveQuotaModule;
 import org.apache.james.modules.data.CassandraSieveRepositoryModule;
+import org.apache.james.modules.data.CassandraUsersRepositoryModule;
 import org.apache.james.modules.data.CassandraVacationModule;
 import org.apache.james.modules.event.JMAPEventBusModule;
 import org.apache.james.modules.event.RabbitMQEventBusModule;
@@ -103,6 +104,7 @@
 import org.apache.james.quota.search.QuotaSearcher;
 import org.apache.james.quota.search.scanning.ScanningQuotaSearcher;
 import org.apache.james.rate.limiter.redis.RedisRateLimiterModule;
+import org.apache.james.user.cassandra.CassandraUsersDAO;
 import org.apache.james.utils.InitializationOperation;
 import org.apache.james.utils.InitilizationOperationBuilder;
 import org.apache.james.vault.VaultConfiguration;
@@ -120,13 +122,14 @@
 import com.google.inject.multibindings.ProvidesIntoSet;
 import com.google.inject.name.Names;
 import com.google.inject.util.Modules;
+import com.linagora.tmail.DatabaseCombinedUserRequireModule;
 import com.linagora.tmail.OpenPaasModule;
 import com.linagora.tmail.OpenPaasModuleChooserConfiguration;
 import com.linagora.tmail.ScheduledReconnectionHandler;
+import com.linagora.tmail.UsersRepositoryModuleChooser;
 import com.linagora.tmail.blob.guice.BlobStoreCacheModulesChooser;
 import com.linagora.tmail.blob.guice.BlobStoreConfiguration;
 import com.linagora.tmail.blob.guice.BlobStoreModulesChooser;
-import com.linagora.tmail.combined.identity.UsersRepositoryModuleChooser;
 import com.linagora.tmail.contact.RabbitMQEmailAddressContactModule;
 import com.linagora.tmail.encrypted.ClearEmailContentFactory;
 import com.linagora.tmail.encrypted.EncryptedMailboxManager;
@@ -350,7 +353,9 @@ public static GuiceJamesServer createServer(DistributedJamesConfiguration config
             .combineWith(MailQueueViewChoice.ModuleChooser.choose(configuration.mailQueueViewChoice()))
             .combineWith(BlobStoreModulesChooser.chooseModules(blobStoreConfiguration))
             .combineWith(BlobStoreCacheModulesChooser.chooseModules(blobStoreConfiguration))
-            .combineWith(UsersRepositoryModuleChooser.chooseModules(configuration.usersRepositoryImplementation()))
+            .combineWith(new UsersRepositoryModuleChooser(
+                DatabaseCombinedUserRequireModule.of(CassandraUsersDAO.class),
+                new CassandraUsersRepositoryModule()).chooseModule(configuration.usersRepositoryImplementation()))
             .combineWith(chooseFirebase(configuration.firebaseModuleChooserConfiguration()))
             .combineWith(chooseLinagoraServicesDiscovery(configuration.linagoraServicesDiscoveryModuleChooserConfiguration()))
             .combineWith(chooseOpenPaasModule(configuration.openPaasModuleChooserConfiguration()))

tmail-backend/apps/distributed/src/test/java/com/linagora/tmail/james/app/CombinedIdentityJamesServerTest.java

@@ -14,10 +14,10 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.google.inject.multibindings.Multibinder;
+import com.linagora.tmail.UsersRepositoryModuleChooser;
 import com.linagora.tmail.combined.identity.CombinedUsersRepository;
 import com.linagora.tmail.combined.identity.LdapExtension;
 import com.linagora.tmail.combined.identity.UsersRepositoryClassProbe;
-import com.linagora.tmail.combined.identity.UsersRepositoryModuleChooser;
 import com.linagora.tmail.module.LinagoraTestJMAPServerModule;
 
 public class CombinedIdentityJamesServerTest {

tmail-backend/apps/distributed/src/test/java/com/linagora/tmail/james/app/DistributedServerWithOpenPaasRabbitMqConfiguredTest.java

@@ -11,9 +11,9 @@
 import com.google.inject.multibindings.Multibinder;
 
 import com.linagora.tmail.OpenPaasModuleChooserConfiguration;
+import com.linagora.tmail.UsersRepositoryModuleChooser;
 import com.linagora.tmail.combined.identity.LdapExtension;
 import com.linagora.tmail.combined.identity.UsersRepositoryClassProbe;
-import com.linagora.tmail.combined.identity.UsersRepositoryModuleChooser;
 
 public class DistributedServerWithOpenPaasRabbitMqConfiguredTest {
     @RegisterExtension

tmail-backend/apps/pom.xml

@@ -16,5 +16,6 @@
     <modules>
         <module>memory</module>
         <module>distributed</module>
+        <module>postgres</module>
     </modules>
 </project>

tmail-backend/apps/postgres/README.md

@@ -0,0 +1,10 @@
+## Administration Operations
+## Clean up data
+
+To clean up some data on the specific TMail data structures, that will be redundant again after a long time, you can execute the SQL queries `clean_up_data_tmail.sql`.
+
+The data that in:
+- `label_change` table
+- `ticket` table
+
+Note that the `clean_up_data_tmail.sql` should be merged with [the SQL clean up script on Apache James](https://github.com/apache/james-project/blob/postgresql/server/apps/postgres-app/clean_up.sql) to clean data on James tables as well.

tmail-backend/apps/postgres/clean_up_data_tmail.sql

@@ -0,0 +1,25 @@
+-- This is a script to delete old rows from some tables. One of the attempts to clean up the never-used data after a long time.
+
+DO
+$$
+    DECLARE
+        days_to_keep INTEGER;
+        ticket_ttl_in_seconds INTEGER;
+    BEGIN
+        -- Set the number of days dynamically
+        days_to_keep := 60;
+
+        -- Delete rows older than the specified number of days in the `label_change` table
+        DELETE
+        FROM label_change
+        WHERE created_date < current_timestamp - interval '1 day' * days_to_keep;
+
+        -- Set TTL in seconds for the Ticket table cleanup
+        ticket_ttl_in_seconds := 120;
+
+        -- Delete rows older than the specified TTL in the `Ticket` table
+        DELETE
+        FROM ticket
+        WHERE created_date < current_timestamp - interval '1 second' * ticket_ttl_in_seconds;
+    END
+$$;

tmail-backend/apps/postgres/docker-compose-distributed.yml

@@ -0,0 +1,98 @@
+version: '3.4'
+
+x-common-environment: &common-environment
+  POSTGRES_DB: tmail
+  POSTGRES_USER: tmail
+  POSTGRES_PASSWORD: secret1
+
+services:
+
+  tmail-backend:
+    depends_on:
+      postgres:
+        condition: service_started
+      opensearch:
+        condition: service_healthy
+      s3:
+        condition: service_started
+      rabbitmq:
+        condition: service_started
+    image: linagora/tmail-backend-postgresql-experimental
+    container_name: tmail-backend
+    hostname: tmail-backend.local
+    command:
+      - --generate-keystore
+    environment:
+      <<: *common-environment
+      OBJECT_STORAGE_ENDPOINT: http://s3.docker.test:8000/
+      OBJECT_STORAGE_REGION: us-east-1
+      OBJECT_STORAGE_ACCESS_KEY_ID: accessKey1
+      OBJECT_STORAGE_SECRET_KEY: secretKey1
+
+    ports:
+      - "80:80"
+      - "25:25"
+      - "110:110"
+      - "143:143"
+      - "465:465"
+      - "587:587"
+      - "993:993"
+      - "8000:8000"
+    volumes:
+      - ./sample-configuration/distributed/opensearch.properties:/root/conf/opensearch.properties
+      - ./sample-configuration/distributed/blob.properties:/root/conf/blob.properties
+      - ./sample-configuration/distributed/rabbitmq.properties:/root/conf/rabbitmq.properties
+      - ${RSA_PUBLICKEY_PATH}:/root/conf/jwt_publickey # Replace with absolute path to your RSA public key
+      - ${RSA_PRIVATEKEY_PATH}:/root/conf/jwt_privatekey # Replace with absolute path to your RSA private key
+      # Key generation:
+      # openssl genrsa -out jwt_privatekey 4096
+      # openssl rsa -in jwt_privatekey -pubout > jwt_publickey
+    networks:
+      - tmail
+
+  opensearch:
+    image: opensearchproject/opensearch:2.8.0
+    container_name: opensearch
+    healthcheck:
+      test: ["CMD", "curl", "-s", "http://opensearch:9200"]
+      interval: 3s
+      timeout: 10s
+      retries: 5
+    environment:
+      - discovery.type=single-node
+      - DISABLE_INSTALL_DEMO_CONFIG=true
+      - DISABLE_SECURITY_PLUGIN=true
+    networks:
+      - tmail
+
+  postgres:
+    image: postgres:16.1
+    container_name: postgres
+    ports:
+      - "5432:5432"
+    environment:
+      <<: *common-environment
+    networks:
+      - tmail
+
+  s3:
+    image: registry.scality.com/cloudserver/cloudserver:8.7.25
+    container_name: s3.docker.test
+    environment:
+      SCALITY_ACCESS_KEY_ID: accessKey1
+      SCALITY_SECRET_ACCESS_KEY: secretKey1
+      LOG_LEVEL: trace
+      REMOTE_MANAGEMENT_DISABLE: 1
+    networks:
+      - tmail
+
+  rabbitmq:
+    image: rabbitmq:3.12.1-management
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    networks:
+      - tmail
+
+networks:
+  tmail:

tmail-backend/apps/postgres/docker-compose.yml

@@ -0,0 +1,41 @@
+version: '3.4'
+
+x-common-environment: &common-environment
+  POSTGRES_DB: tmail
+  POSTGRES_USER: tmail
+  POSTGRES_PASSWORD: secret1
+
+services:
+
+  tmail-backend:
+    depends_on:
+      - postgres
+    image: linagora/tmail-backend-postgresql-experimental
+    container_name: tmail-backend
+    hostname: tmail-backend.local
+    command:
+      - --generate-keystore
+    volumes:
+      - ${RSA_PUBLICKEY_PATH}:/root/conf/jwt_publickey # Replace with absolute path to your RSA public key
+      - ${RSA_PRIVATEKEY_PATH}:/root/conf/jwt_privatekey # Replace with absolute path to your RSA private key
+      # Key generation:
+      # openssl genrsa -out jwt_privatekey 4096
+      # openssl rsa -in jwt_privatekey -pubout > jwt_publickey
+    ports:
+      - "80:80"
+      - "25:25"
+      - "110:110"
+      - "143:143"
+      - "465:465"
+      - "587:587"
+      - "993:993"
+      - "8000:8000"
+    environment:
+      <<: *common-environment
+
+  postgres:
+    image: postgres:16.1
+    ports:
+      - "5432:5432"
+    environment:
+      <<: *common-environment