feat: Added username, password, and other connection config params

Author: Julien Ruaux

src/main/java/com/redis/trino/RediSearchClientModule.java

@@ -26,7 +26,7 @@
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static java.util.Objects.requireNonNull;
 
-import java.util.Optional;
+import java.time.Duration;
 
 import javax.inject.Singleton;
 
@@ -36,6 +36,7 @@
 import com.google.inject.Scopes;
 import com.redis.lettucemod.RedisModulesClient;
 
+import io.lettuce.core.RedisURI;
 import io.trino.spi.type.TypeManager;
 
 public class RediSearchClientModule implements Module {
@@ -50,15 +51,28 @@ public void configure(Binder binder) {
 		configBinder(binder).bindConfig(RediSearchConfig.class);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Singleton
 	@Provides
 	public static RediSearchSession createRediSearchSession(TypeManager typeManager, RediSearchConfig config) {
 		requireNonNull(config, "config is null");
-		Optional<String> uri = config.getUri();
-		if (uri.isPresent()) {
-			RedisModulesClient client = RedisModulesClient.create(uri.get());
+		if (config.getUri().isPresent()) {
+			RedisURI uri = RedisURI.create(config.getUri().get());
+			if (config.isInsecure()) {
+				uri.setVerifyPeer(false);
+			}
+			if (config.isTls()) {
+				uri.setSsl(true);
+			}
+			config.getUsername().ifPresent(uri::setUsername);
+			config.getPassword().ifPresent(uri::setPassword);
+			if (config.getTimeout() > 0) {
+				uri.setTimeout(Duration.ofSeconds(config.getTimeout()));
+			}
+			RedisModulesClient client = RedisModulesClient.create(uri);
 			return new RediSearchSession(typeManager, client.connect(), config);
 		}
 		throw new IllegalArgumentException("No Redis URI specified");
 	}
+
 }

src/main/java/com/redis/trino/RediSearchConfig.java

@@ -42,7 +42,12 @@ public class RediSearchConfig {
 
 	private String defaultSchema = DEFAULT_SCHEMA;
 	private Optional<String> uri = Optional.empty();
+	private Optional<String> username = Optional.empty();
+	private Optional<String> password = Optional.empty();
 	private boolean caseInsensitiveNameMatching;
+	private boolean insecure;
+	private boolean tls;
+	private long timeout;
 	private long defaultLimit = DEFAULT_LIMIT;
 	private long cursorCount = 0; // Use RediSearch default
 	private long tableCacheExpiration = DEFAULT_TABLE_CACHE_EXPIRATION.toSeconds();
@@ -116,6 +121,30 @@ public RediSearchConfig setUri(String uri) {
 		return this;
 	}
 
+	public Optional<String> getUsername() {
+		return username;
+	}
+
+	@Config("redisearch.username")
+	@ConfigDescription("Redis connection username")
+	@ConfigSecuritySensitive
+	public RediSearchConfig setUsername(String username) {
+		this.username = Optional.ofNullable(username);
+		return this;
+	}
+
+	public Optional<String> getPassword() {
+		return password;
+	}
+
+	@Config("redisearch.password")
+	@ConfigDescription("Redis connection password")
+	@ConfigSecuritySensitive
+	public RediSearchConfig setPassword(String password) {
+		this.password = Optional.ofNullable(password);
+		return this;
+	}
+
 	public boolean isCaseInsensitiveNameMatching() {
 		return caseInsensitiveNameMatching;
 	}
@@ -127,4 +156,36 @@ public RediSearchConfig setCaseInsensitiveNameMatching(boolean caseInsensitiveNa
 		return this;
 	}
 
+	public boolean isInsecure() {
+		return insecure;
+	}
+
+	@Config("redisearch.insecure")
+	@ConfigDescription("Allow insecure connections (e.g. invalid certificates) to Redis when using SSL")
+	public RediSearchConfig setInsecure(boolean insecure) {
+		this.insecure = insecure;
+		return this;
+	}
+
+	public boolean isTls() {
+		return tls;
+	}
+
+	@Config("redisearch.tls")
+	@ConfigDescription("Establish a secure TLS connection")
+	public RediSearchConfig setTls(boolean tls) {
+		this.tls = tls;
+		return this;
+	}
+
+	public long getTimeout() {
+		return timeout;
+	}
+
+	@Config("redisearch.timeout")
+	@ConfigDescription("Redis command timeout in seconds")
+	public RediSearchConfig setTimeout(long timeout) {
+		this.timeout = timeout;
+		return this;
+	}
 }

src/test/java/com/redis/trino/TestRediSearchConfig.java

@@ -16,7 +16,7 @@ public class TestRediSearchConfig {
 
 	@Test
 	public void testDefaults() {
-		assertRecordedDefaults(recordDefaults(RediSearchConfig.class).setUri(null)
+		assertRecordedDefaults(recordDefaults(RediSearchConfig.class).setUri(null).setInsecure(false).setUsername(null).setPassword(null).setTimeout(0).setTls(false)
 				.setDefaultSchema(RediSearchConfig.DEFAULT_SCHEMA).setDefaultLimit(RediSearchConfig.DEFAULT_LIMIT)
 				.setCaseInsensitiveNameMatching(false).setCursorCount(0)
 				.setTableCacheExpiration(RediSearchConfig.DEFAULT_TABLE_CACHE_EXPIRATION.toSeconds())