Skip to content

Commit 6a2dfd0

Browse files
authored
SNOW-891470: Refactor reading default connection into a function (#1722)
1 parent 86c0a11 commit 6a2dfd0

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/snowflake/connector/config_manager.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from snowflake.connector.errors import (
2323
ConfigManagerError,
2424
ConfigSourceError,
25+
Error,
2526
MissingConfigOptionError,
2627
)
2728

@@ -457,6 +458,18 @@ def __getitem__(self, name: str) -> ConfigOption | ConfigManager:
457458
)
458459

459460

461+
def _get_default_connection_params() -> dict[str, Any]:
462+
def_connection_name = CONFIG_MANAGER["default_connection_name"]
463+
connections = CONFIG_MANAGER["connections"]
464+
if def_connection_name not in connections:
465+
raise Error(
466+
f"Default connection with name '{def_connection_name}' "
467+
"cannot be found, known ones are "
468+
f"{list(connections.keys())}"
469+
)
470+
return {**connections[def_connection_name]}
471+
472+
460473
def __getattr__(name):
461474
if name == "CONFIG_PARSER":
462475
warnings.warn(

src/snowflake/connector/connection.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
from .auth.idtoken import AuthByIdToken
4444
from .bind_upload_agent import BindUploadError
4545
from .compat import IS_LINUX, IS_WINDOWS, quote, urlencode
46-
from .config_manager import CONFIG_MANAGER
46+
from .config_manager import CONFIG_MANAGER, _get_default_connection_params
4747
from .connection_diagnostic import ConnectionDiagnostic
4848
from .constants import (
4949
ENV_VAR_PARTNER,
@@ -367,15 +367,7 @@ def __init__(
367367
kwargs = {**connections[connection_name], **kwargs}
368368
elif is_kwargs_empty:
369369
# connection_name is None and kwargs was empty when called
370-
def_connection_name = CONFIG_MANAGER["default_connection_name"]
371-
connections = CONFIG_MANAGER["connections"]
372-
if def_connection_name not in connections:
373-
raise Error(
374-
f"Default connection with name '{def_connection_name}' "
375-
"cannot be found, known ones are "
376-
f"{list(connections.keys())}"
377-
)
378-
kwargs = {**connections[def_connection_name]}
370+
kwargs = _get_default_connection_params()
379371
self.__set_error_attributes()
380372
self.connect(**kwargs)
381373
self._telemetry = TelemetryClient(self._rest)

0 commit comments

Comments
 (0)