`dbsqlcli.main.apply_credentials_from_cfg` returns only three values when `not cfg.get("credentials")`

[aucampia]

databricks-sql-cli/dbsqlcli/main.py

Lines 61 to 67 in 345ca09

	def apply_credentials_from_cfg(hostname, http_path, access_token, auth_type, cfg):
	"""
	Returns http_path, hostname, access_token and auth_type from the passed configuration or from clirc file.
	"""
	if not cfg.get("credentials"):
	return hostname, http_path, access_token

This function should return four values:

databricks-sql-cli/dbsqlcli/main.py

Lines 91 to 94 in 345ca09

	# Prefer CLI arguments. Fall back to the clirc file otherwise
	hostname, http_path, access_token, auth_type = apply_credentials_from_cfg(
	hostname, http_path, access_token, auth_type, _cfg
	)

[aucampia]

The problem this causes is:

$ pipx run --spec databricks-sql-cli==0.3.0 dbsqlcli -e 'SHOW CATALOGS;'
⚠️  dbsqlcli is already on your PATH and installed at /home/iwana/.local/bin/dbsqlcli. Downloading and running anyway.
Traceback (most recent call last):
  File "/home/iwana/.local/pipx/.cache/5642ff8ce8cd645/bin/dbsqlcli", line 8, in <module>
    sys.exit(cli())
             ^^^^^
  File "/home/iwana/.local/pipx/.cache/5642ff8ce8cd645/lib64/python3.11/site-packages/click/core.py", line 1130, in __call__
    return self.main(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/iwana/.local/pipx/.cache/5642ff8ce8cd645/lib64/python3.11/site-packages/click/core.py", line 1055, in main
    rv = self.invoke(ctx)
         ^^^^^^^^^^^^^^^^
  File "/home/iwana/.local/pipx/.cache/5642ff8ce8cd645/lib64/python3.11/site-packages/click/core.py", line 1404, in invoke
    return ctx.invoke(self.callback, **ctx.params)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/iwana/.local/pipx/.cache/5642ff8ce8cd645/lib64/python3.11/site-packages/click/core.py", line 760, in invoke
    return __callback(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/iwana/.local/pipx/.cache/5642ff8ce8cd645/lib64/python3.11/site-packages/dbsqlcli/main.py", line 711, in cli
    dbsqlcli = DBSQLCli(
               ^^^^^^^^^
  File "/home/iwana/.local/pipx/.cache/5642ff8ce8cd645/lib64/python3.11/site-packages/dbsqlcli/main.py", line 92, in __init__
    hostname, http_path, access_token, auth_type = apply_credentials_from_cfg(
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ValueError: not enough values to unpack (expected 4, got 3)

[susodapop]

I'm confused by your report since this has already been "fixed" in main for four months. Your example that shows only three returned items is only possible because you picked a commit older than four months. It doesn't appear anything needs to be fixed at this time. Can you double-check?

[aucampia]

I'm confused by your report since this has already been "fixed" in main for four months. Your example that shows only three returned items is only possible because you picked a commit older than four months.

This is the code I get if I use "copy permalink" from the main branch:

databricks-sql-cli/dbsqlcli/main.py

Lines 61 to 74 in f022940

	def apply_credentials_from_cfg(hostname, http_path, access_token, auth_type, cfg):
	"""
	Returns http_path, hostname, access_token and auth_type from the passed configuration or from clirc file.
	"""
	if not cfg.get("credentials"):
	return hostname, http_path, access_token
	hostname = hostname or cfg.get("credentials", {}).get("host_name")
	http_path = http_path or cfg.get("credentials", {}).get("http_path")
	access_token = access_token or cfg.get("credentials", {}).get("access_token")
	auth_type = auth_type or cfg.get("credentials", {}).get("auth_type")
	return hostname, http_path, access_token, auth_type

databricks-sql-cli/dbsqlcli/main.py

Lines 91 to 94 in f022940

	# Prefer CLI arguments. Fall back to the clirc file otherwise
	hostname, http_path, access_token, auth_type = apply_credentials_from_cfg(
	hostname, http_path, access_token, auth_type, _cfg
	)

That is from f022940 which is from 2 weeks ago. The code still has the same problem which I reported, which is that if not cfg.get("credentials"): it returns a tuple with 3 values, while trying to unpack 4. Or am I missing something?

[aucampia]

Can you create a permalink to where the problem is no longer present if it was fixed?

[aucampia]

Your example that shows only three returned items is only possible because you picked a commit older than four months.

Both links in the issue body link to 345ca09 - this commit is from the 31st of march:

I don't understand what you mean when you say I picked a four-month-old commit. What am I missing?

[aucampia]

simplescreenrecorder-2023-05-11_00.57.49.mp4

[aucampia]

Maybe you are not using the main branch?