snowflake-cli-labs 3.0.0rc4__py3-none-any.whl → 3.0.0rc5__py3-none-any.whl

snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "3.0.0rc4"
+VERSION = "3.0.0rc5"

snowflake/cli/_plugins/helpers/commands.py

@@ -16,6 +16,7 @@ from __future__ import annotations
 
 import typer
 import yaml
+from click import ClickException
 from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
 from snowflake.cli.api.output.types import MessageResult
 from snowflake.cli.api.project.definition_conversion import (
@@ -35,10 +36,36 @@ def v1_to_v2(
     accept_templates: bool = typer.Option(
         False, "-t", "--accept-templates", help="Allows the migration of templates."
     ),
+    migrate_local_yml: (bool | None) = typer.Option(
+        None,
+        "-l",
+        "--migrate-local-overrides/--no-migrate-local-overrides",
+        help=(
+            "Merge values in snowflake.local.yml into the main project definition. "
+            "The snowflake.local.yml file will not be migrated, "
+            "instead its values will be reflected in the output snowflake.yml file. "
+            "If unset and snowflake.local.yml is present, an error will be raised."
+        ),
+        show_default=False,
+    ),
     **options,
 ):
     """Migrates the Snowpark, Streamlit, and Native App project definition files from V1 to V2."""
     manager = DefinitionManager()
+    local_yml_path = manager.project_root / "snowflake.local.yml"
+    has_local_yml = local_yml_path in manager.project_config_paths
+    if has_local_yml:
+        if migrate_local_yml is None:
+            raise ClickException(
+                "snowflake.local.yml file detected, "
+                "please specify --migrate-local-overrides to include "
+                "or --no-migrate-local-overrides to exclude its values."
+            )
+        if not migrate_local_yml:
+            # If we don't want the local file,
+            # remove it from the list of paths to load
+            manager.project_config_paths.remove(local_yml_path)
+
     pd = manager.unrendered_project_definition
 
     if pd.meets_version_requirement("2"):
@@ -49,6 +76,8 @@ def v1_to_v2(
     )
 
     SecurePath("snowflake.yml").rename("snowflake_V1.yml")
+    if has_local_yml:
+        SecurePath("snowflake.local.yml").rename("snowflake_V1.local.yml")
     with open("snowflake.yml", "w") as file:
         yaml.dump(
             pd_v2.model_dump(

snowflake/cli/api/project/definition_conversion.py

@@ -6,7 +6,7 @@ from typing import Any, Dict, Literal, Optional
 
 from click import ClickException
 from snowflake.cli._plugins.nativeapp.artifacts import (
-    build_bundle,
+    BundleMap,
 )
 from snowflake.cli._plugins.snowpark.common import is_name_a_templated_one
 from snowflake.cli.api.constants import (
@@ -216,17 +216,22 @@ def convert_native_app_to_v2_data(
         # glob patterns. The simplest solution is to bundle the app and find the
         # manifest file from the resultant BundleMap, since the bundle process ensures
         # that only a single source path can map to the corresponding destination path
-        try:
-            bundle_map = build_bundle(
-                project_root, Path(native_app.deploy_root), native_app.artifacts
-            )
-        except Exception as e:
-            # The manifest field is required, so we can't gracefully handle bundle failures
-            raise ClickException(
-                f"{e}\nCould not bundle Native App artifacts, unable to perform migration"
-            ) from e
-
-        manifest_path = bundle_map.to_project_path(Path("manifest.yml"))
+        bundle_map = BundleMap(
+            project_root=project_root, deploy_root=Path(native_app.deploy_root)
+        )
+        for artifact in native_app.artifacts:
+            bundle_map.add(artifact)
+
+        manifest_path = next(
+            (
+                src
+                for src, dest in bundle_map.all_mappings(
+                    absolute=True, expand_directories=True
+                )
+                if dest.name == "manifest.yml"
+            ),
+            None,
+        )
         if not manifest_path:
             # The manifest field is required, so we can't gracefully handle it being missing
             raise ClickException(
@@ -236,7 +241,7 @@ def convert_native_app_to_v2_data(
 
         # Use a POSIX path to be consistent with other migrated fields
         # which use POSIX paths as default values
-        return manifest_path.as_posix()
+        return manifest_path.relative_to(project_root).as_posix()
 
     def _make_template(template: str) -> str:
         return f"{PROJECT_TEMPLATE_VARIABLE_OPENING} {template} {PROJECT_TEMPLATE_VARIABLE_CLOSING}"

snowflake/cli/api/project/definition_manager.py

@@ -41,7 +41,7 @@ class DefinitionManager:
     USER_DEFINITION_FILENAME = "snowflake.local.yml"
 
     project_root: Path
-    _project_config_paths: List[Path]
+    project_config_paths: List[Path]
 
     def __init__(
         self,
@@ -53,12 +53,12 @@ class DefinitionManager:
         )
 
         self.project_root = project_root
-        self._project_config_paths = self._find_definition_files(self.project_root)
+        self.project_config_paths = self._find_definition_files(self.project_root)
         self._context_overrides = context_overrides
 
     @functools.cached_property
     def has_definition_file(self):
-        return len(self._project_config_paths) > 0
+        return len(self.project_config_paths) > 0
 
     @staticmethod
     def _find_definition_files(project_root: Path) -> List[Path]:
@@ -126,11 +126,11 @@ class DefinitionManager:
 
     @functools.cached_property
     def _project_properties(self) -> ProjectProperties:
-        return load_project(self._project_config_paths, self._context_overrides)
+        return load_project(self.project_config_paths, self._context_overrides)
 
     @functools.cached_property
     def _raw_project_data(self) -> ProjectProperties:
-        return load_project(self._project_config_paths, {}, False)
+        return load_project(self.project_config_paths, {}, False)
 
     @functools.cached_property
     def project_definition(self) -> ProjectDefinitionV1:

{snowflake_cli_labs-3.0.0rc4.dist-info → snowflake_cli_labs-3.0.0rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 3.0.0rc4
+Version: 3.0.0rc5
 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-3.0.0rc4.dist-info → snowflake_cli_labs-3.0.0rc5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-snowflake/cli/__about__.py,sha256=s5AEYygcF4ZrDzYhUa_o6V7tqbbgW4aJv1Qu4jwQYk0,636
+snowflake/cli/__about__.py,sha256=Y9QU0FSitn67LLzreNuyZanWICcn5RXROW0vJNPtMDM,636
 snowflake/cli/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/_app/__init__.py,sha256=CR_uTgoqHnU1XdyRhm5iQsS86yWXGVx5Ht7aGSDNFmc,765
 snowflake/cli/_app/__main__.py,sha256=mHaHr0OsE2H_kUzNE3pu1znAr_stjXTZ4LAp7Hi2_po,834
@@ -49,7 +49,7 @@ snowflake/cli/_plugins/git/commands.py,sha256=4NghBGIhxnETtr7aiy9dsQR7YD-8FR2SWp
 snowflake/cli/_plugins/git/manager.py,sha256=4Sh5ZCN4ED3Rlegc3bW7apUwGcIfEOfXcKvP-Q-arIM,5534
 snowflake/cli/_plugins/git/plugin_spec.py,sha256=aadJK8d9Aanwpmktd_eRYwf8OJvN-V8iCHIpjL7AM44,992
 snowflake/cli/_plugins/helpers/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
-snowflake/cli/_plugins/helpers/commands.py,sha256=EUTsnlHfooMFzqE3kHvoqntNnzZQ1Nqfe55NfoDRJ-s,2114
+snowflake/cli/_plugins/helpers/commands.py,sha256=Xg_Aaof2mcGqIOOo0Hfr1Af0xs8ZexJ-1aE_ew2xLdg,3413
 snowflake/cli/_plugins/helpers/plugin_spec.py,sha256=FTdWSNWj36-d83iM2PP2jwCGZhYNKQcOIAlm4Uo3qrA,996
 snowflake/cli/_plugins/init/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/_plugins/init/commands.py,sha256=veBJpbMmHFUyIBiNn1umpy763I-TKeGhHHe5pCaJ58I,8904
@@ -194,8 +194,8 @@ snowflake/cli/api/plugins/command/__init__.py,sha256=qCzBzpq8__2OUN0PcruIKgQXI2V
 snowflake/cli/api/plugins/command/plugin_hook_specs.py,sha256=AHJGk6j3NRzalIe4llM3Mt0-opHui1sLdbILoEMhpuA,714
 snowflake/cli/api/project/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/api/project/definition.py,sha256=5vhSH97v48rWyk7vWGxWngpsEcgJ9-8IX1SYzGYwrUg,4333
-snowflake/cli/api/project/definition_conversion.py,sha256=CqQWtJB4aUSSUw_zTtD5jiI1-Tskxnyf5hq1JzBgE7E,14888
-snowflake/cli/api/project/definition_manager.py,sha256=mquz4lDFUtlrlSTpmMVesX3nrJouDdO0slRgCLDeQrU,4985
+snowflake/cli/api/project/definition_conversion.py,sha256=fAX3CdC0IgvC3oNwZ1Am3Yls2Yfsq4a73Coym_DUsNQ,14916
+snowflake/cli/api/project/definition_manager.py,sha256=YEqyxL_meH94YIJD4Lv4d3By_NwEh9scYKhJJUPEprI,4980
 snowflake/cli/api/project/errors.py,sha256=9TGN2ezqSCHmSGy1U7AByaJm5Xf47zN-7N3i6R6fyBg,2136
 snowflake/cli/api/project/project_verification.py,sha256=smprjxJZlqqIPYuyf6a3OJitRpn8Ru6tAoZB-DdEz1s,990
 snowflake/cli/api/project/util.py,sha256=eOJbXx4CZ7DfmHI4-CJT0cV7lP8DH0gI9JTBic7-xNs,9639
@@ -235,8 +235,8 @@ snowflake/cli/api/utils/naming_utils.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh
 snowflake/cli/api/utils/path_utils.py,sha256=ru0jgw6Ur5zhqpHhj_eAqcaJdrgEgr3bC7Z02FnQV18,1218
 snowflake/cli/api/utils/templating_functions.py,sha256=DlmpGAEY6OBArtIap6kN1aaILPwx2ynqKflPwjj7BbU,4935
 snowflake/cli/api/utils/types.py,sha256=fVKuls8axKSsBzPqWwrkwkwoXXmedqxNJKqfXrrGyBM,1190
-snowflake_cli_labs-3.0.0rc4.dist-info/METADATA,sha256=cS-ClSglu6IDbtt5y26UWv7umS-EJeCyOhXcaOK3I68,17998
-snowflake_cli_labs-3.0.0rc4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-snowflake_cli_labs-3.0.0rc4.dist-info/entry_points.txt,sha256=6QmSI0wUX6p7f-dGvrPdswlQyVAVGi1AtOUbE8X6bho,58
-snowflake_cli_labs-3.0.0rc4.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
-snowflake_cli_labs-3.0.0rc4.dist-info/RECORD,,
+snowflake_cli_labs-3.0.0rc5.dist-info/METADATA,sha256=1VRaJowjwIKUKOqHFoSE7Ek-0xnjYt1_S1xEjRiu3H8,17998
+snowflake_cli_labs-3.0.0rc5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+snowflake_cli_labs-3.0.0rc5.dist-info/entry_points.txt,sha256=6QmSI0wUX6p7f-dGvrPdswlQyVAVGi1AtOUbE8X6bho,58
+snowflake_cli_labs-3.0.0rc5.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
+snowflake_cli_labs-3.0.0rc5.dist-info/RECORD,,