[Draft] [CAE-580] Migrate Lettuce test setup to use client-lib-test #3158

kiryazovi-redis · 2025-02-03T21:47:32Z

Make sure that:

You have read the contribution guidelines.
You have created a feature request first to discuss your contribution intent. Please reference the feature request ticket number in the pull request.
You applied code formatting rules using the mvn formatter:format target. Don’t submit any formatting related changes.
You submit test cases (unit or integration tests) that back your changes.

Failing tests:
1 Keystore test.

That is the reason why this review is draft.

After the tests pass, will likely reduce redis.conf files in size as some of the config are provided by default.
Also, there is some small work left on the docker-compose.

This reverts commit 79c2171.

This reverts commit c4e3b08.

kiryazovi-redis

Self review, so our sync-up today goes faster. (after discussion with Ivo)

Makefile

kiryazovi-redis · 2025-02-10T10:32:14Z

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

@@ -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;


Discuss today with Tisho if we want to leave this in that format, as it will mean we deprecate makefile entirely.

Remove old way of deploying.

kiryazovi-redis · 2025-02-10T10:32:51Z

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

@@ -66,11 +69,13 @@ class SslIntegrationTests extends TestSupport {

    private static final String KEYSTORE = "work/keystore.jks";


Ivo is helping me with this testcase, as its not passing.

kiryazovi-redis · 2025-02-10T10:33:29Z

src/test/java/io/lettuce/test/settings/TlsSettings.java

+
+    private static final String TRUST_STORE_TYPE = "PKCS12";
+
+    private static final String TEST_WORK_FOLDER = System.getenv().getOrDefault("TEST_WORK_FOLDER", "/tmp/redis-env-work");


Discuss with TIsho if we need to change this.

kiryazovi-redis · 2025-02-10T10:34:01Z

src/test/resources/docker-env/.env

@@ -0,0 +1 @@
+REDIS_ENV_WORK_DIR=/tmp/redis-env-work


Currently working on to see if we want versions of Redis in here.

Create multiple env files and close this convo.

kiryazovi-redis · 2025-02-10T10:35:06Z

src/test/resources/docker-env/redis-standalone-0/config/node-6478/redis.conf

@@ -0,0 +1,10 @@
+port 6478


Thin out the redis.conf or do that in a future commit.

kiryazovi-redis · 2025-02-10T10:38:53Z

src/test/resources/docker-env/docker-compose.yml

@@ -0,0 +1,123 @@
+services:


We have to integrate this into the nightlies.

kiryazovi-redis · 2025-02-10T10:39:27Z

src/test/resources/docker-env/docker-compose.yml

+    networks:
+      - redis-network
+
+  redis-standalone-sentinel-controlled:


Perhaps tech debt question. Do we want the json tests added into this one?

lets make this into another task, but try to go to this direction.

We want to remove testcontainers, and get the dockercompose to be in one place.

Then in the future we'll add back testcontainers.

ggivo · 2025-02-10T10:53:01Z

src/test/resources/docker-env/docker-compose.yml

+services:
+  # Standalone Redis Servers
+  redis-standalone-0:
+    image: redislabs/client-libs-test:8.0-M02


We have recently introduced the option for test matrix testing against different versions.
(7.2, 7.4, 8.0 )
We should make the test container version configurable
Use scenarios that need to be covered:

During PR integration test - we should be able to test against concrete version

Local dev - we should be able to bootstrap a test env from specified version

kiryazovi-redis · 2025-02-10T12:16:15Z

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

@@ -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");


@tishun : make sure to fix the work directory, try to put in in target
Ivo: when docker compose to go in the target + test to go and find it in the correct target folder.

Makefile

kiryazovi-redis added 19 commits January 20, 2025 18:12

add initial skeleton without stunnel

1d7e1d0

fix up some paths

194aa2b

fix the standalone ones.

f140202

fix issues which crash the containers.

b3e5c29

add more file renames.

334ed1a

add missed configs

5a55583

Fix up the docker-compose. TODO: actual testing, after being compliant

ee30708

fix sentinel to work

8683a6d

fix 70 out of 80 failing tests by fixing configuration

ebfcf87

fix make file, this should be committed

fbd0167

fix up more tests, now only ssl stuff seems to remain. (4 tests)

bc42474

fix up one tls, but we need to fix up the java code for the store

54ba159

fix some of the ssl tests

d56bd91

reduce test failures to 3

8d56ebb

fix java

43a3a2f

fix the last of ssl tests. TODO: retest the key tests

8fa4a81

add docker to the makefile

fbf085b

add fixes for several tests

0becc2a

formatting

b9dceb8

kiryazovi-redis force-pushed the topic/kiryazovi-redis/use-docker-for-tests branch from 24693f5 to b9dceb8 Compare February 6, 2025 15:12

attempt to create keystore file via java

c4e3b08

kiryazovi-redis force-pushed the topic/kiryazovi-redis/use-docker-for-tests branch from 1f6b443 to c4e3b08 Compare February 7, 2025 18:31

kiryazovi-redis added 3 commits February 7, 2025 20:32

format

79c2171

Revert "format"

1c217f6

This reverts commit 79c2171.

Revert "attempt to create keystore file via java"

7892951

This reverts commit c4e3b08.

kiryazovi-redis force-pushed the topic/kiryazovi-redis/use-docker-for-tests branch from e79ac3f to 7892951 Compare February 10, 2025 10:09

kiryazovi-redis commented Feb 10, 2025

View reviewed changes

ggivo reviewed Feb 10, 2025

View reviewed changes

Merge branch 'main' into topic/kiryazovi-redis/use-docker-for-tests

2a538e1

kiryazovi-redis commented Feb 10, 2025

View reviewed changes

tishun reviewed Feb 10, 2025

View reviewed changes

Makefile Outdated Show resolved Hide resolved

ad some path fixes

8a4a553

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Draft] [CAE-580] Migrate Lettuce test setup to use client-lib-test #3158

[Draft] [CAE-580] Migrate Lettuce test setup to use client-lib-test #3158

kiryazovi-redis commented Feb 3, 2025 •

edited

Loading

kiryazovi-redis left a comment

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

kiryazovi-redis Feb 10, 2025

ggivo Feb 10, 2025

kiryazovi-redis Feb 10, 2025

		@@ -66,11 +69,13 @@ class SslIntegrationTests extends TestSupport {

		private static final String KEYSTORE = "work/keystore.jks";


		private static final String TRUST_STORE_TYPE = "PKCS12";

		private static final String TEST_WORK_FOLDER = System.getenv().getOrDefault("TEST_WORK_FOLDER", "/tmp/redis-env-work");

		@@ -0,0 +1 @@
		REDIS_ENV_WORK_DIR=/tmp/redis-env-work

[Draft] [CAE-580] Migrate Lettuce test setup to use client-lib-test #3158

Are you sure you want to change the base?

[Draft] [CAE-580] Migrate Lettuce test setup to use client-lib-test #3158

Conversation

kiryazovi-redis commented Feb 3, 2025 • edited Loading

kiryazovi-redis left a 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kiryazovi-redis commented Feb 3, 2025 •

edited

Loading