Test branch

dbt/adapters/databricks/api_client.py

@@ -13,8 +13,7 @@
 
 from dbt.adapters.databricks import utils
 from dbt.adapters.databricks.__version__ import version
-from dbt.adapters.databricks.auth import BearerAuth
-from dbt.adapters.databricks.credentials import DatabricksCredentials
+from dbt.adapters.databricks.credentials import BearerAuth, DatabricksCredentials
 from dbt.adapters.databricks.logging import logger
 
 DEFAULT_POLLING_INTERVAL = 10
@@ -557,8 +556,7 @@ def create(
         http_headers = credentials.get_all_http_headers(
             connection_parameters.pop("http_headers", {})
         )
-        credentials_provider = credentials.authenticate(None)
-        header_factory = credentials_provider(None)  # type: ignore
+        header_factory = credentials.authenticate().credentials_provider()  # type: ignore
         session.auth = BearerAuth(header_factory)
 
         session.headers.update({"User-Agent": user_agent, **http_headers})

pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "databricks-sdk==0.17.0",
+    "databricks-sdk==0.41.0",
     "databricks-sql-connector>=3.5.0, <4.0.0",
     "dbt-adapters>=1.10.3, <2.0",
     "dbt-common>=1.13.0, <2.0",

tests/profiles.py

@@ -26,6 +26,8 @@ def _build_databricks_cluster_target(
         "token": os.getenv("DBT_DATABRICKS_TOKEN"),
         "client_id": os.getenv("DBT_DATABRICKS_CLIENT_ID"),
         "client_secret": os.getenv("DBT_DATABRICKS_CLIENT_SECRET"),
+        "azure_client_id": os.getenv("DBT_DATABRICKS_AZURE_CLIENT_ID"),
+        "azure_client_secret": os.getenv("DBT_DATABRICKS_AZURE_CLIENT_SECRET"),
         "connect_retries": 3,
         "connect_timeout": 5,
         "retry_all": True,

tests/unit/test_adapter.py

@@ -246,9 +246,12 @@ def connect(
         ):
             assert server_hostname == "yourorg.databricks.com"
             assert http_path == "sql/protocolv1/o/1234567890123456/1234-567890-test123"
-            if not (expected_no_token or expected_client_creds):
-                assert credentials_provider._token == "dapiXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 
+            if not (expected_no_token or expected_client_creds):
+                assert (
+                    credentials_provider()().get("Authorization")
+                    == "Bearer dapiXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+                )
             if expected_client_creds:
                 assert kwargs.get("client_id") == "foo"
                 assert kwargs.get("client_secret") == "bar"

tests/unit/test_auth.py

@@ -65,22 +65,21 @@ def test_token(self):
             http_path="http://foo",
             schema="dbt",
         )
-        provider = creds.authenticate(None)
+        credentialManager = creds.authenticate()
+        provider = credentialManager.credentials_provider()
         assert provider is not None
 
-        headers_fn = provider()
+        headers_fn = provider
         headers = headers_fn()
         assert headers is not None
 
-        raw = provider.as_dict()
+        raw = credentialManager._config.as_dict()
         assert raw is not None
 
-        provider_b = creds._provider_from_dict()
-        headers_fn2 = provider_b()
-        headers2 = headers_fn2()
-        assert headers == headers2
+        assert headers == {"Authorization": "Bearer foo"}
 
 
+@pytest.mark.skip(reason="Cache moved to databricks sdk TokenCache")
 class TestShardedPassword:
     def test_store_and_delete_short_password(self):
         # set the keyring to mock class
@@ -133,6 +132,7 @@ def test_store_and_delete_long_password(self):
         assert retrieved_password is None
 
 
+@pytest.mark.skip(reason="Cache moved to databricks sdk TokenCache")
 class MockKeyring(keyring.backend.KeyringBackend):
     def __init__(self):
         self.file_location = self._generate_test_root_dir()

tests/unit/test_compute_config.py

@@ -1,4 +1,4 @@
-from unittest.mock import Mock
+from unittest.mock import Mock, patch
 
 import pytest
 from dbt_common.exceptions import DbtRuntimeError
@@ -23,7 +23,8 @@ def path(self):
 
     @pytest.fixture
     def creds(self, path):
-        return DatabricksCredentials(http_path=path)
+        with patch("dbt.adapters.databricks.credentials.Config"):
+            return DatabricksCredentials(http_path=path)
 
     @pytest.fixture
     def node(self):

tests/unit/test_idle_config.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 import pytest
 from dbt_common.exceptions import DbtRuntimeError
 
@@ -6,14 +8,15 @@
 from dbt.contracts.graph import model_config, nodes
 
 
+@patch("dbt.adapters.databricks.credentials.Config")
 class TestDatabricksConnectionMaxIdleTime:
     """Test the various cases for determining a specified warehouse."""
 
     errMsg = (
         "Compute resource foo does not exist or does not specify http_path, " "relation: a_relation"
     )
 
-    def test_get_max_idle_default(self):
+    def test_get_max_idle_default(self, _):
         creds = DatabricksCredentials()
 
         # No node and nothing specified in creds
@@ -72,7 +75,7 @@ def test_get_max_idle_default(self):
         # path = connections._get_http_path(node, creds)
         # self.assertEqual("alternate_path", path)
 
-    def test_get_max_idle_creds(self):
+    def test_get_max_idle_creds(self, _):
         creds_idle_time = 77
         creds = DatabricksCredentials(connect_max_idle=creds_idle_time)
 
@@ -123,7 +126,7 @@ def test_get_max_idle_creds(self):
         time = connections._get_max_idle_time(node, creds)
         assert creds_idle_time == time
 
-    def test_get_max_idle_compute(self):
+    def test_get_max_idle_compute(self, _):
         creds_idle_time = 88
         compute_idle_time = 77
         creds = DatabricksCredentials(connect_max_idle=creds_idle_time)
@@ -151,7 +154,7 @@ def test_get_max_idle_compute(self):
         time = connections._get_max_idle_time(node, creds)
         assert compute_idle_time == time
 
-    def test_get_max_idle_invalid(self):
+    def test_get_max_idle_invalid(self, _):
         creds_idle_time = "foo"
         compute_idle_time = "bar"
         creds = DatabricksCredentials(connect_max_idle=creds_idle_time)
@@ -204,7 +207,7 @@ def test_get_max_idle_invalid(self):
             "1,002.3 is not a valid value for connect_max_idle. " "Must be a number of seconds."
         ) in str(info.value)
 
-    def test_get_max_idle_simple_string_conversion(self):
+    def test_get_max_idle_simple_string_conversion(self, _):
         creds_idle_time = "12"
         compute_idle_time = "34"
         creds = DatabricksCredentials(connect_max_idle=creds_idle_time)