Add optional subdirectory for stage in application package

RELEASE-NOTES.md

@@ -32,12 +32,13 @@
   * Add ability to add and remove accounts from release channels through `snow app release-channel add-accounts` and snow app release-channel remove-accounts` commands.
   * Add ability to add/remove versions to/from release channels through `snow app release-channel add-version` and `snow app release-channel remove-version` commands.
 * Add support for restricting Snowflake user authentication policy to Snowflake CLI-only.
+* Add an optional `stage_subdirectory` field to `application package` entity. When specified, application artifacts are uploaded to this subdirectory instead of the root of the application package's stage.
+
 ## Fixes and improvements
 * Fixed inability to add patches to lowercase quoted versions
 * Fixes label being set to blank instead of None when not provided.
 * Added a feature flag `ENABLE_SPCS_LOG_STREAMING` to control the rollout of the log streaming feature
 
-
 # v3.2.2
 ## Backward incompatibility
 

src/snowflake/cli/_plugins/nativeapp/commands.py

@@ -43,11 +43,6 @@
     force_project_definition_v2,
 )
 from snowflake.cli._plugins.nativeapp.version.commands import app as versions_app
-from snowflake.cli._plugins.stage.diff import (
-    DiffResult,
-    compute_stage_diff,
-)
-from snowflake.cli._plugins.stage.utils import print_diff_to_console
 from snowflake.cli._plugins.workspace.manager import WorkspaceManager
 from snowflake.cli.api.cli_global_context import get_cli_context
 from snowflake.cli.api.commands.decorators import (
@@ -66,6 +61,7 @@
     ObjectResult,
     StreamResult,
 )
+from snowflake.cli.api.project.util import same_identifiers
 from typing_extensions import Annotated
 
 app = SnowTyperFactory(
@@ -117,20 +113,15 @@ def app_diff(
         project_root=cli_context.project_root,
     )
     package_id = options["package_entity_id"]
-    package = cli_context.project_definition.entities[package_id]
-    bundle_map = ws.perform_action(
+    diff = ws.perform_action(
         package_id,
-        EntityActions.BUNDLE,
-    )
-    stage_fqn = f"{package.fqn.name}.{package.stage}"
-    diff: DiffResult = compute_stage_diff(
-        local_root=Path(package.deploy_root), stage_fqn=stage_fqn
+        EntityActions.DIFF,
+        print_to_console=cli_context.output_format != OutputFormat.JSON,
     )
     if cli_context.output_format == OutputFormat.JSON:
         return ObjectResult(diff.to_dict())
-    else:
-        print_diff_to_console(diff, bundle_map)
-        return None  # don't print any output
+
+    return None
 
 
 @app.command("run", requires_connection=True)
@@ -262,11 +253,22 @@ def app_teardown(
         project_definition=cli_context.project_definition,
         project_root=cli_context.project_root,
     )
+
+    # TODO: get all apps created from this application package from snowflake, compare, confirm and drop.
+    # TODO: add messaging/confirmation here for extra apps found as part of above
+    all_packages_with_id = [
+        package_entity.entity_id
+        for package_entity in project.get_entities_by_type(
+            ApplicationPackageEntityModel.get_type()
+        ).values()
+        if same_identifiers(package_entity.fqn.name, app_package_entity.fqn.name)
+    ]
+
     for app_entity in project.get_entities_by_type(
         ApplicationEntityModel.get_type()
     ).values():
         # Drop each app
-        if app_entity.from_.target == app_package_entity.entity_id:
+        if app_entity.from_.target in all_packages_with_id:
             ws.perform_action(
                 app_entity.entity_id,
                 EntityActions.DROP,

src/snowflake/cli/_plugins/nativeapp/entities/application.py

@@ -53,6 +53,7 @@
     UpgradeApplicationRestrictionError,
 )
 from snowflake.cli._plugins.nativeapp.utils import needs_confirmation
+from snowflake.cli._plugins.stage.manager import DefaultStagePathParts
 from snowflake.cli._plugins.workspace.context import ActionContext
 from snowflake.cli.api.cli_global_context import get_cli_context, span
 from snowflake.cli.api.console.abc import AbstractConsole
@@ -83,7 +84,6 @@
 from snowflake.cli.api.project.schemas.updatable_model import DiscriminatorField
 from snowflake.cli.api.project.util import (
     append_test_resource_suffix,
-    extract_schema,
     identifier_for_url,
     to_identifier,
     unquote_identifier,
@@ -331,7 +331,6 @@ def action_deploy(
         paths: List[Path],
         release_channel: Optional[str] = None,
         validate: bool = ValidateOption,
-        stage_fqn: Optional[str] = None,
         interactive: bool = InteractiveOption,
         version: Optional[str] = None,
         patch: Optional[int] = None,
@@ -346,7 +345,8 @@ def action_deploy(
         package_entity: ApplicationPackageEntity = action_ctx.get_entity(
             self.package_entity_id
         )
-        stage_fqn = stage_fqn or package_entity.stage_fqn
+
+        stage_path = package_entity.stage_path
 
         if force:
             policy = AllowAlwaysPolicy()
@@ -363,7 +363,7 @@ def action_deploy(
 
             self.create_or_upgrade_app(
                 package=package_entity,
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=SameAccountInstallMethod.release_directive(),
                 release_channel=release_channel,
                 policy=policy,
@@ -391,7 +391,7 @@ def action_deploy(
 
             self.create_or_upgrade_app(
                 package=package_entity,
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=SameAccountInstallMethod.versioned_dev(version, patch),
                 policy=policy,
                 interactive=interactive,
@@ -405,13 +405,12 @@ def action_deploy(
             recursive=True,
             paths=[],
             validate=validate,
-            stage_fqn=stage_fqn,
             interactive=interactive,
             force=force,
         )
         self.create_or_upgrade_app(
             package=package_entity,
-            stage_fqn=stage_fqn,
+            stage_path=stage_path,
             install_method=SameAccountInstallMethod.unversioned_dev(),
             policy=policy,
             interactive=interactive,
@@ -609,7 +608,7 @@ def get_objects_owned_by_application(self) -> List[ApplicationOwnedObject]:
 
     def _upgrade_app(
         self,
-        stage_fqn: str,
+        stage_path: DefaultStagePathParts,
         install_method: SameAccountInstallMethod,
         event_sharing: EventSharingHandler,
         policy: PolicyBase,
@@ -622,7 +621,7 @@ def _upgrade_app(
             return get_snowflake_facade().upgrade_application(
                 name=self.name,
                 install_method=install_method,
-                stage_fqn=stage_fqn,
+                path_to_version_directory=stage_path.full_path,
                 debug_mode=self.debug,
                 should_authorize_event_sharing=event_sharing.should_authorize_event_sharing(),
                 release_channel=release_channel,
@@ -636,7 +635,7 @@ def _upgrade_app(
 
     def _create_app(
         self,
-        stage_fqn: str,
+        stage_path: DefaultStagePathParts,
         install_method: SameAccountInstallMethod,
         event_sharing: EventSharingHandler,
         package: ApplicationPackageEntity,
@@ -653,7 +652,7 @@ def _create_app(
                 role_to_use=package.role,
             )
 
-            stage_schema = extract_schema(stage_fqn)
+            stage_schema = stage_path.schema
             get_snowflake_facade().grant_privileges_to_role(
                 privileges=["usage"],
                 object_type=ObjectType.SCHEMA,
@@ -665,7 +664,7 @@ def _create_app(
             get_snowflake_facade().grant_privileges_to_role(
                 privileges=["read"],
                 object_type=ObjectType.STAGE,
-                object_identifier=stage_fqn,
+                object_identifier=stage_path.stage,
                 role_to_grant=self.role,
                 role_to_use=package.role,
             )
@@ -674,7 +673,7 @@ def _create_app(
             name=self.name,
             package_name=package.name,
             install_method=install_method,
-            stage_fqn=stage_fqn,
+            path_to_version_directory=stage_path.full_path,
             debug_mode=self.debug,
             should_authorize_event_sharing=event_sharing.should_authorize_event_sharing(),
             role=self.role,
@@ -686,7 +685,7 @@ def _create_app(
     def create_or_upgrade_app(
         self,
         package: ApplicationPackageEntity,
-        stage_fqn: str,
+        stage_path: DefaultStagePathParts,
         install_method: SameAccountInstallMethod,
         policy: PolicyBase,
         interactive: bool,
@@ -704,13 +703,11 @@ def create_or_upgrade_app(
             self.name, self.role
         )
 
-        stage_fqn = stage_fqn or package.stage_fqn
-
         # 2. If existing application is found, try to upgrade the application object.
         create_or_upgrade_result = None
         if show_app_row:
             create_or_upgrade_result = self._upgrade_app(
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=install_method,
                 event_sharing=event_sharing,
                 policy=policy,
@@ -721,7 +718,7 @@ def create_or_upgrade_app(
         # 3. If no existing application found, or we performed a drop before the upgrade, we proceed to create
         if create_or_upgrade_result is None:
             create_or_upgrade_result = self._create_app(
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=install_method,
                 event_sharing=event_sharing,
                 package=package,