snowflake-cli-labs 2.8.0rc0__tar.gz → 2.8.0rc1__tar.gz

{snowflake_cli_labs-2.8.0rc0 → snowflake_cli_labs-2.8.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.8.0rc0
+Version: 2.8.0rc1
 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.8.0rc0 → snowflake_cli_labs-2.8.0rc1}/src/snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.8.0rc0"
+VERSION = "2.8.0rc1"

{snowflake_cli_labs-2.8.0rc0 → snowflake_cli_labs-2.8.0rc1}/src/snowflake/cli/api/project/errors.py

@@ -29,10 +29,25 @@ class SchemaValidationError(ClickException):
     def __init__(self, error: ValidationError):
         errors = error.errors()
         message = f"During evaluation of {error.title} in project definition following errors were encountered:\n"
+
+        def calculate_location(e):
+            if e["loc"] is None:
+                return None
+
+            # show numbers as list indexes and strings as dictionary keys. Example: key1[0].key2
+            result = "".join(
+                f"[{item}]" if isinstance(item, int) else f".{item}"
+                for item in e["loc"]
+            )
+
+            # remove leading dot from the string if any:
+            return result[1:] if result.startswith(".") else result
+
         message += "\n".join(
             [
                 self.message_templates.get(e["type"], self.generic_message).format(
-                    **e, location=".".join(e["loc"]) if e["loc"] is not None else None
+                    **e,
+                    location=calculate_location(e),
                 )
                 for e in errors
             ]

{snowflake_cli_labs-2.8.0rc0 → snowflake_cli_labs-2.8.0rc1}/src/snowflake/cli/plugins/nativeapp/manager.py

@@ -45,6 +45,7 @@ from snowflake.cli.api.project.util import (
 from snowflake.cli.api.rendering.sql_templates import (
     get_sql_cli_jinja_env,
 )
+from snowflake.cli.api.secure_path import UNLIMITED, SecurePath
 from snowflake.cli.api.sql_execution import SqlExecutionMixin
 from snowflake.cli.plugins.connection.util import make_snowsight_url
 from snowflake.cli.plugins.nativeapp.artifacts import (
@@ -577,7 +578,10 @@ class NativeAppManager(SqlExecutionMixin):
             )
 
     def _expand_script_templates(
-        self, env: jinja2.Environment, jinja_context: dict[str, Any], scripts: List[str]
+        self,
+        env: jinja2.Environment,
+        jinja_context: dict[str, Any],
+        scripts: List[str],
     ) -> List[str]:
         """
         Input:
@@ -589,20 +593,22 @@ class NativeAppManager(SqlExecutionMixin):
         Size of the return list is the same as the size of the input scripts list.
         """
         scripts_contents = []
-        for relpath in scripts:
+        for script in scripts:
+            full_path = SecurePath(self.project_root) / script
             try:
-                template = env.get_template(relpath)
+                template_content = full_path.read_text(file_size_limit_mb=UNLIMITED)
+                template = env.from_string(template_content)
                 result = template.render(**jinja_context)
                 scripts_contents.append(result)
 
-            except jinja2.TemplateNotFound as e:
-                raise MissingScriptError(e.name) from e
+            except FileNotFoundError as e:
+                raise MissingScriptError(script) from e
 
             except jinja2.TemplateSyntaxError as e:
-                raise InvalidScriptError(e.name, e, e.lineno) from e
+                raise InvalidScriptError(script, e, e.lineno) from e
 
             except jinja2.UndefinedError as e:
-                raise InvalidScriptError(relpath, e) from e
+                raise InvalidScriptError(script, e) from e
 
         return scripts_contents
 
@@ -618,7 +624,7 @@ class NativeAppManager(SqlExecutionMixin):
             )
 
         env = jinja2.Environment(
-            loader=jinja2.loaders.FileSystemLoader(self.project_root),
+            loader=jinja2.BaseLoader(),
             keep_trailing_newline=True,
             undefined=jinja2.StrictUndefined,
         )
@@ -668,19 +674,17 @@ class NativeAppManager(SqlExecutionMixin):
         if not post_deploy_hooks:
             return
 
-        with cc.phase(f"Executing {deployed_object_type} post-deploy actions"):
+        with cc.phase(f"Executing {deployed_object_type} post_deploy actions"):
             sql_scripts_paths = []
             for hook in post_deploy_hooks:
                 if hook.sql_script:
                     sql_scripts_paths.append(hook.sql_script)
                 else:
                     raise ValueError(
-                        f"Unsupported {deployed_object_type} post-deploy hook type: {hook}"
+                        f"Unsupported {deployed_object_type} post_deploy hook type: {hook}"
                     )
 
-            env = get_sql_cli_jinja_env(
-                loader=jinja2.loaders.FileSystemLoader(self.project_root)
-            )
+            env = get_sql_cli_jinja_env()
             scripts_content_list = self._expand_script_templates(
                 env, cli_context.template_context, sql_scripts_paths
             )

{snowflake_cli_labs-2.8.0rc0 → snowflake_cli_labs-2.8.0rc1}/tests/nativeapp/test_post_deploy_for_app.py

@@ -168,7 +168,7 @@ def test_invalid_hook_type(
 
         with pytest.raises(ValueError) as err:
             processor.execute_app_post_deploy_hooks()
-        assert "Unsupported application post-deploy hook type" in str(err)
+        assert "Unsupported application post_deploy hook type" in str(err)
 
 
 @pytest.mark.parametrize(