cli: If 'login' called but we have an API key, print and exit

crobinso · crobinso · commit 500479e14bb0 · 2020-01-12T15:20:57.000-05:00
Otherwise the API throws an unfriendly error

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -1040,6 +1040,10 @@ def _handle_login(opt, action, bz):
         if use_key:
             bz.interactive_save_api_key()
         elif do_interactive_login:
+            if bz.api_key:
+                print("You already have an API key configured for %s" % bz.url)
+                print("There is no need to cache a login token. Exiting.")
+                sys.exit(0)
             print("Logging into %s" % urlparse(bz.url)[1])
             bz.interactive_login(username, password,
                     restrict_login=opt.restrict_login)
diff --git a/tests/test_cli_login.py b/tests/test_cli_login.py
@@ -100,3 +100,9 @@ def test_interactive_login(monkeypatch, run_cli):
     assert tmp.name in out
     tests.utils.diff_compare(open(tmp.name).read(),
             "data/clioutput/test_interactive_login_apikey_rcfile.txt")
+
+    # Check that we don't attempt to log in if API key is configured
+    assert bz.api_key
+    cmd = "bugzilla login"
+    out = run_cli(cmd, bz)
+    assert "already have an API" in out
