Merge remote-tracking branch 'origin/main' into paw/record

.changes/unreleased/Fixes-20240605-125611.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Surface SSO token expiration in logs
+time: 2024-06-05T12:56:11.802237-04:00
+custom:
+  Author: mikealfare, McKnight-42
+  Issue: "851"

dbt/adapters/snowflake/connections.py

@@ -268,7 +268,11 @@ def _get_access_token(self) -> str:
                 f"""Did not receive valid json with access_token.
                                         Showing json response: {result_json}"""
             )
-
+        elif "access_token" not in result_json:
+            raise FailedToConnectError(
+                "This error occurs when authentication has expired. "
+                "Please reauth with your auth provider."
+            )
         return result_json["access_token"]
 
     def _get_private_key(self):

tests/functional/oauth/test_oauth.py

@@ -31,9 +31,9 @@
 integration the same, just the refresh token changed)
 """
 
-import pytest
 import os
-from dbt.tests.util import run_dbt, check_relations_equal
+from dbt.tests.util import check_relations_equal, run_dbt
+import pytest
 
 
 _MODELS__MODEL_1_SQL = """

tests/unit/test_connections.py

@@ -1,6 +1,9 @@
 import os
+import pytest
 from importlib import reload
-from unittest.mock import Mock
+from unittest.mock import Mock, patch
+import multiprocessing
+from dbt.adapters.exceptions.connection import FailedToConnectError
 import dbt.adapters.snowflake.connections as connections
 import dbt.adapters.events.logging
 
@@ -36,3 +39,31 @@ def test_connnections_credentials_replaces_underscores_with_hyphens():
     }
     creds = connections.SnowflakeCredentials(**credentials)
     assert creds.account == "account-id-with-underscores"
+
+
+def test_snowflake_oauth_expired_token_raises_error():
+    credentials = {
+        "account": "test_account",
+        "user": "test_user",
+        "authenticator": "oauth",
+        "token": "expired_or_incorrect_token",
+        "database": "database",
+        "schema": "schema",
+    }
+
+    mp_context = multiprocessing.get_context("spawn")
+    mock_credentials = connections.SnowflakeCredentials(**credentials)
+
+    with patch.object(
+        connections.SnowflakeConnectionManager,
+        "open",
+        side_effect=FailedToConnectError(
+            "This error occurs when authentication has expired. "
+            "Please reauth with your auth provider."
+        ),
+    ):
+
+        adapter = connections.SnowflakeConnectionManager(mock_credentials, mp_context)
+
+        with pytest.raises(FailedToConnectError):
+            adapter.open()