SNOW-2306184: config refactor - e2e fix attempt

Author: sfc-gh-mraba

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

@@ -254,6 +254,7 @@ def _parse_toml_file(
             connections = data.get("connections", {})
             for conn_name, conn_data in connections.items():
                 if isinstance(conn_data, dict):
+                    # Process parameters if they exist
                     for param_key, param_value in conn_data.items():
                         full_key = f"connections.{conn_name}.{param_key}"
                         if key is None or full_key == key:
@@ -264,6 +265,18 @@ def _parse_toml_file(
                                 raw_value=param_value,
                             )
 
+                    # For empty connections, we need to ensure they are recognized
+                    # even if they have no parameters. We add a special marker.
+                    if not conn_data:  # Empty connection section
+                        marker_key = f"connections.{conn_name}._empty_connection"
+                        if key is None or marker_key == key:
+                            result[marker_key] = ConfigValue(
+                                key=marker_key,
+                                value=True,
+                                source_name=self.source_name,
+                                raw_value=True,
+                            )
+
             return result
 
         except Exception as e:

src/snowflake/cli/api/config_provider.py

@@ -499,6 +499,13 @@ def _get_all_connections_dict(self) -> Dict[str, Dict[str, Any]]:
                     conn_name, param_name = parts
                     if conn_name not in connections:
                         connections[conn_name] = {}
+
+                    # Skip internal markers, but ensure connection exists
+                    if param_name == "_empty_connection":
+                        # This is just a marker for empty connections
+                        # Connection dict already created above
+                        continue
+
                     connections[conn_name][param_name] = value
 
         return connections

tests/test_connection.py

@@ -293,6 +293,7 @@ def test_fails_if_existing_connection(runner):
 
 
 @mock.patch("snowflake.cli._plugins.connection.commands.get_default_connection_name")
+@mock.patch.dict(os.environ, {}, clear=True)
 def test_lists_connection_information(mock_get_default_conn_name, runner):
     mock_get_default_conn_name.return_value = "empty"
     result = runner.invoke(["connection", "list", "--format", "json"])

tests_e2e/conftest.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 import shutil
 import subprocess
 import sys
@@ -111,6 +112,18 @@ def isolate_default_config_location(monkeypatch, temporary_directory):
     monkeypatch.setenv("SNOWFLAKE_HOME", temporary_directory)
 
 
+@pytest.fixture(autouse=True)
+def isolate_environment_variables(monkeypatch):
+    """
+    Clear Snowflake-specific environment variables that could interfere with e2e tests.
+    This ensures tests run in a clean environment and only use the config files they specify.
+    """
+    # Clear all SNOWFLAKE_CONNECTIONS_* environment variables
+    for env_var in list(os.environ.keys()):
+        if env_var.startswith(("SNOWFLAKE_CONNECTIONS_", "SNOWSQL_")):
+            monkeypatch.delenv(env_var, raising=False)
+
+
 def _create_venv(tmp_dir: Path) -> None:
     subprocess_check_output(["python", "-m", "venv", tmp_dir])