feat(commands/delete): confirm unless forced

Author: thekaveman

compiler_admin/commands/delete.py

@@ -21,6 +21,12 @@ def delete(args: Namespace) -> int:
         print(f"User does not exist: {account}")
         return RESULT_FAILURE
 
+    if getattr(args, "force", False) is False:
+        cont = input(f"Delete account {account}? (Y/n)")
+        if not cont.lower().startswith("y"):
+            print("Aborting delete.")
+            return RESULT_SUCCESS
+
     print(f"User exists, deleting: {account}")
 
     res = CallGAMCommand(("delete", "user", account, "noactionifalias"))

compiler_admin/main.py

@@ -49,7 +49,10 @@ def _subcmd(name, help, add_username_arg=True) -> argparse.ArgumentParser:
         "account_type", choices=ACCOUNT_TYPE_OU.keys(), help="Target account type for this conversion."
     )
 
-    _subcmd("delete", help="Delete a user account.")
+    delete_parser = _subcmd("delete", help="Delete a user account.")
+    delete_parser.add_argument(
+        "--force", action="store_true", default=False, help="Don't ask for confirmation before deletion."
+    )
 
     offboard_parser = _subcmd("offboard", help="Offboard a user account.")
     offboard_parser.add_argument("--alias", help="Account to assign username as an alias.")

tests/commands/test_delete.py

@@ -5,6 +5,20 @@
 from compiler_admin.commands.delete import delete, __name__ as MODULE
 
 
+@pytest.fixture
+def mock_input_yes(mock_input):
+    fix = mock_input(MODULE)
+    fix.return_value = "y"
+    return fix
+
+
+@pytest.fixture
+def mock_input_no(mock_input):
+    fix = mock_input(MODULE)
+    fix.return_value = "n"
+    return fix
+
+
 @pytest.fixture
 def mock_google_user_exists(mock_google_user_exists):
     return mock_google_user_exists(MODULE)
@@ -22,7 +36,8 @@ def test_delete_user_username_required():
         delete(args)
 
 
-def test_delete_user_exists(mock_google_user_exists, mock_google_CallGAMCommand):
+@pytest.mark.usefixtures("mock_input_yes")
+def test_delete_confirm_yes(mock_google_user_exists, mock_google_CallGAMCommand):
     mock_google_user_exists.return_value = True
 
     args = Namespace(username="username")
@@ -36,6 +51,17 @@ def test_delete_user_exists(mock_google_user_exists, mock_google_CallGAMCommand)
     assert "noactionifalias" in call_args
 
 
+@pytest.mark.usefixtures("mock_input_no")
+def test_delete_confirm_no(mock_google_user_exists, mock_google_CallGAMCommand):
+    mock_google_user_exists.return_value = True
+
+    args = Namespace(username="username")
+    res = delete(args)
+
+    assert res == RESULT_SUCCESS
+    mock_google_CallGAMCommand.assert_not_called()
+
+
 def test_delete_user_does_not_exist(mock_google_user_exists, mock_google_CallGAMCommand):
     mock_google_user_exists.return_value = False
 

tests/conftest.py

@@ -22,6 +22,12 @@ def __mock_module_name(module):
     return _mock_module_name
 
 
+@pytest.fixture
+def mock_input(mock_module_name):
+    """Fixture returns a function that patches the built-in input in a given module."""
+    return mock_module_name("input")
+
+
 @pytest.fixture
 def mock_commands_create(mock_module_name):
     """Fixture returns a function that patches commands.create in a given module."""

tests/test_main.py

@@ -88,7 +88,15 @@ def test_main_delete(mock_commands_delete):
 
     mock_commands_delete.assert_called_once()
     call_args = mock_commands_delete.call_args.args
-    assert Namespace(command="delete", username="username") in call_args
+    assert Namespace(command="delete", username="username", force=False) in call_args
+
+
+def test_main_delete_force(mock_commands_delete):
+    main(argv=["delete", "username", "--force"])
+
+    mock_commands_delete.assert_called_once()
+    call_args = mock_commands_delete.call_args.args
+    assert Namespace(command="delete", username="username", force=True) in call_args
 
 
 def test_main_delete_no_username(mock_commands_delete):