Cherrypicks to aio connector part8 #2458

sfc-gh-pczajka · 2025-08-07T13:53:07Z

sfc-gh-fpawlowski · 2025-08-11T19:47:36Z

test/unit/test_programmatic_access_token.py

@@ -47,7 +47,6 @@ def test_valid_pat(wiremock_client: WiremockClient) -> None:
    )

    cnx = snowflake.connector.connect(
-        user="testUser",


I think this change was missed in the async code

sfc-gh-fpawlowski · 2025-08-11T19:47:46Z

test/unit/test_programmatic_access_token.py

@@ -74,7 +73,6 @@ def test_invalid_pat(wiremock_client: WiremockClient) -> None:

    with pytest.raises(snowflake.connector.errors.DatabaseError) as execinfo:
        snowflake.connector.connect(
-            user="testUser",


sfc-gh-fpawlowski · 2025-08-11T19:52:28Z

test/integ/test_cursor.py

-                    c, "_timebomb", new_callable=MagicMock
-                ) as mock_timerbomb:
-                    mock_timerbomb.executed = True
+                with mock.patch(


We have this test in async code called test_timeout_query as well.
It still contains the below line:
_with mock.patch.object(c, "timebomb", mock_timebomb):

which was removed due to being identified as a source of flakiness.

Should we move this change to async code?

Timebombs are different objects in sync and async, so we should be fine (as long as mock.patch.object itself was flaky)

sfc-gh-fpawlowski · 2025-08-11T19:58:12Z

src/snowflake/connector/aio/_azure_storage_client.py

@@ -37,8 +36,6 @@

 logger = getLogger(__name__)

-getLogger("aiohttp").addFilter(AzureCredentialFilter())


Shouldn't we add aiohttp to MODULES_TO_MASK_LOGS_NAMES in externals_setup.py as well as aioboto3 -> we do not control their logs and there might be some HTTP related logs which can accidently include signatures/keys

sfc-gh-fpawlowski · 2025-08-11T20:11:34Z

test/integ/test_put_get_with_aws_token.py

@@ -42,9 +45,10 @@
 @pytest.mark.parametrize(
    "from_path", [True, pytest.param(False, marks=pytest.mark.skipolddriver)]
 )
-def test_put_get_with_aws(tmpdir, conn_cnx, from_path):
+def test_put_get_with_aws(tmpdir, conn_cnx, from_path, caplog):


I would convert those to async as well. - since we know we are using different library (especially unlike requests - aiohttp is not using our vendored urllib3 under the hood - which would be masked using the already present MODULES_TO_MASK_LOGS_NAMES).

We should ensure in tests that async code do not leak sensitive data as well. This comment can be applied to most tests changes from the commit b2ae3e2 .

sfc-gh-fpawlowski · 2025-08-11T20:12:33Z

test/integ/test_put_get_with_azure_token.py

            assert (
-                "sig=" not in line
+                expected_token_prefix


as in https://github.com/snowflakedb/snowflake-connector-python/pull/2458/files#r2267916644

My bad - I meant this URL iirc: #2458 (comment)

Generally speaking we may want to test that everything is masked correctly in the Async version as well - and those tests were not applied to async.

sfc-gh-fpawlowski · 2025-08-11T20:12:58Z

test/integ/test_large_result_set.py

@@ -165,3 +168,19 @@ def test_query_large_result_set(conn_cnx, db_parameters, ingest_data):
                "Expected three telemetry logs (one per query) "
                "for log type {}".format(field.value)
            )
+
+        aws_request_present = False
+        expected_token_prefix = "X-Amz-Signature="


as in
https://github.com/snowflakedb/snowflake-connector-python/pull/2458/files#r2267916644

My bad - I meant this URL iirc: #2458 (comment)

Generally speaking we may want to test that everything is masked correctly in the Async version as well - and those tests were not applied to async.

…2432)

…2254)

…dling of PAT in password field (#2264)

…r to decouple threads number limitations on fetching and pre-fetching (#2255)

Co-authored-by: github-actions <[email protected]>

sfc-gh-pczajka force-pushed the cherrypicks-to-aio-connector-part8 branch from c290ee1 to 9acde0c Compare August 7, 2025 13:53

sfc-gh-pczajka marked this pull request as draft August 7, 2025 14:05

sfc-gh-pczajka marked this pull request as ready for review August 7, 2025 15:17

sfc-gh-pczajka force-pushed the cherrypicks-to-aio-connector-part7 branch from 2a0f804 to e8f0564 Compare August 11, 2025 10:49

sfc-gh-pczajka force-pushed the cherrypicks-to-aio-connector-part8 branch from 609427f to 511d01e Compare August 11, 2025 10:50

sfc-gh-fpawlowski reviewed Aug 11, 2025

View reviewed changes

sfc-gh-pczajka force-pushed the cherrypicks-to-aio-connector-part7 branch 2 times, most recently from 0a25d12 to 228f0a2 Compare August 12, 2025 08:27

Base automatically changed from cherrypicks-to-aio-connector-part7 to dev/aio-connector August 12, 2025 15:12

sfc-gh-pczajka force-pushed the cherrypicks-to-aio-connector-part8 branch from 511d01e to 24ac817 Compare August 13, 2025 11:08

sfc-gh-pcyrek added 2 commits August 13, 2025 13:16

SNOW-2021009: test optimisation (#2388)

e209415

SNOW-2226057: GH Actions moved to key-pair, old driver bump to 3.1.0 (#…

407d131

…2432)

sfc-gh-pczajka force-pushed the cherrypicks-to-aio-connector-part8 branch 3 times, most recently from b48434d to a513b10 Compare August 14, 2025 14:19

sfc-gh-pczajka and others added 15 commits August 14, 2025 17:17

Apply changes to async tests and workflows

322852d

SNOW-2027116 Allow for UUID encoding in SnowflakeRestful interface (#…

6035eee

…2254)

[ASYNC] apply #2254 to async code

6d59d70

SNOW-1955965: Fix expired S3 credentials update (#2258)

912a19d

[ASYNC] apply #2258 to async code

dbb7007

NO-SNOW Add PAT to authenticators allowing empty username, remove han…

153ecd9

…dling of PAT in password field (#2264)

[ASYNC] Apply #2264 to async code

106fa06

NO-SNOW Fix flaky query timeout test (#2266)

f6b293b

SNOW-2040000 change tag to bptp-stable (#2268)

45f634d

SNOW-2028051 introduce a new client_fetch_threads connection paramete…

9e5b250

…r to decouple threads number limitations on fetching and pre-fetching (#2255)

Add default entra app ID for Snowflake (#2267)

2d4b87e

[ASYNC] update test after #2267

b7564b8

SNOW-2011595 Masking filter introduced on library levels (#2253)

2c9393d

[ASYNC] remove azure filter after #2253

3ef0650

NO-SNOW acquiring a lock on local OCSP cache will use a timeout (#2280)

35199cd

sfc-gh-pmansour and others added 6 commits August 14, 2025 17:19

Accept both v1 and v2 Entra ID issuer formats for WIF (#2281)

bc7162b

[ASYNC] apply #2281 to async code

7f56afa

SNOW-2048239 revert zero timeout for oscp cache lock (#2283)

4d5ed38

[ASYNC] remove flaky marker from OCSP tests after #2283

404bf8e

SNOW-1993520 update tested_reqs for 3.14.1 release (#2287)

2849159

Co-authored-by: github-actions <[email protected]>

Review fixes - add secret filter to external libraries + tests

eb23308

sfc-gh-pczajka force-pushed the cherrypicks-to-aio-connector-part8 branch from a513b10 to eb23308 Compare August 14, 2025 15:19

		@@ -37,8 +36,6 @@

		logger = getLogger(__name__)

		getLogger("aiohttp").addFilter(AzureCredentialFilter())

Cherrypicks to aio connector part8 #2458

Are you sure you want to change the base?

Cherrypicks to aio connector part8 #2458

Conversation

sfc-gh-pczajka commented Aug 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sfc-gh-pczajka commented Aug 7, 2025 •

edited

Loading