Renamed feature flag and added release notes

snowflakedb · Nov 14, 2024 · 7735817 · 7735817
1 parent a2a877f
commit 7735817
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 40 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -32,6 +32,8 @@
   * `--follow (-f)`: Stream logs in real-time.
   * `--follow-interval`: Set custom polling intervals during log streaming.
 * `snow connection add` supports `--no-interactive` flag to skip interactive prompts.
+* Added support for glob pattern in artifact paths in snowflake.yml for Streamlit.
+* Added support for glob pattern in artifact paths in snowflake.yml for Snowpark, requires ENABLE_SNOWPARK_GLOB_SUPPORT feature flag.
 
 ## Fixes and improvements
 * `snow --info` callback returns information about `SNOWFLAKE_HOME` variable.

diff --git a/src/snowflake/cli/_plugins/snowpark/commands.py b/src/snowflake/cli/_plugins/snowpark/commands.py
@@ -380,7 +380,7 @@ def build(
 
     artifacts = set()
     with cli_console.phase("Preparing artifacts for source code"):
-        if FeatureFlag.ENABLE_SNOWPARK_BUNDLE_MAP_BUILD.is_enabled():
+        if FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled():
             for entity in get_snowpark_entities(pd).values():
                 for artifact in entity.artifacts:
                     artifacts.add(project_paths.get_artefact_dto(artifact))

diff --git a/src/snowflake/cli/_plugins/snowpark/snowpark_entity_model.py b/src/snowflake/cli/_plugins/snowpark/snowpark_entity_model.py
@@ -58,9 +58,9 @@ def _convert_artifacts(cls, artifacts: Union[dict, str]):
             if (
                 (isinstance(artifact, str) and glob.has_magic(artifact))
                 or (isinstance(artifact, PathMapping) and glob.has_magic(artifact.src))
-            ) and FeatureFlag.ENABLE_SNOWPARK_BUNDLE_MAP_BUILD.is_disabled():
+            ) and FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_disabled():
                 raise ValueError(
-                    "If you want to use glob patterns in artifacts, you need to enable the Snowpark new build feature flag (ENABLE_SNOWPARK_BUNDLE_MAP_BUILD=true)"
+                    "If you want to use glob patterns in artifacts, you need to enable the Snowpark new build feature flag (ENABLE_SNOWPARK_GLOB_SUPPORT=true)"
                 )
             if isinstance(artifact, PathMapping):
                 _artifacts.append(artifact)

diff --git a/src/snowflake/cli/_plugins/snowpark/snowpark_project_paths.py b/src/snowflake/cli/_plugins/snowpark/snowpark_project_paths.py
@@ -42,7 +42,7 @@ def path_relative_to_root(self, artifact_path: Path) -> Path:
         return (self.project_root / artifact_path).resolve()
 
     def get_artefact_dto(self, artifact_path: PathMapping) -> Artefact:
-        if FeatureFlag.ENABLE_SNOWPARK_BUNDLE_MAP_BUILD.is_enabled():
+        if FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled():
             return Artefact(
                 project_root=self.project_root,
                 dest=artifact_path.dest,
@@ -55,7 +55,7 @@ def get_artefact_dto(self, artifact_path: PathMapping) -> Artefact:
             )
 
     def get_dependencies_artefact(self) -> Artefact:
-        if FeatureFlag.ENABLE_SNOWPARK_BUNDLE_MAP_BUILD.is_enabled():
+        if FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled():
             return Artefact(
                 project_root=self.project_root, dest=None, path=Path("dependencies.zip")
             )
@@ -179,7 +179,7 @@ def _path_until_asterisk(self) -> Path:
         # parts = Path(before_wildcard).parts[:-1]
         return Path(*path[:-1])
 
-    # Can be removed after removing ENABLE_SNOWPARK_BUNDLE_MAP_BUILD feature flag.
+    # Can be removed after removing ENABLE_SNOWPARK_GLOB_SUPPORT feature flag.
     def build(self) -> None:
         raise NotImplementedError("Not implemented in Artefact class.")
 

diff --git a/src/snowflake/cli/api/feature_flags.py b/src/snowflake/cli/api/feature_flags.py
@@ -52,6 +52,4 @@ class FeatureFlag(FeatureFlagMixin):
     ENABLE_STREAMLIT_VERSIONED_STAGE = BooleanFlag(
         "ENABLE_STREAMLIT_VERSIONED_STAGE", False
     )
-    ENABLE_SNOWPARK_BUNDLE_MAP_BUILD = BooleanFlag(
-        "ENABLE_SNOWPARK_BUNDLE_MAP_BUILD", False
-    )
+    ENABLE_SNOWPARK_GLOB_SUPPORT = BooleanFlag("ENABLE_SNOWPARK_GLOB_SUPPORT", False)
diff --git a/tests/snowpark/__snapshots__/test_models.ambr b/tests/snowpark/__snapshots__/test_models.ambr
@@ -7,7 +7,7 @@
   | For field entities.hello_procedure.procedure.artifacts you provided          |
   | '['src/*']'. This caused: Value error, If you want to use glob patterns in   |
   | artifacts, you need to enable the Snowpark new build feature flag            |
-  | (ENABLE_SNOWPARK_BUNDLE_MAP_BUILD=true)                                      |
+  | (ENABLE_SNOWPARK_GLOB_SUPPORT=true)                                          |
   +------------------------------------------------------------------------------+
 
   '''

diff --git a/tests/snowpark/test_artifacts.py b/tests/snowpark/test_artifacts.py
@@ -69,7 +69,7 @@ def test_build_and_deploy_with_artifacts(
     artifacts,
     local_path,
     stage_path,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_om_describe.side_effect = ProgrammingError(
         errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED
@@ -164,7 +164,7 @@ def test_build_and_deploy_with_artifacts_run_from_other_directory(
     artifact,
     local_path,
     stage_path,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_om_describe.side_effect = ProgrammingError(
         errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED

diff --git a/tests/snowpark/test_build.py b/tests/snowpark/test_build.py
@@ -44,7 +44,7 @@ def test_snowpark_build_no_deprecated_warnings_by_default(
 )
 def test_build_with_glob_patterns_in_artifacts(
     runner,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
     project_directory,
     alter_snowflake_yml,
     artifacts,

diff --git a/tests/snowpark/test_function.py b/tests/snowpark/test_function.py
@@ -141,7 +141,7 @@ def test_deploy_function_secrets_without_external_access(
     mock_ctx,
     project_directory,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_object_manager.return_value.show.return_value = [
         {"name": "external_1", "type": "EXTERNAL_ACCESS"},
@@ -183,7 +183,7 @@ def test_deploy_function_no_changes(
     mock_ctx,
     mock_cursor,
     project_directory,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     rows = [
@@ -230,7 +230,7 @@ def test_deploy_function_needs_update_because_packages_changes(
     mock_ctx,
     mock_cursor,
     project_directory,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     rows = [
@@ -287,7 +287,7 @@ def test_deploy_function_needs_update_because_handler_changes(
     mock_ctx,
     mock_cursor,
     project_directory,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     rows = [
@@ -350,7 +350,7 @@ def test_deploy_function_fully_qualified_name_duplicated_database(
     project_directory,
     alter_snowflake_yml,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     number_of_functions_in_project = 6
@@ -391,7 +391,7 @@ def test_deploy_function_fully_qualified_name_duplicated_schema(
     project_directory,
     alter_snowflake_yml,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     number_of_functions_in_project = 6
@@ -437,7 +437,7 @@ def test_deploy_function_fully_qualified_name(
     project_directory,
     alter_snowflake_yml,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     number_of_functions_in_project = 6
@@ -493,7 +493,7 @@ def test_deploy_function_with_empty_default_value(
     alter_snowflake_yml,
     parameter_type,
     default_value,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_object_manager.return_value.describe.side_effect = ProgrammingError(

diff --git a/tests/snowpark/test_procedure.py b/tests/snowpark/test_procedure.py
@@ -70,7 +70,7 @@ def test_deploy_procedure(
     runner,
     mock_ctx,
     project_directory,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_om_describe.side_effect = ProgrammingError(
@@ -148,7 +148,7 @@ def test_deploy_procedure_with_external_access(
     runner,
     mock_ctx,
     project_directory,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_om_describe.side_effect = ProgrammingError(
@@ -225,7 +225,7 @@ def test_deploy_procedure_secrets_without_external_access(
     mock_ctx,
     project_directory,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     ctx = mock_ctx()
@@ -274,7 +274,7 @@ def test_deploy_procedure_fails_if_integration_does_not_exists(
     mock_ctx,
     project_directory,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     ctx = mock_ctx()
@@ -327,7 +327,7 @@ def test_deploy_procedure_fails_if_object_exists_and_no_replace(
     mock_ctx,
     project_directory,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_om_describe.return_value = mock_cursor(
@@ -374,7 +374,7 @@ def test_deploy_procedure_replace_nothing_to_update(
     mock_ctx,
     project_directory,
     caplog,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_om_describe.side_effect = [
@@ -444,7 +444,7 @@ def test_deploy_procedure_replace_updates_single_object(
     mock_cursor,
     mock_ctx,
     project_directory,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_om_describe.side_effect = [
@@ -513,7 +513,7 @@ def test_deploy_procedure_replace_creates_missing_object(
     mock_cursor,
     mock_ctx,
     project_directory,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_om_describe.side_effect = [
@@ -575,7 +575,7 @@ def test_deploy_procedure_fully_qualified_name(
     project_directory,
     alter_snowflake_yml,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     number_of_procedures_in_projects = 6
@@ -616,7 +616,7 @@ def test_deploy_procedure_fully_qualified_name_duplicated_schema(
     project_directory,
     alter_snowflake_yml,
     os_agnostic_snapshot,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     number_of_procedures_in_projects = 6
@@ -673,7 +673,7 @@ def test_deploy_procedure_with_empty_default_value(
     alter_snowflake_yml,
     parameter_type,
     default_value,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     mock_download.return_value = DownloadUnavailablePackagesResult()
     mock_om_describe.side_effect = ProgrammingError(

diff --git a/tests/testing_utils/fixtures.py b/tests/testing_utils/fixtures.py
@@ -462,9 +462,9 @@ def mock_procedure_description(mock_cursor):
 
 
 @pytest.fixture
-def enable_snowpark_bundle_map_build_feature_flag():
+def enable_snowpark_glob_support_feature_flag():
     with mock.patch(
-        f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_BUNDLE_MAP_BUILD.is_enabled",
+        f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled",
         return_value=True,
     ):
         yield
diff --git a/tests_integration/conftest.py b/tests_integration/conftest.py
@@ -262,9 +262,9 @@ def resource_suffix(request):
 
 
 @pytest.fixture
-def enable_snowpark_bundle_map_build_feature_flag():
+def enable_snowpark_glob_support_feature_flag():
     with mock.patch(
-        f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_BUNDLE_MAP_BUILD.is_enabled",
+        f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled",
         return_value=True,
     ):
         yield
diff --git a/tests_integration/test_snowpark.py b/tests_integration/test_snowpark.py
@@ -41,7 +41,7 @@ def test_snowpark_flow(
     project_directory,
     alter_snowflake_yml,
     test_database,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     database = test_database.upper()
     with project_directory("snowpark") as tmp_dir:
@@ -1241,7 +1241,7 @@ def test_snowpark_flow_v2(
     project_directory,
     alter_snowflake_yml,
     test_database,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     database = test_database.upper()
     with project_directory("snowpark_v2") as tmp_dir:
@@ -1388,7 +1388,7 @@ def test_snowpark_with_glob_patterns(
     project_directory,
     alter_snowflake_yml,
     test_database,
-    enable_snowpark_bundle_map_build_feature_flag,
+    enable_snowpark_glob_support_feature_flag,
 ):
     database = test_database.upper()
     with project_directory("snowpark_glob_patterns"):

diff --git a/tests_integration/testing_utils/snowpark_utils.py b/tests_integration/testing_utils/snowpark_utils.py
@@ -171,7 +171,7 @@ def snowpark_build_should_zip_files(
             additional_files = []
 
         if not no_dependencies:
-            if FeatureFlag.ENABLE_SNOWPARK_BUNDLE_MAP_BUILD.is_enabled():
+            if FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled():
                 additional_files.append(Path("output") / "dependencies.zip")
             else:
                 additional_files.append(Path("dependencies.zip"))