chore: Reducing complexity of qpc/cred/utils.py get_password

Reducing the complexity of get_password by breaking out the logic
for the individual credential attributes into their own functions.

qpc/cred/test_openshift_cred_add.py

@@ -86,7 +86,10 @@ def test_add_no_token(
             CLI().main()
         out, err = capsys.readouterr()
         assert out == ""
-        assert "one of the arguments --password --sshkeyfile --token is required" in err
+        assert (
+            "one of the arguments --password --sshkeyfile"
+            " --sshkeyvalue --token is required" in err
+        )
 
     def test_add_no_name(
         self,

qpc/cred/utils.py

@@ -13,43 +13,76 @@
 
 
 def get_password(args, req_payload, add_none=True):
-    """Collect the password value and place in credential dictionary.
+    """Collect the credential attribute values and place in credential dictionary.
 
     :param args: the command line arguments
     :param req_payload: the dictionary for the request
     :param add_none: add None for a key if True vs. not in dictionary
     :returns: the updated dictionary
     """
+    req_payload = _get_password_value(args, req_payload, add_none)
+    req_payload = _get_ssh_keyvalue_value(args, req_payload, add_none)
+    req_payload = _get_ssh_passphrase_value(args, req_payload, add_none)
+    req_payload = _get_become_password_value(args, req_payload, add_none)
+    req_payload = _get_token_value(args, req_payload, add_none)
+
+    return req_payload
+
+
+def _get_password_value(args, req_payload, add_none):
+    """Collect the password value and place in credential dictionary."""
     if "password" in args and args.password:
         print(_(messages.CONN_PASSWORD))
         pass_prompt = getpass()
         check_if_prompt_is_not_empty(pass_prompt)
         req_payload["password"] = pass_prompt
     elif add_none:
         req_payload["password"] = None
+
+    return req_payload
+
+
+def _get_ssh_keyvalue_value(args, req_payload, add_none):
+    """Collect the ssh_keyvalue value and place in credential dictionary."""
     if "ssh_keyvalue" in args and args.ssh_keyvalue:
         print(_(messages.SSH_KEYVALUE))
-        ssh_keyvalue_prompt = get_multiline_pass(
-            prompt=f"{messages.SSH_KEYVALUE_PROMPT}"
-        )
-        check_if_prompt_is_not_empty(ssh_keyvalue_prompt)
-        req_payload["ssh_keyvalue"] = ssh_keyvalue_prompt
+        pass_prompt = get_multiline_pass(prompt=f"{messages.SSH_KEYVALUE_PROMPT}")
+        check_if_prompt_is_not_empty(pass_prompt)
+        req_payload["ssh_keyvalue"] = pass_prompt
     elif add_none:
         req_payload["ssh_keyvalue"] = None
+
+    return req_payload
+
+
+def _get_ssh_passphrase_value(args, req_payload, add_none):
+    """Collect the ssh_passphrase value and place in credential dictionary."""
     if "ssh_passphrase" in args and args.ssh_passphrase:
         print(_(messages.SSH_PASSPHRASE))
         pass_prompt = getpass()
         check_if_prompt_is_not_empty(pass_prompt)
         req_payload["ssh_passphrase"] = pass_prompt
     elif add_none:
         req_payload["ssh_passphrase"] = None
+
+    return req_payload
+
+
+def _get_become_password_value(args, req_payload, add_none):
+    """Collect the become_password value and place in credential dictionary."""
     if "become_password" in args and args.become_password:
         print(_(messages.BECOME_PASSWORD))
         pass_prompt = getpass()
         check_if_prompt_is_not_empty(pass_prompt)
         req_payload["become_password"] = pass_prompt
     elif add_none:
         req_payload["become_password"] = None
+
+    return req_payload
+
+
+def _get_token_value(args, req_payload, add_none):
+    """Collect the token value and place in credential dictionary."""
     if getattr(args, "token", None):
         token_prompt = getpass(messages.AUTH_TOKEN)
         check_if_prompt_is_not_empty(token_prompt)