client: add support for Valkey connection info

Author: bogdanp05

aiven/client/cli.py

@@ -12,7 +12,7 @@
 from aiven.client.connection_info.common import Store
 from aiven.client.connection_info.kafka import KafkaCertificateConnectionInfo, KafkaSASLConnectionInfo
 from aiven.client.connection_info.pg import PGConnectionInfo
-from aiven.client.connection_info.redis import RedisConnectionInfo
+from aiven.client.connection_info.valkey import ValkeyConnectionInfo
 from aiven.client.speller import suggest
 from argparse import ArgumentParser
 from ast import literal_eval
@@ -1578,11 +1578,11 @@ def service__connection_info__alloydbomni__string(self) -> None:
     @arg("--replica", action="store_true")
     @arg("-u", "--username", default="default")
     @arg("-d", "--db")
-    def service__connection_info__redis__uri(self) -> None:
-        """Redis connection string"""
+    def service__connection_info__valkey__uri(self) -> None:
+        """Valkey connection string"""
         service = self.client.get_service(project=self.get_project(), service=self.args.service_name)
 
-        ci = RedisConnectionInfo.from_service(
+        ci = ValkeyConnectionInfo.from_service(
             service,
             route=self._get_route_from_args(),
             usage=self._get_usage_from_args(),
@@ -1617,13 +1617,15 @@ def service__cli(self) -> None:
             command, params, env = self._build_influx_start_info(url)
         elif service_type == "postgres":
             command, params, env = self._build_psql_start_info(url)
-        elif service_type == "rediss":
-            command, params, env = self._build_redis_start_info(url)
+        elif service_type == "valkey":
+            command, params, env = self._build_valkey_start_info(url)
         elif service_type == "mysql":
             command, params, env = self._build_mysql_start_info(url)
         else:
             raise argx.UserError(
-                "Unsupported service type {}. Only InfluxDB, PostgreSQL, and Redis are supported".format(service_type)
+                "Unsupported service type {}. Only InfluxDB, PostgreSQL, MySQL, and Valkey are supported".format(
+                    service_type
+                )
             )
 
         try:
@@ -1666,7 +1668,7 @@ def _build_mysql_start_info(self, url: str) -> tuple[str, list, Mapping]:
         ]
         return "mysql", params, {"MYSQL_PWD": info.password}
 
-    def _build_redis_start_info(self, url: str) -> tuple[str, list, Mapping]:
+    def _build_valkey_start_info(self, url: str) -> tuple[str, list, Mapping]:
         info = urlparse(url)
         params = [
             "--tls",
@@ -1677,7 +1679,7 @@ def _build_redis_start_info(self, url: str) -> tuple[str, list, Mapping]:
             "--user",
             info.username,
         ]
-        return "redis-cli", params, {"REDISCLI_AUTH": info.password}
+        return "valkey-cli", params, {"VALKEYCLI_AUTH": info.password}
 
     @arg.project
     @arg.service_name

aiven/client/connection_info/redis.py renamed to aiven/client/connection_info/valkey.py

@@ -9,7 +9,7 @@
 
 
 @dataclass
-class RedisConnectionInfo:
+class ValkeyConnectionInfo:
     host: str
     port: int
     username: str
@@ -26,10 +26,10 @@ def from_service(
         privatelink_connection_id: object | str,
         username: str,
         db: str,
-    ) -> RedisConnectionInfo:
-        if service["service_type"] != "redis":
+    ) -> ValkeyConnectionInfo:
+        if service["service_type"] != "valkey":
             raise ConnectionInfoError(
-                "Cannot format redis connection info for service type {service_type}".format_map(service)
+                "Cannot format Valkey connection info for service type {service_type}".format_map(service)
             )
 
         info = find_component(
@@ -38,7 +38,7 @@ def from_service(
         host = info["host"]
         port = info["port"]
         if username == "default":
-            password = service["connection_info"]["redis_password"]
+            password = service["connection_info"]["valkey_password"]
         else:
             user = find_user(service, username)
             password = user.get("password")

tests/test_pretty.py

@@ -200,10 +200,10 @@ def test_yield_table() -> None:
         },
         {
             "access_control": {
-                "redis_acl_categories": ["+@all"],
-                "redis_acl_channels": ["*"],
-                "redis_acl_commands": ["+get", "-set"],
-                "redis_acl_keys": ["key1", "key2"],
+                "valkey_acl_categories": ["+@all"],
+                "valkey_acl_channels": ["*"],
+                "valkey_acl_commands": ["+get", "-set"],
+                "valkey_acl_keys": ["key1", "key2"],
             },
             "password": "qwertyuiop",
             "type": "regular",
@@ -220,18 +220,18 @@ def test_yield_table() -> None:
         "myuser    regular",
     ]
 
-    one_row_layout_redis = [["username", "type", "access_control.redis_acl_keys"]]
-    result = yield_table(rows, table_layout=one_row_layout_redis)
+    one_row_layout_valkey = [["username", "type", "access_control.valkey_acl_keys"]]
+    result = yield_table(rows, table_layout=one_row_layout_valkey)
     assert list(result) == [
-        "USERNAME  TYPE     ACCESS_CONTROL.REDIS_ACL_KEYS",
-        "========  =======  =============================",
+        "USERNAME  TYPE     ACCESS_CONTROL.VALKEY_ACL_KEYS",
+        "========  =======  ==============================",
         "avnadmin  primary",
         "myuser    regular  key1, key2",
     ]
 
     vertical_layout_both: TableLayout = [
         ["username", "type"],
-        "access_control.redis_acl_keys",
+        "access_control.valkey_acl_keys",
         "access_control.pg_allow_replication",
     ]
     result = yield_table(rows, table_layout=vertical_layout_both)
@@ -242,5 +242,5 @@ def test_yield_table() -> None:
         "    access_control.pg_allow_replication = true",
         "",
         "myuser    regular",
-        "    access_control.redis_acl_keys = key1, key2",
+        "    access_control.valkey_acl_keys = key1, key2",
     ]

tests/test_speller.py

@@ -24,7 +24,7 @@
     "m3aggregator",
     "mysql",
     "pg",
-    "redis",
+    "valkey",
     "sw",
     "flink",
 ]