snowflake-cli-labs 2.5.0rc1__tar.gz → 2.5.0rc2__tar.gz

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.5.0rc1
+Version: 2.5.0rc2
 Summary: Snowflake CLI
 Project-URL: Source code, https://github.com/snowflakedb/snowflake-cli
 Project-URL: Bug Tracker, https://github.com/snowflakedb/snowflake-cli/issues

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/src/snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.5.0rc1"
+VERSION = "2.5.0rc2"

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/src/snowflake/cli/api/utils/definition_rendering.py

@@ -18,11 +18,12 @@ import copy
 import os
 from typing import Any, Optional
 
-from jinja2 import Environment, UndefinedError, nodes
+from jinja2 import Environment, nodes
 from packaging.version import Version
 from snowflake.cli.api.exceptions import CycleDetectedError, InvalidTemplate
-from snowflake.cli.api.utils.dict_utils import deep_merge_dicts, traverse
+from snowflake.cli.api.utils.dict_utils import traverse
 from snowflake.cli.api.utils.graph import Graph, Node
+from snowflake.cli.api.utils.models import EnvironWithDefinedDictFallback
 from snowflake.cli.api.utils.rendering import CONTEXT_KEY, get_snowflake_cli_jinja_env
 from snowflake.cli.api.utils.types import Context, Definition
 
@@ -146,7 +147,7 @@ class TemplateVar:
 
         Returns the value in that location.
 
-        Raise UndefinedError if the variable is None or not found.
+        Raise InvalidTemplate if the variable is None or not found.
         """
         current_dict_level = context
         for key in self._vars_chain:
@@ -154,12 +155,12 @@ class TemplateVar:
                 not isinstance(current_dict_level, dict)
                 or key not in current_dict_level
             ):
-                raise UndefinedError(f"Could not find template variable {self.key}")
+                raise InvalidTemplate(f"Could not find template variable {self.key}")
             current_dict_level = current_dict_level[key]
 
         value = current_dict_level
         if value is None or isinstance(value, (dict, list)):
-            raise UndefinedError(
+            raise InvalidTemplate(
                 f"Template variable {self.key} does not contain a valid value"
             )
 
@@ -263,6 +264,8 @@ def render_definition_template(original_definition: Definition) -> Definition:
         definition,
         update_action=lambda val: template_env.render(val, final_context),
     )
-    deep_merge_dicts(definition, {"env": dict(os.environ)})
+
+    current_env = definition.setdefault("env", {})
+    definition["env"] = EnvironWithDefinedDictFallback(current_env)
 
     return definition

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/src/snowflake/cli/api/utils/models.py

@@ -17,8 +17,26 @@ from __future__ import annotations
 import os
 from typing import Any, Dict
 
+from snowflake.cli.api.exceptions import InvalidTemplate
+
+
+def _validate_env(current_env: dict):
+    if not isinstance(current_env, dict):
+        raise InvalidTemplate(
+            "env section in project definition file should be a mapping"
+        )
+    for variable, value in current_env.items():
+        if value is None or isinstance(value, (dict, list)):
+            raise InvalidTemplate(
+                f"Variable {variable} in env section or project definition file should be a scalar"
+            )
+
 
 class EnvironWithDefinedDictFallback(Dict):
+    def __init__(self, dict_input: dict):
+        _validate_env(dict_input)
+        super().__init__(dict_input)
+
     def __getattr__(self, item):
         try:
             return self[item]

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/src/snowflake/cli/plugins/nativeapp/artifacts.py

@@ -541,7 +541,7 @@ def symlink_or_copy(src: Path, dst: Path, deploy_root: Path) -> None:
             relative_root = Path(root).relative_to(absolute_src)
             absolute_root_in_deploy = Path(dst, relative_root)
             absolute_root_in_deploy.mkdir(parents=True, exist_ok=True)
-            for file in files:
+            for file in sorted(files):
                 absolute_file_in_project = Path(absolute_src, relative_root, file)
                 absolute_file_in_deploy = Path(absolute_root_in_deploy, file)
                 symlink_or_copy(

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/tests/api/utils/test_definition_rendering.py

@@ -19,7 +19,6 @@ from textwrap import dedent
 from unittest import mock
 
 import pytest
-from jinja2 import UndefinedError
 from snowflake.cli.api.exceptions import CycleDetectedError, InvalidTemplate
 from snowflake.cli.api.project.definition import load_project
 from snowflake.cli.api.utils.definition_rendering import render_definition_template
@@ -106,7 +105,7 @@ def test_resolve_variables_in_project_cross_project_dependencies():
     {
         "lowercase": "new_lowercase_value",
         "UPPERCASE": "new_uppercase_value",
-        "should_be_replace_by_env": "test succeeded",
+        "should_be_replaced_by_env": "test succeeded",
         "value_from_env": "this comes from os.environ",
     },
     clear=True,
@@ -115,7 +114,7 @@ def test_resolve_variables_in_project_environment_variables_precedence():
     definition = {
         "definition_version": "1.1",
         "env": {
-            "should_be_replace_by_env": "test failed",
+            "should_be_replaced_by_env": "test failed",
             "test_variable": "<% ctx.env.lowercase %> and <% ctx.env.UPPERCASE %>",
             "test_variable_2": "<% ctx.env.value_from_env %>",
         },
@@ -125,14 +124,15 @@ def test_resolve_variables_in_project_environment_variables_precedence():
     assert result == {
         "definition_version": "1.1",
         "env": {
-            "UPPERCASE": "new_uppercase_value",
-            "lowercase": "new_lowercase_value",
-            "should_be_replace_by_env": "test succeeded",
+            "should_be_replaced_by_env": "test failed",
             "test_variable": "new_lowercase_value and new_uppercase_value",
             "test_variable_2": "this comes from os.environ",
-            "value_from_env": "this comes from os.environ",
         },
     }
+    assert result["env"]["lowercase"] == "new_lowercase_value"
+    assert result["env"]["UPPERCASE"] == "new_uppercase_value"
+    assert result["env"]["should_be_replaced_by_env"] == "test succeeded"
+    assert result["env"]["value_from_env"] == "this comes from os.environ"
 
 
 @mock.patch.dict(os.environ, {"env_var": "<% ctx.definition_version %>"}, clear=True)
@@ -155,10 +155,11 @@ def test_env_variables_do_not_get_resolved():
         },
         "env": {
             "reference_to_name": "test_source_<% ctx.definition_version %>",
-            "env_var": "<% ctx.definition_version %>",
         },
     }
 
+    assert result["env"]["env_var"] == "<% ctx.definition_version %>"
+
 
 @pytest.mark.parametrize(
     "definition",
@@ -230,7 +231,7 @@ def test_resolve_variables_error_on_cycle(definition):
     ],
 )
 def test_resolve_variables_reference_non_scalar(definition, error_var):
-    with pytest.raises(UndefinedError) as err:
+    with pytest.raises(InvalidTemplate) as err:
         render_definition_template(definition)
 
     assert (
@@ -259,12 +260,13 @@ def test_resolve_variables_blank_is_ok():
         "definition_version": "1.1",
         "native_app": {"name": "", "source_stage": "", "deploy_root": ""},
         "env": {
-            "blank_env": "",
             "blank_default_env": "",
             "refers_to_blank": "",
         },
     }
 
+    assert result["env"]["blank_env"] == ""
+
 
 @pytest.mark.parametrize(
     "env, msg",
@@ -282,7 +284,7 @@ def test_resolve_variables_fails_if_referencing_unknown_variable(env, msg):
         "definition_version": "1.1",
         "env": env,
     }
-    with pytest.raises(UndefinedError) as err:
+    with pytest.raises(InvalidTemplate) as err:
         render_definition_template(definition)
     assert msg in str(err.value)
 
@@ -331,10 +333,11 @@ def test_injected_yml_in_env_should_not_be_expanded():
         "definition_version": "1.1",
         "env": {
             "test_env": "    - app/*\n    - src\n",
-            "var_with_yml": "    - app/*\n    - src\n",
         },
     }
 
+    assert result["env"]["var_with_yml"] == "    - app/*\n    - src\n"
+
 
 @pytest.mark.parametrize(
     "template_value",
@@ -357,3 +360,33 @@ def test_invalid_templating_syntax(template_value):
         render_definition_template(definition)
 
     assert err.value.message == f"Unexpected templating syntax in {template_value}"
+
+
+def test_invalid_type_for_env_section():
+    definition = {
+        "definition_version": "1.1",
+        "env": ["test_env", "array_val1"],
+    }
+    with pytest.raises(InvalidTemplate) as err:
+        render_definition_template(definition)
+
+    assert (
+        err.value.message
+        == "env section in project definition file should be a mapping"
+    )
+
+
+def test_invalid_type_for_env_variable():
+    definition = {
+        "definition_version": "1.1",
+        "env": {
+            "test_env": ["array_val1"],
+        },
+    }
+    with pytest.raises(InvalidTemplate) as err:
+        render_definition_template(definition)
+
+    assert (
+        err.value.message
+        == "Variable test_env in env section or project definition file should be a scalar"
+    )

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/tests/nativeapp/__snapshots__/test_artifacts.ambr

@@ -226,42 +226,6 @@
   Text GrandA/ParentA/ChildA/GrandChildB.py
   '''
 # ---
-# name: test_symlink_or_copy_with_no_symlinks_in_project_root.20
-  '''
-  d output/deploy/Grand4/Parent3
-  d output/deploy/Grand4/Parent3/ChildA
-  f output/deploy/Grand4/Parent3/ChildA/GrandChildA
-  f output/deploy/Grand4/Parent3/ChildA/GrandChildB.py
-  d output/deploy/Grand4/Parent3/ChildA/GrandChildC
-  f output/deploy/Grand4/Parent3/ChildB.py
-  f output/deploy/Grand4/Parent3/ChildC
-  d output/deploy/Grand4/Parent3/ChildD
-  '''
-# ---
-# name: test_symlink_or_copy_with_no_symlinks_in_project_root.21
-  '''
-  ===== Contents of: output/deploy/Grand4/Parent3/ChildA/GrandChildA =====
-  Text GrandA/ParentA/ChildA/GrandChildA
-  '''
-# ---
-# name: test_symlink_or_copy_with_no_symlinks_in_project_root.22
-  '''
-  ===== Contents of: output/deploy/Grand4/Parent3/ChildA/GrandChildB.py =====
-  Text GrandA/ParentA/ChildA/GrandChildB.py
-  '''
-# ---
-# name: test_symlink_or_copy_with_no_symlinks_in_project_root.23
-  '''
-  ===== Contents of: output/deploy/Grand4/Parent3/ChildB.py =====
-  Text GrandA/ParentA/ChildB.py
-  '''
-# ---
-# name: test_symlink_or_copy_with_no_symlinks_in_project_root.24
-  '''
-  ===== Contents of: output/deploy/Grand4/Parent3/ChildC =====
-  Text GrandA/ParentA/ChildC
-  '''
-# ---
 # name: test_symlink_or_copy_with_no_symlinks_in_project_root.3
   '''
   ===== Contents of: GrandA/ParentA/ChildB.py =====

{snowflake_cli_labs-2.5.0rc1 → snowflake_cli_labs-2.5.0rc2}/tests/nativeapp/test_artifacts.py

@@ -1118,15 +1118,6 @@ def test_symlink_or_copy_with_no_symlinks_in_project_root(snapshot):
                     dst=Path(deploy_root, "Grand4/Parent3"),
                     deploy_root=deploy_root,
                 )
-            assert not Path(deploy_root, "Grand4/Parent3").is_symlink()
-            assert not Path(deploy_root, "Grand4/Parent3/ChildA").is_symlink()
-            assert Path(deploy_root, "Grand4/Parent3/ChildB.py").is_symlink()
-            assert Path(deploy_root, "Grand4/Parent3/ChildC").is_symlink()
-            assert not Path(
-                deploy_root, "Grand4/Parent3/ChildC/GrandChildA"
-            ).is_symlink()
-
-            assert_dir_snapshot(Path("./output/deploy/Grand4/Parent3"), snapshot)
 
 
 def test_symlink_or_copy_with_symlinks_in_project_root(snapshot):