Updates to beta2

Signed-off-by: Elena Kolevska <elena@kolevska.com>

Author: elena-kolevska

.env.example

@@ -5,7 +5,7 @@ REDIS_PASSWORD=
 REDIS_DB=0
 REDIS_CLUSTER=false
 REDIS_CLUSTER_NODES=
-REDIS_SSL=false
+REDIS_SSL_ENABLED=false
 REDIS_SSL_KEYFILE=
 REDIS_SSL_CERTFILE=
 REDIS_SSL_CERT_REQS=required
@@ -14,8 +14,6 @@ REDIS_SSL_CA_PATH=
 REDIS_SSL_CA_DATA=
 REDIS_SSL_CHECK_HOSTNAME=true
 REDIS_SSL_PASSWORD=
-REDIS_SSL_VALIDATE_OCSP=false
-REDIS_SSL_VALIDATE_OCSP_STAPLED=false
 REDIS_SSL_MIN_VERSION=
 REDIS_SSL_CIPHERS=
 REDIS_RELAXED_TIMEOUT=

README.md

@@ -35,7 +35,7 @@ make start
 
 ```bash
 # Install dependencies
-make install-deps
+make install-deps-venv
 
 # Test Redis connection
 make test-connection

cli.py

@@ -118,7 +118,7 @@ def describe_profile(profile_name):
 @click.option('--db', type=int, default=lambda: get_env_or_default('REDIS_DB', 0, int), help='Redis database number')
 @click.option('--cluster', is_flag=True, default=lambda: get_env_or_default('REDIS_CLUSTER', False, bool), help='Use Redis Cluster mode')
 @click.option('--cluster-nodes', default=lambda: get_env_or_default('REDIS_CLUSTER_NODES', None), help='Comma-separated list of cluster nodes (host:port)')
-@click.option('--ssl', is_flag=True, default=lambda: get_env_or_default('REDIS_SSL', False, bool), help='Use SSL/TLS connection')
+@click.option('--ssl', is_flag=True, default=lambda: get_env_or_default('REDIS_SSL_ENABLED', False, bool), help='Use SSL/TLS connection')
 @click.option('--ssl-keyfile', default=lambda: get_env_or_default('REDIS_SSL_KEYFILE', None), help='Path to client private key file')
 @click.option('--ssl-certfile', default=lambda: get_env_or_default('REDIS_SSL_CERTFILE', None), help='Path to client certificate file')
 @click.option('--ssl-cert-reqs', default=lambda: get_env_or_default('REDIS_SSL_CERT_REQS', 'required'), type=click.Choice(['none', 'optional', 'required']), help='SSL certificate requirements')
@@ -127,7 +127,7 @@ def describe_profile(profile_name):
 @click.option('--ssl-ca-data', default=lambda: get_env_or_default('REDIS_SSL_CA_DATA', None), help='CA certificate data as string')
 @click.option('--ssl-check-hostname', is_flag=True, default=lambda: get_env_or_default('REDIS_SSL_CHECK_HOSTNAME', True, bool), help='Check SSL hostname')
 @click.option('--ssl-password', default=lambda: get_env_or_default('REDIS_SSL_PASSWORD', None), help='Password for SSL private key')
-@click.option('--ssl-min-version', default=lambda: get_env_or_default('REDIS_SSL_MIN_VERSION', None), help='Minimum SSL/TLS version (TLSv1, TLSv1_1, TLSv1_2, TLSv1_3 or 1.0, 1.1, 1.2, 1.3)')
+@click.option('--ssl-min-version', default=lambda: get_env_or_default('REDIS_SSL_MIN_VERSION', 'TLSv1_2'), help='Minimum SSL/TLS version (TLSv1, TLSv1_1, TLSv1_2, TLSv1_3 or 1.0, 1.1, 1.2, 1.3). Default: TLSv1_2 for Redis Enterprise compatibility')
 @click.option('--ssl-ciphers', default=lambda: get_env_or_default('REDIS_SSL_CIPHERS', None), help='SSL cipher suite')
 @click.option('--socket-timeout', type=float, default=lambda: get_env_or_default('REDIS_SOCKET_TIMEOUT', None), help='Socket timeout in seconds')
 @click.option('--socket-connect-timeout', type=float, default=lambda: get_env_or_default('REDIS_SOCKET_CONNECT_TIMEOUT', None), help='Socket connect timeout in seconds')

redis_client.py

@@ -7,6 +7,7 @@
 import redis
 import redis.sentinel
 from redis.cluster import RedisCluster
+from redis.maint_notifications import MaintNotificationsConfig
 from redis.retry import Retry
 from redis.backoff import ExponentialWithJitterBackoff
 from redis.exceptions import (
@@ -134,7 +135,11 @@ def _build_pool_kwargs(self) -> Dict[str, Any]:
             if self.config.ssl_password is not None:
                 ssl_kwargs['ssl_password'] = self.config.ssl_password
             if self.config.ssl_min_version is not None:
-                ssl_kwargs['ssl_min_version'] = _convert_ssl_min_version(self.config.ssl_min_version)
+                # Handle both string and TLSVersion objects
+                if isinstance(self.config.ssl_min_version, str):
+                    ssl_kwargs['ssl_min_version'] = _convert_ssl_min_version(self.config.ssl_min_version)
+                else:
+                    ssl_kwargs['ssl_min_version'] = self.config.ssl_min_version
             if self.config.ssl_ciphers is not None:
                 ssl_kwargs['ssl_ciphers'] = self.config.ssl_ciphers
 
@@ -171,20 +176,20 @@ def _connect_standalone(self):
         """Connect to standalone Redis instance."""
         start_time = time.time()
 
-        print("\n\n\n ------- Pool kwargs:", {**self._pool_kwargs})
+        print("\n\n---- Args:" + str(self._pool_kwargs))
 
         if self.config.maintenance_notifications_enabled:
             # Build maintenance events config, only passing relaxed_timeouts if not None
             maintenance_config_kwargs = {"enabled": self.config.maintenance_notifications_enabled}
             if self.config.maintenance_relaxed_timeout is not None:
-                maintenance_config_kwargs["relaxed_timeouts"] = self.config.maintenance_relaxed_timeout
+                maintenance_config_kwargs["relaxed_timeout"] = self.config.maintenance_relaxed_timeout
 
 
             self._client = redis.Redis(
                 host=self.config.host,
                 port=self.config.port,
                 db=self.config.database,
-                maintenance_events_config=redis.maintenance_events.MaintenanceEventsConfig(**maintenance_config_kwargs),
+                maint_notifications_config=MaintNotificationsConfig(**maintenance_config_kwargs),
                 protocol=self.config.protocol,
                 **self._pool_kwargs
             )

requirements.txt

@@ -1,4 +1,4 @@
-redis==7.0.0b1
+redis==7.0.0b2
 #redis==6.4.0
 click>=8.0.0
 prometheus-client>=0.16.0