Address comments

snowflakedb · Dec 12, 2024 · e096e2e · e096e2e
1 parent 659fd6c
commit e096e2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/snowflake/cli/_plugins/nativeapp/sf_sql_facade.py b/src/snowflake/cli/_plugins/nativeapp/sf_sql_facade.py
@@ -23,6 +23,7 @@
 from snowflake.cli._plugins.nativeapp.constants import (
     AUTHORIZE_TELEMETRY_COL,
     CHANNEL_COL,
+    DEFAULT_CHANNEL,
     DEFAULT_DIRECTIVE,
     NAME_COL,
     SPECIAL_COMMENT,
@@ -674,11 +675,11 @@ def get_app_properties():
                 using_clause = install_method.using_clause(stage_fqn)
                 if release_channel:
                     current_release_channel = get_app_properties().get(
-                        CHANNEL_COL, "DEFAULT"
+                        CHANNEL_COL, DEFAULT_CHANNEL
                     )
                     if not same_identifiers(release_channel, current_release_channel):
                         raise UpgradeApplicationRestrictionError(
-                            f"Cannot upgrade application {name} from release channel {release_channel} because application is already on a different channel."
+                            f"Application {name} is currently on release channel {current_release_channel}. Cannot upgrade to release channel {release_channel}."
                         )
 
                 upgrade_cursor = self._sql_executor.execute_query(

diff --git a/tests/nativeapp/test_sf_sql_facade.py b/tests/nativeapp/test_sf_sql_facade.py
@@ -2146,7 +2146,7 @@ def test_upgrade_application_with_release_channel_not_same_as_app_properties_the
 
     assert (
         str(err.value)
-        == f"Cannot upgrade application {app_name} from release channel {release_channel} because application is already on a different channel."
+        == f"Application {app_name} is currently on release channel different_channel. Cannot upgrade to release channel {release_channel}."
     )