client: drop support for Redis service users

Redis is no longer supported on Aiven. This commit drops the CLI args
related to Redis service users.

Author: bogdanp05

aiven/client/cli.py

@@ -43,11 +43,7 @@
 ]
 EOL_ADVANCE_WARNING_TIME = timedelta(weeks=26)  # Give 6 months advance notice for EOL services
 
-REDIS_VALKEY_ACL_ARGS = [
-    "redis_acl_keys",
-    "redis_acl_commands",
-    "redis_acl_categories",
-    "redis_acl_channels",
+VALKEY_ACL_ARGS = [
     "valkey_acl_keys",
     "valkey_acl_commands",
     "valkey_acl_categories",
@@ -1838,7 +1834,7 @@ def service__migration_status(self) -> None:
 
     def _parse_access_control(self) -> Mapping[str, Any]:
         arg_vars = vars(self.args)
-        result = {key: arg_vars[key].split() for key in REDIS_VALKEY_ACL_ARGS if arg_vars[key] is not None}
+        result = {key: arg_vars[key].split() for key in VALKEY_ACL_ARGS if arg_vars[key] is not None}
         for key in ["m3_group"]:
             value = arg_vars[key]
             if value is not None:
@@ -1849,10 +1845,6 @@ def _parse_access_control(self) -> Mapping[str, Any]:
     @arg.service_name
     @arg("--username", help="Service user username", required=True)
     @arg("--m3-group", help="Service user group")
-    @arg("--redis-acl-keys", help="ACL rules for keys (Redis only)")
-    @arg("--redis-acl-commands", help="ACL rules for commands (Redis only)")
-    @arg("--redis-acl-categories", help="ACL rules for command categories (Redis only)")
-    @arg("--redis-acl-channels", help="ACL rules for channels (Redis only)")
     @arg("--valkey-acl-keys", help="ACL rules for keys (Valkey only)")
     @arg("--valkey-acl-commands", help="ACL rules for commands (Valkey only)")
     @arg("--valkey-acl-categories", help="ACL rules for command categories (Valkey only)")
@@ -1891,13 +1883,13 @@ def service__user_list(self) -> None:
         """List service users"""
         service = self.client.get_service(project=self.get_project(), service=self.args.service_name)
         layout = [["username", "type"]]
-        if service["service_type"] == "redis":
+        if service["service_type"] == "valkey":
             layout[0].extend(
                 [
-                    "access_control.redis_acl_keys",
-                    "access_control.redis_acl_commands",
-                    "access_control.redis_acl_categories",
-                    "access_control.redis_acl_channels",
+                    "access_control.valkey_acl_keys",
+                    "access_control.valkey_acl_commands",
+                    "access_control.valkey_acl_categories",
+                    "access_control.valkey_acl_channels",
                 ]
             )
         self.print_response(
@@ -1918,12 +1910,7 @@ def service__user_get(self) -> None:
             project=self.get_project(), service=self.args.service_name, username=self.args.username
         )
         layout = [["username", "type"]]
-        for field in (
-            "redis_acl_keys",
-            "redis_acl_commands",
-            "redis_acl_categories",
-            "redis_acl_channels",
-        ):
+        for field in VALKEY_ACL_ARGS:
             if field in user.get("access_control", {}):
                 layout[0].append(f"access_control.{field}")
         self.print_response(user, single_item=True, format=self.args.format, json=self.args.json, table_layout=layout)
@@ -2098,17 +2085,13 @@ def service__user_password_reset(self) -> None:
     @arg.service_name
     @arg("--username", help="Service user username", required=True)
     @arg("--m3-group", help="Service user group")
-    @arg("--redis-acl-keys", help="ACL rules for keys (Redis only)")
-    @arg("--redis-acl-commands", help="ACL rules for commands (Redis only)")
-    @arg("--redis-acl-categories", help="ACL rules for command categories (Redis only)")
-    @arg("--redis-acl-channels", help="ACL rules for channels (Redis only)")
     @arg("--valkey-acl-keys", help="ACL rules for keys (Valkey only)")
     @arg("--valkey-acl-commands", help="ACL rules for commands (Valkey only)")
     @arg("--valkey-acl-categories", help="ACL rules for command categories (Valkey only)")
     @arg("--valkey-acl-channels", help="ACL rules for channels (Valkey only)")
     @arg.json
     def service__user_set_access_control(self) -> None:
-        """Set Redis/Valkey service user access control"""
+        """Set Valkey service user access control"""
         access_control = self._parse_access_control()
         self.client.set_service_user_access_control(
             project=self.get_project(),