fix: add validation for system caches delete flags (#629)

* fix: add validation for system caches delete flags

Signed-off-by: Lucas Rodriguez <[email protected]>

* remove optional typing for language and version args

Signed-off-by: Lucas Rodriguez <[email protected]>

---------

Signed-off-by: Lucas Rodriguez <[email protected]>

Author: lucasrod16

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Added validation for required flags for the `rsconnect system caches delete` command.
+
 ## [1.25.0] - 2024-12-18
 
 ### Added

rsconnect/api.py

@@ -1186,7 +1186,7 @@ def runtime_caches(self) -> list[ListEntryOutputDTO]:
             raise RSConnectException("To delete a runtime cache, client must be a RSConnectClient.")
         return self.client.system_caches_runtime_list()
 
-    def delete_runtime_cache(self, language: Optional[str], version: Optional[str], image_name: str, dry_run: bool):
+    def delete_runtime_cache(self, language: str, version: str, image_name: str, dry_run: bool):
         if not isinstance(self.client, RSConnectClient):
             raise RSConnectException("To delete a runtime cache, client must be a RSConnectClient.")
         target: DeleteInputDTO = {

rsconnect/main.py

@@ -2825,11 +2825,13 @@ def system_caches_list(
     "--language",
     "-l",
     help="The language of the target cache.",
+    required=True,
 )
 @click.option(
     "--version",
     "-V",
     help="The version of the target cache.",
+    required=True,
 )
 @click.option(
     "--image-name",
@@ -2852,8 +2854,8 @@ def system_caches_delete(
     insecure: bool,
     cacert: Optional[str],
     verbose: int,
-    language: Optional[str],
-    version: Optional[str],
+    language: str,
+    version: str,
     image_name: str,
     dry_run: bool,
 ):

tests/test_main_system_caches.py

@@ -143,3 +143,29 @@ def test_system_caches_delete_admin_nonexistent(self):
         self.assertEqual(result.exit_code, 1)
 
         self.assertRegex(result.output, "Cache does not exist")
+
+    # --version and --language flags are required
+    def test_system_caches_delete_required_flags(self):
+        api_key = get_key("admin")
+        runner = CliRunner()
+
+        # neither flag provided should fail
+        args = ["system", "caches", "delete"]
+        apply_common_args(args, server=CONNECT_SERVER, key=api_key)
+        result = runner.invoke(cli, args)
+        self.assertEqual(result.exit_code, 2)
+        self.assertRegex(result.output, "Error: Missing option '--language' / '-l'")
+
+        # only --language flag provided should fail
+        args = ["system", "caches", "delete", "--language", "Python"]
+        apply_common_args(args, server=CONNECT_SERVER, key=api_key)
+        result = runner.invoke(cli, args)
+        self.assertEqual(result.exit_code, 2)
+        self.assertRegex(result.output, "Error: Missing option '--version' / '-V'")
+
+        # only --version flag provided should fail
+        args = ["system", "caches", "delete", "--version", "1.2.3"]
+        apply_common_args(args, server=CONNECT_SERVER, key=api_key)
+        result = runner.invoke(cli, args)
+        self.assertEqual(result.exit_code, 2)
+        self.assertRegex(result.output, "Error: Missing option '--language' / '-l'")