refactor(switch): update arg format and passing

remove unused constant

Author: thekaveman

littlepay/config.py

@@ -18,7 +18,6 @@
     "envs": {ENV_QA: DEFAULT_ENV, ENV_PROD: DEFAULT_ENV},
     "participants": {"cst": {ENV_QA: DEFAULT_CREDENTIALS, ENV_PROD: DEFAULT_CREDENTIALS}},
 }
-CONFIG_TYPES = list(DEFAULT_ACTIVE.keys())
 
 
 def _ensure_current_exists() -> bool:

littlepay/main.py

@@ -7,7 +7,7 @@
 from littlepay.commands.groups import groups
 from littlepay.commands.products import products
 from littlepay.commands.switch import switch
-from littlepay.config import CONFIG_TYPES, Config
+from littlepay.config import Config
 
 
 def _subcmd(subparsers: _SubParsersAction, name: str, help: str) -> ArgumentParser:
@@ -113,10 +113,10 @@ def _maincmd(name, help):
     products_unlink = _subcmd(products_commands, "unlink", help="Unlink a concession group from one or more products")
     products_unlink.add_argument("group_id", help="The ID of the concession group to unlink")
 
-    # littlepay switch {env, participant} VALUE
+    # littlepay switch [[--env VALUE], [--participant VALUE]]
     switch_parser = _maincmd("switch", help="Switch the active environment or participant")
-    switch_parser.add_argument("switch_type", choices=CONFIG_TYPES, help="The type of object to switch", metavar="TYPE")
-    switch_parser.add_argument("switch_arg", help="The new object value", metavar="VALUE")
+    switch_parser.add_argument("-e", "--env", help="The environment to switch to")
+    switch_parser.add_argument("-p", "--participant", help="The participant to switch to")
 
     args = main_parser.parse_args(argv)
 
@@ -127,7 +127,7 @@ def _maincmd(name, help):
     elif args.command == "products":
         return products(args)
     elif args.command == "switch":
-        return switch(args.switch_type, args.switch_arg)
+        return switch(args.env, args.participant)
     else:
         main_parser.print_help()
         return RESULT_FAILURE

tests/test_main.py

@@ -5,7 +5,7 @@
 import pytest
 
 from littlepay.commands import RESULT_FAILURE, RESULT_SUCCESS
-from littlepay.config import CONFIG_TYPES, Config
+from littlepay.config import Config
 import littlepay.main
 from littlepay.main import main, __name__ as MODULE
 
@@ -270,24 +270,38 @@ def test_main_products_status_unrecognized(mock_commands_products, status_flag):
     assert mock_commands_products.call_count == 0
 
 
-@pytest.mark.parametrize("switch_type", CONFIG_TYPES)
-def test_main_switch_recognized_type(mock_commands_switch, switch_type):
-    result = main(argv=["switch", switch_type, "new_value"])
+@pytest.mark.parametrize("switch_arg", ["-e", "--env"])
+def test_main_switch_env(mock_commands_switch, switch_arg):
+    result = main(argv=["switch", switch_arg, "new_value"])
 
     assert result == RESULT_SUCCESS
-    mock_commands_switch.assert_called_once_with(switch_type, "new_value")
+    mock_commands_switch.assert_called_once_with("new_value", None)
 
 
-def test_main_switch_missing_value(mock_commands_switch):
-    with pytest.raises(SystemExit):
-        main(argv=["switch", "env"])
+@pytest.mark.parametrize("switch_arg", ["-p", "--participant"])
+def test_main_switch_participant(mock_commands_switch, switch_arg):
+    result = main(argv=["switch", switch_arg, "new_value"])
 
-    assert mock_commands_switch.call_count == 0
+    assert result == RESULT_SUCCESS
+    mock_commands_switch.assert_called_once_with(None, "new_value")
+
+
+@pytest.mark.parametrize(
+    "switch_args",
+    [["-e", "env", "-p", "participant"], ["--env", "env", "--participant", "participant"]],
+)
+def test_main_switch_both(mock_commands_switch, switch_args):
+    argv = ["switch"] + switch_args
+    result = main(argv=argv)
+
+    assert result == RESULT_SUCCESS
+    mock_commands_switch.assert_called_once_with("env", "participant")
 
 
-def test_main_switch_unrecognized_type(mock_commands_switch):
+@pytest.mark.parametrize("switch_type", ["-e", "--env", "-p", "--participant"])
+def test_main_switch_missing_value(mock_commands_switch, switch_type):
     with pytest.raises(SystemExit):
-        main(argv=["switch", "unrecognized", "new_value"])
+        main(argv=["switch", switch_type])
 
     assert mock_commands_switch.call_count == 0