Migrate Lettuce test setup to use client-lib-test

.gitignore

@@ -15,3 +15,5 @@ work/
 dependency-reduced-pom.xml
 .idea
 .flattened-pom.xml
+*.java-version
+*.DS_Store

Makefile

@@ -413,6 +413,14 @@ test: start
 	mvn -DskipITs=false clean compile verify -P$(PROFILE)
 	$(MAKE) stop
 
+docker-test:
+	rm -rf /tmp/redis-env-work
+	docker compose --env-file src/test/resources/docker-env/.env -f src/test/resources/docker-env/docker-compose.yml up -d; \
+	mvn -DskipITs=false clean compile verify -P$(PROFILE)
+
+docker-stop:
+	docker compose --env-file src/test/resources/docker-env/.env -f src/test/resources/docker-env/docker-compose.yml down; \
+
 prepare: stop
 
 ifndef STUNNEL_BIN

src/test/java/io/lettuce/core/SslIntegrationTests.java

@@ -42,6 +42,8 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.List;
 import java.util.function.Function;
@@ -50,6 +52,7 @@
 
 import static io.lettuce.TestTags.INTEGRATION_TEST;
 import static io.lettuce.test.settings.TestSettings.sslPort;
+import static io.lettuce.test.settings.TlsSettings.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -66,11 +69,13 @@ class SslIntegrationTests extends TestSupport {
 
     private static final String KEYSTORE = "work/keystore.jks";
 
-    private static final String TRUSTSTORE = "work/truststore.jks";
+    private static File truststoreFile0;
 
-    private static final File TRUSTSTORE_FILE = new File(TRUSTSTORE);
+    private static File truststoreFile1;
 
-    private static final File CA_CERT_FILE = new File("work/ca/certs/ca.cert.pem");
+    private static File truststoreFile2;
+
+    private static File cacertFile;
 
     private static final int MASTER_SLAVE_BASE_PORT_OFFSET = 2000;
 
@@ -86,7 +91,7 @@ class SslIntegrationTests extends TestSupport {
             .withVerifyPeer(false) //
             .build();
 
-    private static final RedisURI URI_CLIENT_CERT_AUTH = sslURIBuilder(2) //
+    private static final RedisURI URI_CLIENT_CERT_AUTH = sslURIBuilder(1) //
             .withVerifyPeer(true) //
             .build();
 
@@ -111,9 +116,24 @@ class SslIntegrationTests extends TestSupport {
 
     @BeforeAll
     static void beforeClass() {
+        Path path0 = createAndSaveTestTruststore("redis-standalone-0", Paths.get("redis-standalone-0/work/tls"), "changeit");
+        truststoreFile0 = path0.toFile();
+        cacertFile = envCa(Paths.get("redis-standalone-0/work/tls")).toFile();
+
+        Path path = createAndSaveTestTruststore("redis-standalone-1", Paths.get("redis-standalone-1/work/tls"), "changeit");
+        truststoreFile1 = path.toFile();
+        cacertFile = envCa(Paths.get("redis-standalone-1/work/tls")).toFile();
+
+        Path path2 = createAndSaveTestTruststore("redis-standalone-sentinel-controlled",
+                Paths.get("redis-standalone-sentinel-controlled/work/tls"), "changeit");
+        truststoreFile2 = path2.toFile();
+        cacertFile = envCa(Paths.get("redis-standalone-sentinel-controlled/work/tls")).toFile();
 
         assumeTrue(CanConnect.to(TestSettings.host(), sslPort()), "Assume that stunnel runs on port 6443");
-        assertThat(TRUSTSTORE_FILE).exists();
+        // Maybe we should do a list.
+        assertThat(truststoreFile0).exists();
+        assertThat(truststoreFile1).exists();
+        assertThat(truststoreFile2).exists();
     }
 
     @Test
@@ -130,7 +150,7 @@ void standaloneWithJdkSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile1, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -142,7 +162,7 @@ void standaloneWithVerifyCaOnly() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile0, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -153,7 +173,7 @@ void standaloneWithVerifyCaOnly() {
     void standaloneWithPemCert() {
 
         SslOptions sslOptions = SslOptions.builder() //
-                .trustManager(CA_CERT_FILE) //
+                .trustManager(envCa(Paths.get("redis-standalone-1/work/tls")).toFile()) //
                 .build();
         setOptions(sslOptions);
         verifyConnection(URI_VERIFY);
@@ -164,7 +184,7 @@ void standaloneWithPemCertAndImpossibleTimeout() {
 
         Assertions.setMaxStackTraceElementsDisplayed(30);
         SslOptions sslOptions = SslOptions.builder() //
-                .trustManager(CA_CERT_FILE) //
+                .trustManager(envCa(Paths.get("redis-standalone-1/work/tls")).toFile()) //
                 .build();
         setOptions(sslOptions);
         redisClient.setOptions(ClientOptions.builder().protocolVersion(ProtocolVersion.RESP3).sslOptions(sslOptions).build());
@@ -183,7 +203,7 @@ void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(truststoreURL()) //
+                .truststore(truststoreURL(truststoreFile1), "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -192,11 +212,11 @@ void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
 
     @Test
     void standaloneWithClientCertificates() {
-
+        // 6445
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
                 .keystore(new File(KEYSTORE), "changeit".toCharArray()) //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile0, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -208,7 +228,7 @@ void standaloneWithClientCertificatesWithoutKeystore() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile1, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -220,7 +240,7 @@ void standaloneWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(truststoreURL(), "knödel") //
+                .truststore(truststoreURL(truststoreFile0), "knödel") //
                 .build();
         setOptions(sslOptions);
 
@@ -245,7 +265,7 @@ void standaloneWithOpenSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .openSslProvider() //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile0, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -298,7 +318,7 @@ void masterSlaveWithJdkSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile2, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -310,7 +330,7 @@ void masterSlaveWithJdkSslUsingTruststoreUrl() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(truststoreURL()) //
+                .truststore(truststoreURL(truststoreFile2), "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -322,7 +342,7 @@ void masterSlaveWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(truststoreURL(), "knödel") //
+                .truststore(truststoreURL(truststoreFile0), "knödel") //
                 .build();
         setOptions(sslOptions);
 
@@ -363,7 +383,7 @@ void masterSlaveSslWithOneInvalidHostWillSucceed() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile2, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -375,7 +395,7 @@ void masterSlaveSslWithAllInvalidHostsWillFail() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(TRUSTSTORE_FILE) //
+                .truststore(truststoreFile0, "changeit") //
                 .build();
         setOptions(sslOptions);
 
@@ -415,8 +435,8 @@ private static List<RedisURI> sslUris(IntStream masterSlaveOffsets,
                 .map(builderCustomizer).map(RedisURI.Builder::build).collect(Collectors.toList());
     }
 
-    private URL truststoreURL() throws MalformedURLException {
-        return TRUSTSTORE_FILE.toURI().toURL();
+    private URL truststoreURL(File truststoreFile) throws MalformedURLException {
+        return truststoreFile.toURI().toURL();
     }
 
     private void setOptions(SslOptions sslOptions) {

src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java

@@ -9,9 +9,7 @@
 
 import javax.inject.Inject;
 
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.MigrateArgs;
@@ -32,6 +30,7 @@
  */
 @Tag(INTEGRATION_TEST)
 @ExtendWith(LettuceExtension.class)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class RunOnlyOnceServerCommandIntegrationTests extends TestSupport {
 
     private final RedisClient client;
@@ -54,6 +53,7 @@ class RunOnlyOnceServerCommandIntegrationTests extends TestSupport {
      */
     @Test
     @Disabled
+    @Order(1)
     void debugSegfault() {
 
         assumeTrue(CanConnect.to(host(), port(1)));
@@ -74,32 +74,34 @@ void debugSegfault() {
      * Executed in order: 2
      */
     @Test
+    @Order(2)
     void migrate() {
 
-        assumeTrue(CanConnect.to(host(), port(2)));
+        assumeTrue(CanConnect.to(host(), port(7)));
 
         redis.set(key, value);
 
-        String result = redis.migrate("localhost", TestSettings.port(2), key, 0, 10);
+        String result = redis.migrate("localhost", TestSettings.port(7), key, 0, 10);
         assertThat(result).isEqualTo("OK");
     }
 
     /**
      * Executed in order: 3
      */
     @Test
+    @Order(3)
     void migrateCopyReplace() {
 
-        assumeTrue(CanConnect.to(host(), port(2)));
+        assumeTrue(CanConnect.to(host(), port(7)));
 
         redis.set(key, value);
-        redis.set("key1", value);
         redis.set("key2", value);
+        redis.set("key3", value);
 
-        String result = redis.migrate("localhost", TestSettings.port(2), 0, 10, MigrateArgs.Builder.keys(key).copy().replace());
+        String result = redis.migrate("localhost", TestSettings.port(7), 0, 10, MigrateArgs.Builder.keys(key).copy().replace());
         assertThat(result).isEqualTo("OK");
 
-        result = redis.migrate("localhost", TestSettings.port(2), 0, 10,
+        result = redis.migrate("localhost", TestSettings.port(7), 0, 10,
                 MigrateArgs.Builder.keys(Arrays.asList("key1", "key2")).replace());
         assertThat(result).isEqualTo("OK");
     }
@@ -109,9 +111,10 @@ void migrateCopyReplace() {
      * redis.
      */
     @Test
+    @Order(4)
     void shutdown() {
 
-        assumeTrue(CanConnect.to(host(), port(2)));
+        assumeTrue(CanConnect.to(host(), port(7)));
 
         final RedisAsyncCommands<String, String> commands = client.connect(RedisURI.Builder.redis(host(), port(2)).build())
                 .async();

src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java

@@ -2,14 +2,11 @@
 
 import javax.inject.Inject;
 
+import io.lettuce.core.*;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.ReadFrom;
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSupport;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.resource.ClientResources;
@@ -19,7 +16,15 @@
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.settings.TestSettings;
 
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import static io.lettuce.TestTags.INTEGRATION_TEST;
+import static io.lettuce.test.settings.TlsSettings.createAndSaveTestTruststore;
 
 /**
  * Integration test for Master/Replica using Redis Sentinel over SSL.
@@ -32,19 +37,33 @@ class MasterReplicaSentinelSslIntegrationTests extends TestSupport {
 
     private final ClientResources clientResources;
 
+    private static File truststoreFile;
+
+    private static Map<Integer, Integer> portMap = new HashMap<>();
+    static {
+        portMap.put(26379, 26822);
+        portMap.put(6482, 8443);
+        portMap.put(6483, 8444);
+    }
+
     @Inject
     MasterReplicaSentinelSslIntegrationTests(ClientResources clientResources) {
+
         this.clientResources = clientResources.mutate()
                 .socketAddressResolver(MappingSocketAddressResolver.create(DnsResolver.jvmDefault(), hostAndPort -> {
+                    int port = hostAndPort.getPort();
+                    if (portMap.containsKey(port)) {
+                        return HostAndPort.of(hostAndPort.getHostText(), portMap.get(port));
+                    }
 
-                    return HostAndPort.of(hostAndPort.getHostText(), hostAndPort.getPort() + 443);
+                    return hostAndPort;
                 })).build();
     }
 
     @Test
     void testMasterReplicaSentinelBasic() {
-
         RedisClient client = RedisClient.create(clientResources);
+
         RedisURI redisURI = RedisURI.create("rediss-sentinel://" + TestSettings.host() + ":26379?sentinelMasterId=mymaster");
         redisURI.setVerifyPeer(false);
         StatefulRedisMasterReplicaConnection<String, String> connection = MasterReplica.connect(client, StringCodec.UTF8,