fix usage of delete_temporary_credential

Author: sfc-gh-pczajka

test/integ/aio/sso/test_connection_manual_async.py

@@ -24,7 +24,7 @@
 import pytest
 
 import snowflake.connector.aio
-from snowflake.connector.auth._auth import delete_temporary_credential
+from snowflake.connector.token_cache import TokenCache, TokenKey, TokenType
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -77,11 +77,7 @@ async def fin():
 
 
 @pytest.mark.skipif(
-    not (
-        CONNECTION_PARAMETERS_SSO
-        and CONNECTION_PARAMETERS_ADMIN
-        and delete_temporary_credential
-    ),
+    not (CONNECTION_PARAMETERS_SSO and CONNECTION_PARAMETERS_ADMIN),
     reason="SSO and ADMIN connection parameters must be provided.",
 )
 async def test_connect_externalbrowser(token_validity_test_values):
@@ -90,10 +86,13 @@ async def test_connect_externalbrowser(token_validity_test_values):
     In order to run this test, remove the above pytest.mark.skip annotation and run it. It will popup a windows once
     but the rest connections should not create popups.
     """
-    delete_temporary_credential(
-        host=CONNECTION_PARAMETERS_SSO["host"],
-        user=CONNECTION_PARAMETERS_SSO["user"],
-        cred_type=ID_TOKEN,
+
+    TokenCache.make().remove(
+        TokenKey(
+            CONNECTION_PARAMETERS_SSO["host"],
+            CONNECTION_PARAMETERS_SSO["user"],
+            TokenType.ID_TOKEN,
+        )
     )  # delete existing temporary credential
     CONNECTION_PARAMETERS_SSO["client_store_temporary_credential"] = True
 

test/integ/sso/test_connection_manual.py

@@ -24,11 +24,7 @@
 import pytest
 
 import snowflake.connector
-
-try:
-    from snowflake.connector.auth import delete_temporary_credential
-except ImportError:
-    delete_temporary_credential = None
+from snowflake.connector.token_cache import TokenCache, TokenKey, TokenType
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -79,11 +75,7 @@ def fin():
 
 
 @pytest.mark.skipif(
-    not (
-        CONNECTION_PARAMETERS_SSO
-        and CONNECTION_PARAMETERS_ADMIN
-        and delete_temporary_credential
-    ),
+    not (CONNECTION_PARAMETERS_SSO and CONNECTION_PARAMETERS_ADMIN),
     reason="SSO and ADMIN connection parameters must be provided.",
 )
 def test_connect_externalbrowser(token_validity_test_values):
@@ -92,10 +84,12 @@ def test_connect_externalbrowser(token_validity_test_values):
     In order to run this test, remove the above pytest.mark.skip annotation and run it. It will popup a windows once
     but the rest connections should not create popups.
     """
-    delete_temporary_credential(
-        host=CONNECTION_PARAMETERS_SSO["host"],
-        user=CONNECTION_PARAMETERS_SSO["user"],
-        cred_type=ID_TOKEN,
+    TokenCache.make().remove(
+        TokenKey(
+            CONNECTION_PARAMETERS_SSO["host"],
+            CONNECTION_PARAMETERS_SSO["user"],
+            TokenType.ID_TOKEN,
+        )
     )  # delete existing temporary credential
     CONNECTION_PARAMETERS_SSO["client_store_temporary_credential"] = True
 

test/integ/sso/test_unit_sso_connection.py

@@ -8,26 +8,18 @@
 import os
 from unittest.mock import Mock, patch
 
-import pytest
-
 import snowflake.connector
+from snowflake.connector.token_cache import TokenCache, TokenKey, TokenType
 
 try:
     from snowflake.connector.compat import IS_MACOS
 except ImportError:
     IS_MACOS = False
-try:
-    from snowflake.connector.auth import delete_temporary_credential
-except ImportError:
-    delete_temporary_credential = None
+
 
 ID_TOKEN = "ID_TOKEN"
 
 
-@pytest.mark.skipif(
-    delete_temporary_credential is None,
-    reason="delete_temporary_credential is not available.",
-)
 @patch("snowflake.connector.auth_webbrowser.AuthByWebBrowser.authenticate")
 @patch("snowflake.connector.network.SnowflakeRestful._post_request")
 def test_connect_externalbrowser(
@@ -119,7 +111,7 @@ def test_body():
         authenticator = "externalbrowser"
         host = "testaccount.snowflakecomputing.com"
 
-        delete_temporary_credential(host=host, user=user, cred_type=ID_TOKEN)
+        TokenCache.make().remove(TokenKey(host, user, TokenType.ID_TOKEN))
 
         # first connection
         con = snowflake.connector.connect(

test/unit/aio/test_mfa_no_cache_async.py

@@ -12,24 +12,20 @@
 
 import snowflake.connector.aio
 from snowflake.connector.compat import IS_LINUX
+from snowflake.connector.token_cache import TokenCache, TokenKey, TokenType
 
 try:
     from snowflake.connector.options import installed_keyring
 except ImportError:
     # if installed_keyring is unavailable, we set it as True to skip the test
     installed_keyring = True
-try:
-    from snowflake.connector.auth._auth import delete_temporary_credential
-except ImportError:
-    delete_temporary_credential = None
 
 MFA_TOKEN = "MFATOKEN"
 
 
 @pytest.mark.skipif(
-    IS_LINUX or installed_keyring or not delete_temporary_credential,
-    reason="Required test env is Mac/Win with no pre-installed keyring package"
-    "and available delete_temporary_credential.",
+    IS_LINUX or installed_keyring,
+    reason="Required test env is Mac/Win with no pre-installed keyring package",
 )
 @patch("snowflake.connector.aio._network.SnowflakeRestful._post_request")
 async def test_mfa_no_local_secure_storage(mockSnowflakeRestfulPostRequest):
@@ -91,8 +87,8 @@ async def mock_post_request(url, headers, json_body, **kwargs):
         "host": "testaccount.snowflakecomputing.com",
     }
 
-    delete_temporary_credential(
-        host=conn_cfg["host"], user=conn_cfg["user"], cred_type=MFA_TOKEN
+    TokenCache.make().remove(
+        TokenKey(conn_cfg["host"], conn_cfg["user"], TokenType.MFA_TOKEN)
     )
 
     # first connection, no mfa token cache

test/unit/test_mfa_no_cache.py

@@ -12,24 +12,21 @@
 
 import snowflake.connector
 from snowflake.connector.compat import IS_LINUX
+from snowflake.connector.token_cache import TokenCache, TokenKey, TokenType
 
 try:
     from snowflake.connector.options import installed_keyring
 except ImportError:
     # if installed_keyring is unavailable, we set it as True to skip the test
     installed_keyring = True
-try:
-    from snowflake.connector.auth import delete_temporary_credential
-except ImportError:
-    delete_temporary_credential = None
+
 
 MFA_TOKEN = "MFATOKEN"
 
 
 @pytest.mark.skipif(
-    IS_LINUX or installed_keyring or not delete_temporary_credential,
-    reason="Required test env is Mac/Win with no pre-installed keyring package"
-    "and available delete_temporary_credential.",
+    IS_LINUX or installed_keyring,
+    reason="Required test env is Mac/Win with no pre-installed keyring package",
 )
 @patch("snowflake.connector.network.SnowflakeRestful._post_request")
 def test_mfa_no_local_secure_storage(mockSnowflakeRestfulPostRequest):
@@ -91,8 +88,12 @@ def mock_post_request(url, headers, json_body, **kwargs):
         "host": "testaccount.snowflakecomputing.com",
     }
 
-    delete_temporary_credential(
-        host=conn_cfg["host"], user=conn_cfg["user"], cred_type=MFA_TOKEN
+    TokenCache.make().remove(
+        TokenKey(
+            conn_cfg["host"],
+            conn_cfg["user"],
+            TokenType.MFA_TOKEN,
+        )
     )
 
     # first connection, no mfa token cache