This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 2a6f5ac759 Update Redis extensions to switch BindMode to READ_ONLY
2a6f5ac759 is described below
commit 2a6f5ac7599e3ceab19cd6ee9744f1dd36e30c51
Author: hung phan <[email protected]>
AuthorDate: Mon Oct 28 11:40:18 2024 +0700
Update Redis extensions to switch BindMode to READ_ONLY
Reason: Somehow testcontainers erase the content of binding files when
READ_WRITE mode is used
---
.../james/backends/redis/RedisClusterExtension.java | 2 +-
.../backends/redis/RedisMasterReplicaExtension.java | 6 +++---
.../james/backends/redis/RedisSentinelExtension.java | 16 ++++++++--------
.../apache/james/backends/redis/RedisTLSExtension.java | 6 +++---
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisClusterExtension.java
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisClusterExtension.java
index 315b5031dc..733a44ee91 100644
---
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisClusterExtension.java
+++
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisClusterExtension.java
@@ -94,7 +94,7 @@ public class RedisClusterExtension implements
GuiceModuleTestExtension {
.withNetworkAliases(alias)
.withClasspathResourceMapping("redis_cluster.conf",
"/usr/local/etc/redis/redis.conf",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.waitingFor(Wait.forLogMessage(".*Ready to accept connections.*",
1)
.withStartupTimeout(Duration.ofMinutes(2)));
diff --git
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisMasterReplicaExtension.java
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisMasterReplicaExtension.java
index 86b0a00420..f535cc6bc7 100644
---
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisMasterReplicaExtension.java
+++
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisMasterReplicaExtension.java
@@ -199,13 +199,13 @@ public class RedisMasterReplicaExtension implements
GuiceModuleTestExtension {
if (tlsEnabled) {
genericContainer.withClasspathResourceMapping("certificate.crt",
"/etc/redis/certificate.crt",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("private.key",
"/etc/redis/private.key",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("rootCA.crt",
"/etc/redis/rootCA.crt",
- BindMode.READ_WRITE);
+ BindMode.READ_ONLY);
if (isSlave) {
genericContainer.withCommand(TLS_REPLICA_COMMAND);
} else {
diff --git
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisSentinelExtension.java
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisSentinelExtension.java
index 78583752d0..60bde6c80a 100644
---
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisSentinelExtension.java
+++
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisSentinelExtension.java
@@ -239,13 +239,13 @@ public class RedisSentinelExtension implements
GuiceModuleTestExtension {
if (tlsEnabled) {
genericContainer.withClasspathResourceMapping("certificate.crt",
"/etc/redis/certificate.crt",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("private.key",
"/etc/redis/private.key",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("rootCA.crt",
"/etc/redis/rootCA.crt",
- BindMode.READ_WRITE);
+ BindMode.READ_ONLY);
if (isSlave) {
genericContainer.withCommand(TLS_REPLICA_COMMAND);
} else {
@@ -272,20 +272,20 @@ public class RedisSentinelExtension implements
GuiceModuleTestExtension {
if (tlsEnabled) {
genericContainer.withClasspathResourceMapping("sentinel_tls.conf",
"/etc/redis/sentinel.conf",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("certificate.crt",
"/etc/redis/certificate.crt",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("private.key",
"/etc/redis/private.key",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("rootCA.crt",
"/etc/redis/rootCA.crt",
- BindMode.READ_WRITE);
+ BindMode.READ_ONLY);
} else {
genericContainer.withClasspathResourceMapping("sentinel.conf",
"/etc/redis/sentinel.conf",
- BindMode.READ_WRITE);
+ BindMode.READ_ONLY);
}
return genericContainer;
}
diff --git
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisTLSExtension.java
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisTLSExtension.java
index 82eee283cb..963f590f73 100644
---
a/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisTLSExtension.java
+++
b/backends-common/redis/src/test/java/org/apache/james/backends/redis/RedisTLSExtension.java
@@ -72,13 +72,13 @@ public class RedisTLSExtension implements
GuiceModuleTestExtension {
.withCommand(START_SERVER_COMMAND)
.withClasspathResourceMapping("certificate.crt",
"/etc/redis/certificate.crt",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("private.key",
"/etc/redis/private.key",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withClasspathResourceMapping("rootCA.crt",
"/etc/redis/rootCA.crt",
- BindMode.READ_WRITE)
+ BindMode.READ_ONLY)
.withNetworkAliases("redis")
.waitingFor(Wait.forLogMessage(".*Ready to accept connections.*", 1)
.withStartupTimeout(Duration.ofMinutes(2)));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
