Merge branch 'main' into mkeller/SNOW-1825621/oauth-code-flow-support

Author: sfc-gh-mmishchenko

Jenkinsfile

@@ -40,10 +40,10 @@ timestamps {
         stage('Test') {
             try {
             def commit_hash = "main" // default which we want to override
-            def bptp_tag = "bptp-built"
+            def bptp_tag = "bptp-stable"
             def response = authenticatedGithubCall("https://api.github.com/repos/snowflakedb/snowflake/git/ref/tags/${bptp_tag}")
             commit_hash = response.object.sha
-            // Append the bptp-built commit sha to params
+            // Append the bptp-stable commit sha to params
             params += [string(name: 'svn_revision', value: commit_hash)]
             } catch(Exception e) {
             println("Exception computing commit hash from: ${response}")

src/snowflake/connector/connection.py

@@ -1276,8 +1276,6 @@ def __open_connection(self):
                     backoff_generator=self._backoff_generator,
                 )
             elif self._authenticator == PROGRAMMATIC_ACCESS_TOKEN:
-                if not self._token and self._password:
-                    self._token = self._password
                 self.auth_class = AuthByPAT(self._token)
             elif self._authenticator == WORKLOAD_IDENTITY_AUTHENTICATOR:
                 self._check_experimental_authentication_flag()
@@ -1432,6 +1430,7 @@ def __config(self, **kwargs):
             OAUTH_AUTHENTICATOR,
             NO_AUTH_AUTHENTICATOR,
             WORKLOAD_IDENTITY_AUTHENTICATOR,
+            PROGRAMMATIC_ACCESS_TOKEN,
         }
 
         if not (self._master_token and self._session_token):

test/data/wiremock/mappings/auth/pat/invalid_token.json

@@ -11,7 +11,6 @@
           {
             "equalToJson" : {
               "data": {
-                "LOGIN_NAME": "testUser",
                 "AUTHENTICATOR": "PROGRAMMATIC_ACCESS_TOKEN",
                 "TOKEN": "some PAT"
               }

test/data/wiremock/mappings/auth/pat/successful_flow.json

@@ -11,7 +11,6 @@
           {
             "equalToJson" : {
               "data": {
-                "LOGIN_NAME": "testUser",
                 "AUTHENTICATOR": "PROGRAMMATIC_ACCESS_TOKEN",
                 "TOKEN": "some PAT"
               }

test/integ/test_cursor.py

@@ -11,7 +11,6 @@
 from datetime import date, datetime, timezone
 from typing import TYPE_CHECKING, NamedTuple
 from unittest import mock
-from unittest.mock import MagicMock
 
 import pytest
 import pytz
@@ -843,10 +842,11 @@ def test_timeout_query(conn_cnx):
                 # we can not precisely control the timing to send cancel query request right after server
                 # executes the query but before returning the results back to client
                 # it depends on python scheduling and server processing speed, so we mock here
-                with mock.patch.object(
-                    c, "_timebomb", new_callable=MagicMock
-                ) as mock_timerbomb:
-                    mock_timerbomb.executed = True
+                with mock.patch(
+                    "snowflake.connector.cursor._TrackedQueryCancellationTimer",
+                    autospec=True,
+                ) as mock_timebomb:
+                    mock_timebomb.return_value.executed = True
                     c.execute(
                         "select 123'",
                         timeout=0.1,

test/unit/test_programmatic_access_token.py

@@ -43,7 +43,6 @@ def test_valid_pat(wiremock_client: WiremockClient) -> None:
     )
 
     cnx = snowflake.connector.connect(
-        user="testUser",
         authenticator=PROGRAMMATIC_ACCESS_TOKEN,
         token="some PAT",
         account="testAccount",
@@ -70,7 +69,6 @@ def test_invalid_pat(wiremock_client: WiremockClient) -> None:
 
     with pytest.raises(snowflake.connector.errors.DatabaseError) as execinfo:
         snowflake.connector.connect(
-            user="testUser",
             authenticator=PROGRAMMATIC_ACCESS_TOKEN,
             token="some PAT",
             account="testAccount",
@@ -80,42 +78,3 @@ def test_invalid_pat(wiremock_client: WiremockClient) -> None:
         )
 
     assert str(execinfo.value).endswith("Programmatic access token is invalid.")
-
-
-@pytest.mark.skipolddriver
-def test_pat_as_password(wiremock_client: WiremockClient) -> None:
-    wiremock_data_dir = (
-        pathlib.Path(__file__).parent.parent
-        / "data"
-        / "wiremock"
-        / "mappings"
-        / "auth"
-        / "pat"
-    )
-
-    wiremock_generic_data_dir = (
-        pathlib.Path(__file__).parent.parent
-        / "data"
-        / "wiremock"
-        / "mappings"
-        / "generic"
-    )
-
-    wiremock_client.import_mapping(wiremock_data_dir / "successful_flow.json")
-    wiremock_client.add_mapping(
-        wiremock_generic_data_dir / "snowflake_disconnect_successful.json"
-    )
-
-    cnx = snowflake.connector.connect(
-        user="testUser",
-        authenticator=PROGRAMMATIC_ACCESS_TOKEN,
-        token=None,
-        password="some PAT",
-        account="testAccount",
-        protocol="http",
-        host=wiremock_client.wiremock_host,
-        port=wiremock_client.wiremock_http_port,
-    )
-
-    assert cnx, "invalid cnx"
-    cnx.close()