SNOW-2306184: config refactor - tests for value masking

Author: sfc-gh-mraba

src/snowflake/cli/api/config.py

@@ -23,6 +23,7 @@
 from typing import (
     Any,
     Dict,
+    Final,
     List,
     Literal,
     Optional,
@@ -91,6 +92,12 @@ class Empty:
 FEATURE_FLAGS_SECTION_PATH = [CLI_SECTION, "features"]
 
 
+LEGACY_OAUTH_PKCE_KEY: Literal["oatuh_enable_pkce"] = "oatuh_enable_pkce"
+LEGACY_CONNECTION_SETTING_ALIASES: Final[dict[str, str]] = {
+    LEGACY_OAUTH_PKCE_KEY: "oauth_enable_pkce",
+}
+
+
 @dataclass
 class ConnectionConfig:
     account: Optional[str] = None
@@ -130,12 +137,17 @@ def from_dict(cls, config_dict: dict) -> ConnectionConfig:
         known_settings = {}
         other_settings = {}
         for key, value in config_dict.items():
-            if key in cls.__dict__:
-                known_settings[key] = value
+            normalized_key = cls._normalize_setting_key(key)
+            if normalized_key in cls.__dict__:
+                known_settings[normalized_key] = value
             else:
                 other_settings[key] = value
         return cls(**known_settings, _other_settings=other_settings)
 
+    @staticmethod
+    def _normalize_setting_key(key: str) -> str:
+        return LEGACY_CONNECTION_SETTING_ALIASES.get(key, key)
+
     def to_dict_of_known_non_empty_values(self) -> dict:
         return {
             k: v
@@ -340,7 +352,9 @@ def get_connection_dict(connection_name: str) -> dict:
     from snowflake.cli.api.config_provider import get_config_provider_singleton
 
     provider = get_config_provider_singleton()
-    return provider.get_connection_dict(connection_name)
+    connection_raw = provider.get_connection_dict(connection_name)
+    connection = ConnectionConfig.from_dict(connection_raw)
+    return connection.to_dict_of_all_non_empty_values()
 
 
 def get_default_connection_name() -> str:

tests/test_config.py

@@ -111,6 +111,22 @@ def test_environment_variables_works_if_config_value_not_present(test_snowcli_co
     }
 
 
+def test_legacy_pkce_key_is_normalized(config_file):
+    config_content = """
+[connections.test]
+account = "legacy"
+oatuh_enable_pkce = true
+"""
+    with config_file(config_content) as cfg:
+        config_init(cfg)
+
+        conn = get_connection_dict("test")
+
+        assert conn["account"] == "legacy"
+        assert conn["oauth_enable_pkce"] is True
+        assert "oatuh_enable_pkce" not in conn
+
+
 @mock.patch.dict(
     os.environ,
     {