Fix test + exceptions

Author: renaudhartert-db

databricks/sdk/oidc.py

@@ -110,16 +110,19 @@ def id_token(self) -> IdToken:
         """
         if not self.path:
             raise ValueError("Missing path")
+        
+        token = None
         try:
             with open(self.path, "r") as f:
                 token = f.read().strip()
-            if not token:
-                raise ValueError(f"File {self.path!r} is empty")
-            return IdToken(jwt=token)
         except FileNotFoundError:
             raise ValueError(f"File {self.path!r} does not exist")
         except Exception as e:
             raise ValueError(f"Error reading token file: {str(e)}")
+        
+        if not token:
+            raise ValueError(f"File {self.path!r} is empty")
+        return IdToken(jwt=token)
 
 
 class GitHubIdTokenSource(IdTokenSource):

tests/test_credentials_provider.py

@@ -26,7 +26,7 @@ def test_external_browser_refresh_success(mocker):
 
     # Inject the mock implementations.
     mocker.patch(
-        "databricks.sdk.credentials_provider.TokenCache",
+        "databricks.sdk.oauth.TokenCache",
         return_value=mock_token_cache,
     )
 
@@ -66,11 +66,11 @@ def test_external_browser_refresh_failure_new_oauth_flow(mocker):
 
     # Inject the mock implementations.
     mocker.patch(
-        "databricks.sdk.credentials_provider.TokenCache",
+        "databricks.sdk.oauth.TokenCache",
         return_value=mock_token_cache,
     )
     mocker.patch(
-        "databricks.sdk.credentials_provider.OAuthClient",
+        "databricks.sdk.oauth.OAuthClient",
         return_value=mock_oauth_client,
     )
 
@@ -112,11 +112,11 @@ def test_external_browser_no_cached_credentials(mocker):
 
     # Inject the mock implementations.
     mocker.patch(
-        "databricks.sdk.credentials_provider.TokenCache",
+        "databricks.sdk.oauth.TokenCache",
         return_value=mock_token_cache,
     )
     mocker.patch(
-        "databricks.sdk.credentials_provider.OAuthClient",
+        "databricks.sdk.oauth.OAuthClient",
         return_value=mock_oauth_client,
     )
 
@@ -150,11 +150,11 @@ def test_external_browser_consent_fails(mocker):
 
     # Inject the mock implementations.
     mocker.patch(
-        "databricks.sdk.credentials_provider.TokenCache",
+        "databricks.sdk.oauth.TokenCache",
         return_value=mock_token_cache,
     )
     mocker.patch(
-        "databricks.sdk.credentials_provider.OAuthClient",
+        "databricks.sdk.oauth.OAuthClient",
         return_value=mock_oauth_client,
     )