SNOW-2306184: config refactory - cleanup source ConfigValue creation

Author: sfc-gh-mraba

src/snowflake/cli/api/config_ng/core.py

@@ -28,7 +28,7 @@
 from dataclasses import dataclass, field
 from datetime import datetime
 from enum import Enum
-from typing import Any, Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional
 
 
 class SourcePriority(Enum):
@@ -62,6 +62,37 @@ def __repr__(self) -> str:
             value_display = f"{self.raw_value} → {self.value}"
         return f"ConfigValue({self.key}={value_display}, from {self.source_name})"
 
+    @classmethod
+    def from_source(
+        cls,
+        key: str,
+        raw_value: str,
+        source_name: str,
+        priority: SourcePriority,
+        value_parser: Optional[Callable[[str], Any]] = None,
+    ) -> ConfigValue:
+        """
+        Factory method to create ConfigValue from a source handler.
+
+        Args:
+            key: Configuration key
+            raw_value: Raw string value from the source
+            source_name: Name of the configuration source
+            priority: Source priority level
+            value_parser: Optional parser function; if None, raw_value is used as-is
+
+        Returns:
+            ConfigValue instance with parsed value
+        """
+        parsed_value = value_parser(raw_value) if value_parser else raw_value
+        return cls(
+            key=key,
+            value=parsed_value,
+            source_name=source_name,
+            priority=priority,
+            raw_value=raw_value,
+        )
+
 
 class ValueSource(ABC):
     """

src/snowflake/cli/api/config_ng/env_handlers.py

@@ -68,25 +68,24 @@ def discover(self, key: Optional[str] = None) -> Dict[str, ConfigValue]:
             # Discover specific key
             env_key = f"{self.PREFIX}{key.upper()}"
             if env_key in os.environ:
-                raw = os.environ[env_key]
-                values[key] = ConfigValue(
+                values[key] = ConfigValue.from_source(
                     key=key,
-                    value=self._parse_value(raw),
+                    raw_value=os.environ[env_key],
                     source_name=self.source_name,
                     priority=self.priority,
-                    raw_value=raw,
+                    value_parser=self._parse_value,
                 )
         else:
             # Discover all SNOWFLAKE_* variables
             for env_key, env_value in os.environ.items():
                 if env_key.startswith(self.PREFIX):
                     config_key = env_key[len(self.PREFIX) :].lower()
-                    values[config_key] = ConfigValue(
+                    values[config_key] = ConfigValue.from_source(
                         key=config_key,
-                        value=self._parse_value(env_value),
+                        raw_value=env_value,
                         source_name=self.source_name,
                         priority=self.priority,
-                        raw_value=env_value,
+                        value_parser=self._parse_value,
                     )
 
         return values
@@ -162,13 +161,12 @@ def discover(self, key: Optional[str] = None) -> Dict[str, ConfigValue]:
             env_key = f"{self.PREFIX}{snowsql_key.upper()}"
 
             if env_key in os.environ:
-                raw = os.environ[env_key]
-                values[key] = ConfigValue(
+                values[key] = ConfigValue.from_source(
                     key=key,  # Normalized SnowCLI key
-                    value=self._parse_value(raw),
+                    raw_value=os.environ[env_key],
                     source_name=self.source_name,
                     priority=self.priority,
-                    raw_value=raw,
+                    value_parser=self._parse_value,
                 )
         else:
             # Discover all SNOWSQL_* variables
@@ -178,12 +176,12 @@ def discover(self, key: Optional[str] = None) -> Dict[str, ConfigValue]:
                     # Map to SnowCLI key
                     config_key = self.KEY_MAPPINGS.get(snowsql_key, snowsql_key)
 
-                    values[config_key] = ConfigValue(
+                    values[config_key] = ConfigValue.from_source(
                         key=config_key,
-                        value=self._parse_value(env_value),
+                        raw_value=env_value,
                         source_name=self.source_name,
                         priority=self.priority,
-                        raw_value=env_value,
+                        value_parser=self._parse_value,
                     )
 
         return values