Merge pull request #598 from splitio/deprecate-redis-errors

deprecate redis errors param

Author: chillaq

setup.py

@@ -45,7 +45,7 @@
     tests_require=TESTS_REQUIRES,
     extras_require={
         'test': TESTS_REQUIRES,
-        'redis': ['redis>=2.10.5'],
+        'redis': ['redis>=2.10.5,<7.0.0'],
         'uwsgi': ['uwsgi>=2.0.0'],
         'cpphash': ['mmh3cffi==0.2.1'],
         'asyncio': ['aiohttp>=3.8.4', 'aiofiles>=23.1.0'],

splitio/client/config.py

@@ -171,7 +171,12 @@ def sanitize(sdk_key, config):
         processed["httpAuthenticateScheme"] = authenticate_scheme
 
     processed = _sanitize_fallback_config(config, processed)    
+    
+    if config.get("redisErrors") is not None:
+        _LOGGER.warning('Parameter `redisErrors` is deprecated as it is no longer supported in redis lib.' \
+                        ' Will ignore this value.')
 
+        processed["redisErrors"] = None
     return processed
 
 def _sanitize_fallback_config(config, processed):

splitio/storage/adapters/redis.py

@@ -715,7 +715,6 @@ def _build_default_client(config):  # pylint: disable=too-many-locals
     unix_socket_path = config.get('redisUnixSocketPath', None)
     encoding = config.get('redisEncoding', 'utf-8')
     encoding_errors = config.get('redisEncodingErrors', 'strict')
-#    errors = config.get('redisErrors', None)
     decode_responses = config.get('redisDecodeResponses', True)
     retry_on_timeout = config.get('redisRetryOnTimeout', False)
     ssl = config.get('redisSsl', False)
@@ -740,7 +739,6 @@ def _build_default_client(config):  # pylint: disable=too-many-locals
         unix_socket_path=unix_socket_path,
         encoding=encoding,
         encoding_errors=encoding_errors,
-#        errors=errors, Starting from redis 6.0.0 errors argument is removed
         decode_responses=decode_responses,
         retry_on_timeout=retry_on_timeout,
         ssl=ssl,

tests/client/test_factory.py

@@ -112,7 +112,6 @@ def test_redis_client_creation(self, mocker):
             'redisConnectionPool': False,
             'redisUnixSocketPath': '/some_path',
             'redisEncodingErrors': 'non-strict',
-            'redisErrors': True,
             'redisDecodeResponses': True,
             'redisRetryOnTimeout': True,
             'redisSsl': True,
@@ -157,7 +156,6 @@ def synchronize_config(*_):
             unix_socket_path='/some_path',
             encoding='utf-8',
             encoding_errors='non-strict',
-#            errors=True,
             decode_responses=True,
             retry_on_timeout=True,
             ssl=True,

tests/storage/adapters/test_redis_adapter.py

@@ -99,7 +99,6 @@ def test_adapter_building(self, mocker):
             'redisUnixSocketPath': '/tmp/socket',
             'redisEncoding': 'utf-8',
             'redisEncodingErrors': 'strict',
-#            'redisErrors': 'abc',
             'redisDecodeResponses': True,
             'redisRetryOnTimeout': True,
             'redisSsl': True,
@@ -126,7 +125,6 @@ def test_adapter_building(self, mocker):
             unix_socket_path='/tmp/socket',
             encoding='utf-8',
             encoding_errors='strict',
-#            errors='abc',
             decode_responses=True,
             retry_on_timeout=True,
             ssl=True,
@@ -151,7 +149,6 @@ def test_adapter_building(self, mocker):
             'redisUnixSocketPath': '/tmp/socket',
             'redisEncoding': 'utf-8',
             'redisEncodingErrors': 'strict',
-#            'redisErrors': 'abc',
             'redisDecodeResponses': True,
             'redisRetryOnTimeout': True,
             'redisSsl': False,
@@ -529,7 +526,6 @@ def master_for(se,
             'redisUnixSocketPath': '/tmp/socket',
             'redisEncoding': 'utf-8',
             'redisEncodingErrors': 'strict',
-            'redisErrors': 'abc',
             'redisDecodeResponses': True,
             'redisRetryOnTimeout': True,
             'redisSsl': False,