Create a separate Guice module for OpenPaaS communication #1261

HoussemNasri · 2024-10-24T15:56:06Z

TODO

Test OpenPaasConfiguration (see RabbitMQConfigurationTest)
Test AmqpURI

quantranhong1999 · 2024-10-25T03:42:55Z

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

@@ -312,7 +313,8 @@ protected void configure() {
            new TeamMailboxModule(),
            new TMailMailboxSortOrderProviderModule(),
            new TmailEventModule(),
-            new TmailEventDeadLettersModule());
+            new TmailEventDeadLettersModule(),
+            new OpenPaasModule());


22:23:34.258 [ERROR] c.l.t.OpenPaasModule - Could not find configuration file 'openpaas.properties' 22:23:34.271 [ERROR] o.a.j.GuiceJamesServer - Fatal error while starting James java.io.FileNotFoundException: openpaas

Likely we should make the OpenPaaS module optional?

Fully agree.

If unspecified we shall fallback to the main rabbitMQ connection and rely on / vhost.

...ckend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasConfiguration.java

chibenwa · 2024-10-25T07:06:00Z

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModule.java

+            LOGGER.error("Could not find configuration file '{}.properties'",
+                OPENPAAS_CONFIGURATION_NAME);
+            throw new RuntimeException(e);


We shall likely do a module chooser to start or not the openpaas extension?

Could you confirm if this is accurate: The extension loads only if openpaas.properties is present in the classpath. If any OpenPaas configurations (e.g., apiURL or admin details) are missing, it will fail. If the RabbitMQ URI is not configured, it falls back to rabbitmq.properties (question: for the fallback, should we use all configurations in rabbitmq.properties or just the URI?)

If any OpenPaas configurations (e.g., apiURL or admin details) are missing, it will fail.

Wrong.

For Distributed if AMQP settings are missing we are falling back to the mail RabbitMQChannelPool

For Memory we are failing

(This likely means we need a little DistributedOpenPaaSAMQPFallbackModule and MemoryOpenPaaSAMQPFallbackModule to encode this difference)

For the fallback we use the RabbitMQChannelPool object already instanciated, let's not read rabbitmq.properties ourselves.

chibenwa · 2024-10-25T07:07:58Z

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModule.java

+    @Provides
+    @Named(OPENPAAS_INJECTION_KEY)
+    @Singleton
+    public RabbitMQConfiguration provideRabbitMQConfiguration(OpenPaasConfiguration openPaasConfiguration, RabbitMQConfiguration fallbackRabbitMQConfiguration) {


Here we would connect twice to RabbitMQ.

Is there a way to connect only once when we fallback?

Also on top of memory-app there would be no fallback as we do not use RabbitMQ at all...

Here we would connect twice to RabbitMQ.

Can you please elaborate on this part?

- Inject openpass-specific RabbitMQ configuration to OpenPaasContactsConsumer

…configuration settings. - If the OpenPaas module is loaded of course.

chibenwa · 2024-10-28T13:21:07Z

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/AmqpUri.java

+        if (this == o) {
+            return true;
+        }


We can likely get rid of this micro optimization

chibenwa · 2024-10-28T13:21:34Z

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/AmqpUri.java

@@ -86,4 +86,22 @@ private RabbitMQConfiguration.ManagementCredentials parseUserInfo(String userInf
                .join(passwordParts)
                .toCharArray());
    }
+
+    @Override
+    public boolean equals(Object o) {


Shall be final.

(Is this tested by equals-verifier?)

No, not yet. I'm currently testing AmqpURI but haven't pushed the changes yet because I'm encountering some issues with the URI class in the Java standard. For instance, BAD_URI is considered a valid URI and does not throw an exception.

chibenwa · 2024-10-28T13:21:58Z

...ird-party/openpaas/src/main/java/com/linagora/tmail/configuration/OpenPaasConfiguration.java

+    String adminPassword
+) {


Suggested change

String adminPassword

) {

String adminPassword) {

(Please do not do it on purpose!)

chibenwa · 2024-10-28T14:12:14Z

...ibuted/src/main/java/com/linagora/tmail/james/app/DistributedOpenPaasAmqpFallbackModule.java

+    @Provides
+    @Named(OPENPAAS_INJECTION_KEY)
+    @Singleton
+    public RabbitMQConfiguration provideRabbitMQConfiguration(


Is it possible to write something like:

public RabbitMQChannelPool provideRabbitMQOpenPaaSFallback(OpenPaasConfiguration openPaasConfiguration, RabbitMQChannelPool channelPool, @Named("openpaas") Provider<RabbitMQCHannelPool> openPaaSChannelPool) { return openPaasConfiguration.maybeRabbitMqUri() .map(any -> openPaaSChannelPool.get()) .orElse(channelPool);

I don't think we can. The provider takes another provider annotated with @nAmed("openpaas"), if we annotate this provider with the same annotation, which is the attended use case we will get a BINDING_ALREADY_SET error. We could skip the annotation but that will still conflict with the default RabbitMQChannelPool provider declared elsewhere.

The only solution I see is to define a new injection key, i.e., @nAmed("openpaas_with_fallback"), provided by DistributedOpenPaasAmqpFallbackModule.

I don't think we can.

Create more intermediary abstractions to break the dependency loops. Or use other named annotations.

Please find something. Be inventive and try things.

chibenwa · 2024-10-28T14:32:07Z

...ibuted/src/main/java/com/linagora/tmail/james/app/DistributedOpenPaasAmqpFallbackModule.java

+import com.linagora.tmail.AmqpUri;
+import com.linagora.tmail.configuration.OpenPaasConfiguration;
+
+public class DistributedOpenPaasAmqpFallbackModule extends AbstractModule {


We need tests for both the regular behaviour (when rabbitmq uri is configured) and the fallback, for both distributed and mamory App.

In order to do that:

we will not create the openpaas.properties file

edit the configuration of the JamesServerExtension we are using in order to turn on the OpenPaaS extension

we will then need a (server) overide where we define the OpenPaaS extension configuration. It ;s ok as we already have solid tests for configuration parsing.

So 4 little tests to write!

chibenwa · 2024-10-29T13:49:29Z

...end/apps/memory/src/test/java/com/linagora/tmail/james/app/MemoryServerWithOpenPaasTest.java

+                    "admin",
+                    "admin"
+                )
+            )))


"admin", "admin"))))

Those categories of comments are not worth my time. Please pay attention!

chibenwa · 2024-10-29T13:49:46Z

...end/apps/memory/src/test/java/com/linagora/tmail/james/app/MemoryServerWithOpenPaasTest.java

+    @BeforeAll
+    static void setUp() {
+        System.setSecurityManager(new NoExitSecurityManager());
+    }


On failure, the server does not throw an exception it exits by calling System.exit. Here we are trying to test that the memory server fails when the OpenPaas module is enabled and there is no rabbitmq channel pool to fallback to.

The SecurityManager trick is something I have found online being used to handle this same use case.

Here is is worth a comment?

chibenwa · 2024-10-29T13:51:36Z

.../apps/memory/src/test/java/com/linagora/tmail/james/app/MemoryServerWithoutOpenPaasTest.java

+import com.linagora.tmail.encrypted.MailboxManagerClassProbe;
+import com.linagora.tmail.module.LinagoraTestJMAPServerModule;
+
+public class MemoryServerWithoutOpenPaasTest {


I think all the other tests check what happens without the openpaas module enabled.

As it stands this test is useless.

We shall rather check the exception we get when we try to start tmail with the openpaas extension without configuring RabbitMQ...

chibenwa · 2024-10-29T13:51:54Z

...ributed/src/test/java/com/linagora/tmail/james/app/DistributedServerWithoutOpenPaasTest.java

+import com.linagora.tmail.encrypted.MailboxManagerClassProbe;
+import com.linagora.tmail.module.LinagoraTestJMAPServerModule;
+
+public class DistributedServerWithoutOpenPaasTest {


Idem this test is useless.

chibenwa · 2024-10-29T14:32:44Z

To test that RabbitMQ and OpenPaaS rabbitMQ are different we could leverage a "Probe"

We can create a TestProbe with injections on RabbitMQChannelPool and @Named("openpaas") RabbitMQChannelPool that exposes a boolean method to show if those are the sames or not.

chibenwa · 2024-10-29T19:45:52Z

...end/apps/memory/src/test/java/com/linagora/tmail/james/app/MemoryServerWithOpenPaasTest.java

+
+    @BeforeAll
+    static void setUp() {
+        System.setSecurityManager(new NoExitSecurityManager());
+    }


@afterall remember to unset the security manager or test isolation is broken.

chibenwa · 2024-10-29T19:47:12Z

...end/apps/memory/src/test/java/com/linagora/tmail/james/app/MemoryServerWithOpenPaasTest.java

+    void serverShouldThrowWithOpenPaasEnabled() throws Exception {
+        try {
+            jamesServerExtension.start(null);
+            fail("James server didn't exit or fail!");
+        } catch (Exception e) {
+            LOGGER.error("Expected failure", e);
+        }
+    }


disable auto start on the extention, get a non-started guice-james-server as a parameter and start it manually in the tests

chibenwa · 2024-10-30T14:13:29Z

tmail-backend/apps/distributed/pom.xml

@@ -98,6 +98,14 @@
            <artifactId>tmail-openpaas</artifactId>
            <version>1.0.0-SNAPSHOT</version>
        </dependency>
+        <dependency>
+            <groupId>com.linagora.tmail</groupId>


${project.groupId}

chibenwa · 2024-10-30T14:28:16Z

...d/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/OpenPaasRabbitMQExtension.java

+import com.google.inject.Module;
+
+public class OpenPaasRabbitMQExtension implements GuiceModuleTestExtension {
+    private final DockerRabbitMQ dockerRabbitMQ = DockerRabbitMQ.withoutCookie();


IMO this extension is not needed we could have 2 connections to the main RabbitMQ extension and we would still be able to assert if we want that the mail RabbitMQChannelPool is distinct from the one annotated with @Named("openpaas")

chibenwa · 2024-10-31T09:08:52Z

tmail-backend/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/AmqpUriTest.java

+            Arguments.of("amqp://user@host")
+            );


Suggested change

Arguments.of("amqp://user@host")

);

Arguments.of("amqp://user@host"));

chibenwa · 2024-10-31T09:09:11Z

tmail-backend/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/AmqpUriTest.java

+            Arguments.of("BAD_URI")                                     // Just bad
+        );


Suggested change

Arguments.of("BAD_URI") // Just bad

);

Arguments.of("BAD_URI")); // Just bad

chibenwa · 2024-10-31T09:09:49Z

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/AmqpUri.java

        if (!(o instanceof AmqpUri amqpUri)) {
            return false;
        }
        return Objects.equals(uri, amqpUri.uri) &&
-               Objects.equals(managementCredentials, amqpUri.managementCredentials) &&
+               Objects.equals(userInfo, amqpUri.userInfo) &&
               Objects.equals(vhost, amqpUri.vhost);
    }

    @Override
    public int hashCode() {


Suggested change

public int hashCode() {

public final int hashCode() {

chibenwa · 2024-10-31T09:10:14Z

tmail-backend/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/AmqpUriTest.java

+    }
+
+    @Test
+    void shouldRespectBeanContract() throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException {


Suggested change

void shouldRespectBeanContract() throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException {

void shouldRespectBeanContract() throws Exception {

chibenwa · 2024-10-31T09:10:39Z

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/AmqpUri.java

+
+    @Override
+    public String toString() {
+        return "AmqpUri{" +


MoreObjects.toStringHelpers()...

quantranhong1999 reviewed Oct 25, 2024

View reviewed changes

chibenwa reviewed Oct 25, 2024

View reviewed changes

...ckend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasConfiguration.java Outdated Show resolved Hide resolved

chibenwa reviewed Oct 25, 2024

View reviewed changes

...ckend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasConfiguration.java Outdated Show resolved Hide resolved

chibenwa reviewed Oct 25, 2024

View reviewed changes

...ckend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasConfiguration.java Outdated Show resolved Hide resolved

chibenwa reviewed Oct 25, 2024

View reviewed changes

HoussemNasri added 3 commits October 25, 2024 11:34

Create OpenPaasModule

fbea4a5

- Inject openpass-specific RabbitMQ configuration to OpenPaasContactsConsumer

Fix typo

0a093a6

Fix guice dependency resolution

eef7eef

HoussemNasri force-pushed the openpaas-module branch from 8464469 to eef7eef Compare October 25, 2024 10:36

HoussemNasri added 7 commits October 25, 2024 13:22

Selectively load the openpaas module in the DistributedServer

44cd3b9

Selectively load the openpaas module in the MemoryServer

88dba77

The OpenPaas admin username, password, and API URL are now mandatory …

4006390

…configuration settings. - If the OpenPaas module is loaded of course.

Propagate exception

e59884f

Implement equals/hashcode for AmqpUri

1dda9ee

Test OpenPaasConfiguration

a5bf07b

Refactor

71364c4

HoussemNasri self-assigned this Oct 28, 2024

chibenwa reviewed Oct 28, 2024

View reviewed changes

chibenwa reviewed Oct 29, 2024

View reviewed changes

Add integration tests

7e6daf8

HoussemNasri force-pushed the openpaas-module branch from c20c64d to 7e6daf8 Compare October 30, 2024 13:34

Minor cleanup

2e1e303

chibenwa reviewed Oct 30, 2024

View reviewed changes

HoussemNasri added 2 commits October 30, 2024 17:08

Refactor AmqpUri

7e3db77

Test AmqpUri

4c1cc72

chibenwa reviewed Oct 31, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create a separate Guice module for OpenPaaS communication #1261

Create a separate Guice module for OpenPaaS communication #1261

HoussemNasri commented Oct 24, 2024 •

edited

Loading

quantranhong1999 Oct 25, 2024

chibenwa Oct 25, 2024

chibenwa Oct 25, 2024

HoussemNasri Oct 25, 2024

chibenwa Oct 28, 2024

chibenwa Oct 25, 2024

HoussemNasri Oct 25, 2024

chibenwa Oct 28, 2024

chibenwa Oct 28, 2024

HoussemNasri Oct 30, 2024

chibenwa Oct 28, 2024

chibenwa Oct 28, 2024 •

edited

Loading

HoussemNasri Oct 29, 2024 •

edited

Loading

chibenwa Oct 29, 2024

chibenwa Oct 28, 2024

chibenwa Oct 29, 2024

chibenwa Oct 29, 2024

HoussemNasri Oct 29, 2024 •

edited

Loading

chibenwa Oct 29, 2024

chibenwa Oct 29, 2024

chibenwa Oct 29, 2024

chibenwa commented Oct 29, 2024

chibenwa Oct 29, 2024

chibenwa Oct 29, 2024

chibenwa Oct 30, 2024

chibenwa Oct 30, 2024

chibenwa Oct 31, 2024

chibenwa Oct 31, 2024

chibenwa Oct 31, 2024

chibenwa Oct 31, 2024

chibenwa Oct 31, 2024

	Arguments.of("amqp://user@host")
	);
	Arguments.of("amqp://user@host"));

	Arguments.of("BAD_URI") // Just bad
	);
	Arguments.of("BAD_URI")); // Just bad

	void shouldRespectBeanContract() throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException {
	void shouldRespectBeanContract() throws Exception {

Create a separate Guice module for OpenPaaS communication #1261

Are you sure you want to change the base?

Create a separate Guice module for OpenPaaS communication #1261

Conversation

HoussemNasri commented Oct 24, 2024 • edited Loading

TODO

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chibenwa Oct 28, 2024 • edited Loading

Choose a reason for hiding this comment

HoussemNasri Oct 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HoussemNasri Oct 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chibenwa commented Oct 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HoussemNasri commented Oct 24, 2024 •

edited

Loading

chibenwa Oct 28, 2024 •

edited

Loading

HoussemNasri Oct 29, 2024 •

edited

Loading

HoussemNasri Oct 29, 2024 •

edited

Loading