salt-key -D should error if arguments are given #67903

changelog/67903.fixed.md

@@ -0,0 +1 @@
+Fixed if arguments are passed to the key delete all, -D, it will throw an error

salt/cli/key.py

@@ -1,4 +1,5 @@
 import salt.utils.parsers
+from salt.exceptions import SaltInvocationError
 from salt.utils.verify import check_user
 
 
@@ -14,6 +15,11 @@ def run(self):
         import salt.key
 
         self.parse_args()
+        if self.options.delete_all:
+            if self.args:
+                raise SaltInvocationError(
+                    "Delete all takes no arguments. Use -d to delete specified keys"
+                )
 
         key = salt.key.KeyCLI(self.config)
         if check_user(self.config["user"]):

tests/pytests/integration/cli/test_salt_key.py

@@ -73,6 +73,15 @@ def test_remove_key(salt_master, salt_key_cli):
             os.unlink(key)
 
 
+def test_remove_all_keys_with_arg(salt_key_cli):
+    """
+    test salt-key -D usage with args
+    """
+    # Remove Key
+    ret = salt_key_cli.run("-D", "junk")
+    assert "Delete all takes no arguments" in ret.stderr
+
+
 @pytest.mark.skip_if_not_root
 @pytest.mark.destructive_test
 @pytest.mark.skip_on_windows(reason="PAM is not supported on Windows")