update to only delete no ttl keys

Author: ajay-sentry

core/management/commands/delete_rate_limit_keys.py

@@ -19,8 +19,10 @@ def handle(self, *args, **options):
 
         try:
             for key in redis.scan_iter(path):
-                print(f"Deleting key: {key.decode('utf-8')}")
-                redis.delete(key)
+                # -1 means the key has no expiry
+                if redis.ttl(key) == -1:
+                    print(f"Deleting key: {key.decode('utf-8')}")
+                    redis.delete(key)
         except Exception as e:
             print("Error occurred when deleting redis keys")
             print(e)

core/tests/test_management_commands.py

@@ -85,7 +85,7 @@ def test_update_gitlab_webhook_command(mocker):
 def test_delete_rate_limit_keys_user_id():
     redis = get_redis_connection()
     redis.set("rl-user:1", 1)
-    redis.set("rl-user:2", 1)
+    redis.set("rl-user:2", 1, ex=5000)
     redis.set("rl-ip:1", 1)
 
     call_command(
@@ -95,27 +95,29 @@ def test_delete_rate_limit_keys_user_id():
     )
 
     assert redis.get("rl-user:1") is None
-    assert redis.get("rl-user:2") is None
+    assert redis.get("rl-user:2") is not None
     assert redis.get("rl-ip:1") is not None
 
-    # Get rid of lingering key
+    # Get rid of lingering keys
     redis.delete("rl-ip:1")
+    redis.delete("rl-user:2")
 
 
 @pytest.mark.django_db
 def test_delete_rate_limit_keys_ip_option():
     redis = get_redis_connection()
     redis.set("rl-ip:1", 1)
-    redis.set("rl-ip:2", 1)
+    redis.set("rl-ip:2", 1, ex=5000)
     redis.set("rl-user:1", 1)
 
     call_command(
         "delete_rate_limit_keys", stdout=StringIO(), stderr=StringIO(), ip=True
     )
 
     assert redis.get("rl-ip:1") is None
-    assert redis.get("rl-ip:2") is None
+    assert redis.get("rl-ip:2") is not None
     assert redis.get("rl-user:1") is not None
 
-    # Get rid of lingering key
+    # Get rid of lingering keys
     redis.delete("rl-user:1")
+    redis.delete("rl-ip:2")