added support for Redis Enterprise and modules

jruaux · jruaux · commit 8063ed7c4c74 · 2021-05-19T16:32:46.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -21,8 +21,8 @@ java {
 }
 
 repositories {
-    mavenCentral()
     mavenLocal()
+    mavenCentral()
 }
 
 bootJar {
@@ -41,10 +41,19 @@ dependencies {
     api 'org.junit.jupiter:junit-jupiter-params'
     api group: 'org.testcontainers', name: 'testcontainers', version: testcontainers_version
     api group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainers_version
-    testImplementation 'com.redislabs:mesclun:1.3.2'
+    implementation 'io.lettuce:lettuce-core:6.1.2.RELEASE'
     testImplementation 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'org.slf4j:slf4j-simple'
+    testImplementation 'com.redislabs:mesclun:1.3.3-SNAPSHOT'
+}
+
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group == 'io.lettuce') {
+            details.useVersion '6.2.0.BUILD-SNAPSHOT'
+        }
+    }
 }
 
 test {
@@ -130,4 +139,4 @@ tasks.named("dependencyUpdates").configure {
 afterReleaseBuild.dependsOn ":githubRelease"
 afterReleaseBuild.dependsOn ":publishToSonatype"
 afterReleaseBuild.dependsOn ":closeAndReleaseSonatypeStagingRepository"
-afterReleaseBuild.dependsOn ":publishToMavenLocal"
+afterReleaseBuild.dependsOn ":publishToMavenLocal"
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,2 @@
 version=1.1.4-SNAPSHOT
-testcontainers_version=1.15.3
-lombok_version=1.18.20
-junit_version=5.7.1
+testcontainers_version=1.5.4-REDISLABS
diff --git a/src/main/java/com/redislabs/testcontainers/RedisClusterContainer.java b/src/main/java/com/redislabs/testcontainers/RedisClusterContainer.java
@@ -3,9 +3,8 @@
 import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.shaded.org.apache.commons.lang.ClassUtils;
-import org.testcontainers.utility.MountableFile;
 
-public class RedisClusterContainer extends FixedHostPortGenericContainer<RedisClusterContainer> implements RedisContainer {
+public class RedisClusterContainer extends FixedHostPortGenericContainer<RedisClusterContainer> implements RedisServer {
 
     private static final String ENV_MASTERS = "MASTERS";
     private static final String ENV_SLAVES_PER_MASTER = "SLAVES_PER_MASTER";
@@ -73,7 +72,7 @@ public String[] getRedisURIs() {
         int[] ports = ports();
         String[] redisURIs = new String[ports.length];
         for (int index = 0; index < ports.length; index++) {
-            redisURIs[index] = RedisContainerUtils.redisURI(getHost(), ports[index]);
+            redisURIs[index] = RedisServer.redisURI(getHost(), ports[index]);
         }
         return redisURIs;
     }
diff --git a/src/main/java/com/redislabs/testcontainers/RedisContainer.java b/src/main/java/com/redislabs/testcontainers/RedisContainer.java
@@ -1,9 +1,32 @@
 package com.redislabs.testcontainers;
 
-public interface RedisContainer {
+import com.redislabs.testcontainers.support.AbstractRedisContainer;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
-    String getRedisURI();
+public class RedisContainer extends AbstractRedisContainer<RedisContainer> {
 
-    boolean isCluster();
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redis");
+    private static final String DEFAULT_TAG = "latest";
+
+    public RedisContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
+    protected RedisContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+    }
+
+    @Override
+    public boolean isCluster() {
+        return false;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <C extends RedisContainer> C withKeyspaceNotifications() {
+        withCopyFileToContainer(MountableFile.forClasspathResource("redis-keyspace-notifications.conf"), "/data/redis.conf");
+        withCommand("redis-server", "/data/redis.conf");
+        return (C) this;
+    }
 
 }
diff --git a/src/main/java/com/redislabs/testcontainers/RedisEnterpriseContainer.java b/src/main/java/com/redislabs/testcontainers/RedisEnterpriseContainer.java
diff --git a/src/main/java/com/redislabs/testcontainers/RedisModulesContainer.java b/src/main/java/com/redislabs/testcontainers/RedisModulesContainer.java
@@ -1,5 +1,6 @@
 package com.redislabs.testcontainers;
 
+import com.redislabs.testcontainers.support.AbstractRedisContainer;
 import org.testcontainers.utility.DockerImageName;
 
 public class RedisModulesContainer extends AbstractRedisContainer<RedisModulesContainer> {
diff --git a/src/main/java/com/redislabs/testcontainers/RedisServer.java b/src/main/java/com/redislabs/testcontainers/RedisServer.java
@@ -2,13 +2,17 @@
 
 import org.testcontainers.containers.GenericContainer;
 
-public class RedisContainerUtils {
+public interface RedisServer {
 
-    public static String redisURI(String host, int port) {
+    String getRedisURI();
+
+    boolean isCluster();
+
+    static String redisURI(String host, int port) {
         return "redis://" + host + ":" + port;
     }
 
-    public static String redisURI(GenericContainer<?> container) {
+    static String redisURI(GenericContainer<?> container) {
         return redisURI(container.getHost(), container.getFirstMappedPort());
     }
 
diff --git a/src/main/java/com/redislabs/testcontainers/RedisStandaloneContainer.java b/src/main/java/com/redislabs/testcontainers/RedisStandaloneContainer.java
diff --git a/src/main/java/com/redislabs/testcontainers/support/AbstractRedisContainer.java b/src/main/java/com/redislabs/testcontainers/support/AbstractRedisContainer.java
@@ -1,11 +1,12 @@
-package com.redislabs.testcontainers;
+package com.redislabs.testcontainers.support;
 
+import com.redislabs.testcontainers.RedisServer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.shaded.org.apache.commons.lang.ClassUtils;
 import org.testcontainers.utility.DockerImageName;
 
-public abstract class AbstractRedisContainer<C extends AbstractRedisContainer<C>> extends GenericContainer<C> implements RedisContainer {
+public abstract class AbstractRedisContainer<C extends AbstractRedisContainer<C>> extends GenericContainer<C> implements RedisServer {
 
     public static final int REDIS_PORT = 6379;
 
@@ -26,7 +27,7 @@ protected AbstractRedisContainer(final DockerImageName dockerImageName, int port
      */
     @Override
     public String getRedisURI() {
-        return RedisContainerUtils.redisURI(this);
+        return RedisServer.redisURI(this);
     }
 
     @Override
diff --git a/src/main/java/com/redislabs/testcontainers/support/enterprise/ActionStatus.java b/src/main/java/com/redislabs/testcontainers/support/enterprise/ActionStatus.java
@@ -0,0 +1,21 @@
+package com.redislabs.testcontainers.support.enterprise;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ActionStatus {
+
+    @JsonProperty("action_uid")
+    private String actionUID;
+    @JsonProperty("module_uid")
+    private String moduleUID;
+    private String name;
+    private String progress;
+    private String status;
+    @JsonProperty("task_id")
+    private String taskID;
+
+}
diff --git a/src/main/java/com/redislabs/testcontainers/support/enterprise/Database.java b/src/main/java/com/redislabs/testcontainers/support/enterprise/Database.java
@@ -0,0 +1,98 @@
+package com.redislabs.testcontainers.support.enterprise;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.*;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Database {
+
+    public static final String DEFAULT_TYPE = "redis";
+    private static final long DEFAULT_MEMORY = 52428800;
+    private static final int DEFAULT_PORT = 12000;
+
+    private String name;
+    private Boolean replication;
+    private Boolean sharding;
+    @Builder.Default
+    @JsonProperty("memory_size")
+    private long memory = DEFAULT_MEMORY;
+    @Builder.Default
+    private int port = DEFAULT_PORT;
+    @Builder.Default
+    private String type = DEFAULT_TYPE;
+    @JsonProperty("oss_cluster")
+    private Boolean ossCluster;
+    @JsonProperty("proxy_policy")
+    private ProxyPolicy proxyPolicy;
+    @JsonProperty("oss_cluster_api_preferred_ip_type")
+    private IPType ossClusterAPIPreferredIPType;
+    @JsonProperty("shard_key_regex")
+    private List<Regex> shardKeyRegex;
+    @JsonProperty("shards_count")
+    private Integer shardCount;
+    @JsonProperty("shards_placement")
+    private ShardPlacement shardPlacement;
+    @JsonProperty("module_list")
+    private List<Module> moduleList;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static class Module {
+
+        @JsonProperty("module_name")
+        private String name;
+        @JsonProperty("module_id")
+        private String id;
+        @Builder.Default
+        @JsonProperty("module_args")
+        private String args = "";
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static class Regex {
+
+        private String regex;
+
+        public static Regex of(String regex) {
+            return new Regex(regex);
+        }
+
+    }
+
+    public enum ShardPlacement {
+        @JsonProperty("dense")
+        DENSE,
+        @JsonProperty("sparse")
+        SPARSE
+    }
+
+    public enum ProxyPolicy {
+        @JsonProperty("single")
+        SINGLE,
+        @JsonProperty("all-master-shards")
+        ALL_MASTER_SHARDS,
+        @JsonProperty("all-nodes")
+        ALL_NODES
+    }
+
+    public enum IPType {
+        @JsonProperty("internal")
+        INTERNAL,
+        @JsonProperty("external")
+        EXTERNAL
+    }
+}
diff --git a/src/main/java/com/redislabs/testcontainers/support/enterprise/DatabaseCreateResponse.java b/src/main/java/com/redislabs/testcontainers/support/enterprise/DatabaseCreateResponse.java
@@ -0,0 +1,13 @@
+package com.redislabs.testcontainers.support.enterprise;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DatabaseCreateResponse {
+
+    private String name;
+    private long uid;
+
+}
diff --git a/src/main/java/com/redislabs/testcontainers/support/enterprise/ModuleInstallResponse.java b/src/main/java/com/redislabs/testcontainers/support/enterprise/ModuleInstallResponse.java
@@ -0,0 +1,16 @@
+package com.redislabs.testcontainers.support.enterprise;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ModuleInstallResponse {
+
+    @JsonProperty("action_uid")
+    private String actionUID;
+    @JsonProperty("uid")
+    private String uid;
+
+}
diff --git a/src/main/java/com/redislabs/testcontainers/support/enterprise/ModuleResponse.java b/src/main/java/com/redislabs/testcontainers/support/enterprise/ModuleResponse.java
@@ -0,0 +1,16 @@
+package com.redislabs.testcontainers.support.enterprise;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ModuleResponse {
+
+    @JsonProperty("module_name")
+    private String name;
+    @JsonProperty("uid")
+    private String id;
+
+}
diff --git a/src/test/java/com/redislabs/testcontainers/TestRedisClusterContainer.java b/src/test/java/com/redislabs/testcontainers/TestRedisClusterContainer.java
@@ -35,6 +35,7 @@ public void cleanupEach() {
         connection.sync().flushall();
         connection.close();
         client.shutdown();
+        client.getResources().shutdown();
     }
 
     @Test
diff --git a/src/test/java/com/redislabs/testcontainers/TestRedisClusterWithKeyspaceNotificationsContainer.java b/src/test/java/com/redislabs/testcontainers/TestRedisClusterWithKeyspaceNotificationsContainer.java
@@ -40,6 +40,7 @@ public void cleanupEach() {
         connection.close();
         pubSubConnection.close();
         client.shutdown();
+        client.getResources().shutdown();
     }
 
     @Test
diff --git a/src/test/java/com/redislabs/testcontainers/TestRedisContainer.java b/src/test/java/com/redislabs/testcontainers/TestRedisContainer.java
@@ -10,10 +10,10 @@
 import java.util.Map;
 
 @Testcontainers
-public class TestRedisStandaloneContainer {
+public class TestRedisContainer {
 
     @Container
-    protected static final RedisStandaloneContainer REDIS = new RedisStandaloneContainer();
+    protected static final RedisContainer REDIS = new RedisContainer();
     private RedisClient client;
     private StatefulRedisConnection<String, String> connection;
 
@@ -31,6 +31,9 @@ public void setupEach() {
     @AfterEach
     public void cleanupEach() {
         connection.sync().flushall();
+        connection.close();
+        client.shutdown();
+        client.getResources().shutdown();
     }
 
     @Test
diff --git a/src/test/java/com/redislabs/testcontainers/TestRedisEnterpriseContainer.java b/src/test/java/com/redislabs/testcontainers/TestRedisEnterpriseContainer.java
diff --git a/src/test/java/com/redislabs/testcontainers/TestRedisModulesContainer.java b/src/test/java/com/redislabs/testcontainers/TestRedisModulesContainer.java
diff --git a/src/test/java/com/redislabs/testcontainers/TestRedisStandaloneWithKeyspaceNotificationsContainer.java b/src/test/java/com/redislabs/testcontainers/TestRedisStandaloneWithKeyspaceNotificationsContainer.java
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
diff --git a/src/test/resources/sleep.py b/src/test/resources/sleep.py
