Skip to content

Commit 2d30056

Browse files
Don't require SF_ENABLE_EXPERIMENTAL_AUTHENTICATION for WIF authentication
1 parent e34a73c commit 2d30056

File tree

4 files changed

+0
-30
lines changed

4 files changed

+0
-30
lines changed

ci/container/test_authentication.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export SNOWFLAKE_AUTH_TEST_PRIVATE_KEY_PATH=./.github/workflows/parameters/priva
1313
export SNOWFLAKE_AUTH_TEST_INVALID_PRIVATE_KEY_PATH=./.github/workflows/parameters/private/rsa_keys/rsa_key_invalid.p8
1414

1515
export SF_OCSP_TEST_MODE=true
16-
export SF_ENABLE_EXPERIMENTAL_AUTHENTICATION=true
1716
export RUN_AUTH_TESTS=true
1817
export AUTHENTICATION_TESTS_ENV="docker"
1918
export PYTHONPATH=$SOURCE_ROOT

src/snowflake/connector/connection.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
_CONNECTIVITY_ERR_MSG,
6060
_DOMAIN_NAME_MAP,
6161
_OAUTH_DEFAULT_SCOPE,
62-
ENV_VAR_EXPERIMENTAL_AUTHENTICATION,
6362
ENV_VAR_PARTNER,
6463
PARAMETER_AUTOCOMMIT,
6564
PARAMETER_CLIENT_PREFETCH_THREADS,
@@ -1305,7 +1304,6 @@ def __open_connection(self):
13051304
self._token, self._external_session_id
13061305
)
13071306
elif self._authenticator == WORKLOAD_IDENTITY_AUTHENTICATOR:
1308-
self._check_experimental_authentication_flag()
13091307
# Standardize the provider enum.
13101308
if self._workload_identity_provider and isinstance(
13111309
self._workload_identity_provider, str
@@ -2258,18 +2256,6 @@ def is_valid(self) -> bool:
22582256
logger.debug("session could not be validated due to exception: %s", e)
22592257
return False
22602258

2261-
def _check_experimental_authentication_flag(self) -> None:
2262-
if os.getenv(ENV_VAR_EXPERIMENTAL_AUTHENTICATION, "false").lower() != "true":
2263-
Error.errorhandler_wrapper(
2264-
self,
2265-
None,
2266-
ProgrammingError,
2267-
{
2268-
"msg": f"Please set the '{ENV_VAR_EXPERIMENTAL_AUTHENTICATION}' environment variable true to use the '{self._authenticator}' authenticator.",
2269-
"errno": ER_EXPERIMENTAL_AUTHENTICATION_NOT_SUPPORTED,
2270-
},
2271-
)
2272-
22732259
@staticmethod
22742260
def _detect_application() -> None | str:
22752261
if ENV_VAR_PARTNER in os.environ.keys():

src/snowflake/connector/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ class IterUnit(Enum):
428428
# TODO: all env variables definitions should be here
429429
ENV_VAR_PARTNER = "SF_PARTNER"
430430
ENV_VAR_TEST_MODE = "SNOWFLAKE_TEST_MODE"
431-
ENV_VAR_EXPERIMENTAL_AUTHENTICATION = "SF_ENABLE_EXPERIMENTAL_AUTHENTICATION" # Needed to enable new strong auth features during the private preview.
432431

433432

434433
_DOMAIN_NAME_MAP = {_DEFAULT_HOSTNAME_TLD: "GLOBAL", _CHINA_HOSTNAME_TLD: "CHINA"}

test/unit/test_connection.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -631,23 +631,11 @@ def test_cannot_set_dependent_params_without_wlid_authenticator(
631631
)
632632

633633

634-
def test_cannot_set_wlid_authenticator_without_env_variable(mock_post_requests):
635-
with pytest.raises(ProgrammingError) as excinfo:
636-
snowflake.connector.connect(
637-
account="account", authenticator="WORKLOAD_IDENTITY"
638-
)
639-
assert (
640-
"Please set the 'SF_ENABLE_EXPERIMENTAL_AUTHENTICATION' environment variable true to use the 'WORKLOAD_IDENTITY' authenticator"
641-
in str(excinfo.value)
642-
)
643-
644-
645634
def test_connection_params_are_plumbed_into_authbyworkloadidentity(monkeypatch):
646635
with monkeypatch.context() as m:
647636
m.setattr(
648637
"snowflake.connector.SnowflakeConnection._authenticate", lambda *_: None
649638
)
650-
m.setenv("SF_ENABLE_EXPERIMENTAL_AUTHENTICATION", "true")
651639

652640
conn = snowflake.connector.connect(
653641
account="my_account_1",
@@ -689,7 +677,6 @@ def test_toml_connection_params_are_plumbed_into_authbyworkloadidentity(
689677
m.setattr(
690678
"snowflake.connector.SnowflakeConnection._authenticate", lambda *_: None
691679
)
692-
m.setenv("SF_ENABLE_EXPERIMENTAL_AUTHENTICATION", "true")
693680

694681
conn = snowflake.connector.connect(connections_file_path=connections_file)
695682
assert conn.auth_class.provider == AttestationProvider.OIDC
@@ -708,7 +695,6 @@ def test_single_use_refresh_tokens_option_is_plumbed_into_authbyauthcode(
708695
m.setattr(
709696
"snowflake.connector.SnowflakeConnection._authenticate", lambda *_: None
710697
)
711-
m.setenv("SF_ENABLE_EXPERIMENTAL_AUTHENTICATION", "true")
712698

713699
conn = snowflake.connector.connect(
714700
account="my_account_1",

0 commit comments

Comments
 (0)