Skip to content

Support AUTH2 in MIGRATE #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Support AUTH2 in MIGRATE #1616

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c73b9d
Support auth2 in MIGRATE
AvitalFineRedis Oct 14, 2021
5640e6d
flake8
AvitalFineRedis Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions redis/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ def client_kill_filter(self, _id=None, _type=None, addr=None,
client_types = ('normal', 'master', 'slave', 'pubsub')
if str(_type).lower() not in client_types:
raise DataError("CLIENT KILL type must be one of %r" % (
client_types,))
client_types,))
args.extend((b'TYPE', _type))
if skipme is not None:
if not isinstance(skipme, bool):
Expand Down Expand Up @@ -363,7 +363,7 @@ def client_list(self, _type=None, client_id=[]):
client_types = ('normal', 'master', 'replica', 'pubsub')
if str(_type).lower() not in client_types:
raise DataError("CLIENT LIST _type must be one of %r" % (
client_types,))
client_types,))
args.append(b'TYPE')
args.append(_type)
if not isinstance(client_id, list):
Expand Down Expand Up @@ -542,7 +542,8 @@ def lolwut(self, *version_numbers):
return self.execute_command('LOLWUT')

def migrate(self, host, port, keys, destination_db, timeout,
copy=False, replace=False, auth=None):
copy=False, replace=False, auth=None, auth2username=None,
auth2Password=None):
"""
Migrate 1 or more keys from the current Redis server to a different
server specified by the ``host``, ``port`` and ``destination_db``.
Expand All @@ -563,15 +564,21 @@ def migrate(self, host, port, keys, destination_db, timeout,
keys = list_or_args(keys, [])
if not keys:
raise DataError('MIGRATE requires at least one key')
if auth2username is None and auth2Password is not None or \
auth2Password is None and auth2username is not None:
raise DataError('auth2username and auth2Password must be '
'given together.')
pieces = []
if copy:
pieces.append(b'COPY')
pieces.append('COPY')
if replace:
pieces.append(b'REPLACE')
pieces.append('REPLACE')
if auth:
pieces.append(b'AUTH')
pieces.append('AUTH')
pieces.append(auth)
pieces.append(b'KEYS')
if auth2username and auth2Password:
pieces.extend(['AUTH2', auth2username, auth2Password])
pieces.append('KEYS')
pieces.extend(keys)
return self.execute_command('MIGRATE', host, port, '', destination_db,
timeout, *pieces)
Expand Down Expand Up @@ -809,6 +816,7 @@ def dump(self, name):
def exists(self, *names):
"Returns the number of ``names`` that exist"
return self.execute_command('EXISTS', *names)

__contains__ = exists

def expire(self, name, time):
Expand Down Expand Up @@ -2992,7 +3000,7 @@ def _georadiusgeneric(self, command, *args, **kwargs):
elif kwargs['unit']:
pieces.append(kwargs['unit'])
else:
pieces.append('m',)
pieces.append('m', )

if kwargs['any'] and kwargs['count'] is None:
raise DataError("``any`` can't be provided without ``count``")
Expand Down Expand Up @@ -3231,6 +3239,7 @@ class BitFieldOperation:
"""
Command builder for BITFIELD commands.
"""

def __init__(self, client, key, default_overflow=None):
self.client = client
self.key = key
Expand Down