Added file execute log for stage and git (#2139)

Author: sfc-gh-astus

RELEASE-NOTES.md

@@ -42,6 +42,7 @@
 * Change binary builds to embed whole Python environment.
 * Fixed recursive copying to stage for unbalanced directory trees.
 * Fixed checking for new CLI version.
+* Added file execution log in stage and git commands.
 
 # v3.5.0
 

src/snowflake/cli/_plugins/stage/manager.py

@@ -707,6 +707,7 @@ def _call_execute_immediate(
         original_file: str,
     ) -> Dict:
         try:
+            log.info("Executing SQL file: %s", file_stage_path)
             query = f"execute immediate from {self.quote_stage_name(file_stage_path)}"
             if variables:
                 query += variables
@@ -820,6 +821,7 @@ def _execute_python(
         from snowflake.snowpark.exceptions import SnowparkSQLException
 
         try:
+            log.info("Executing Python file: %s", file_stage_path)
             self._python_exe_procedure(self.get_standard_stage_prefix(file_stage_path), variables, session=self.snowpark_session)  # type: ignore
             return StageManager._success_result(file=original_file)
         except SnowparkSQLException as e:

tests/git/test_git_commands.py

@@ -588,6 +588,7 @@ def test_execute(
     expected_stage,
     expected_files,
     os_agnostic_snapshot,
+    caplog,
 ):
     mock_execute.return_value = mock_cursor(
         [
@@ -602,20 +603,18 @@ def test_execute(
 
     assert result.exit_code == 0, result.output
     create_call, copy_call, ls_call, *execute_calls = mock_execute.mock_calls
+    stage = "FOO.BAR.snowflake_cli_tmp_stage_123"
     assert create_call == mock.call(
-        "create temporary stage if not exists IDENTIFIER('FOO.BAR.snowflake_cli_tmp_stage_123')"
-    )
-    assert copy_call == mock.call(
-        f"copy files into @FOO.BAR.snowflake_cli_tmp_stage_123/ from {expected_stage}/"
-    )
-    assert ls_call == mock.call(
-        f"ls @FOO.BAR.snowflake_cli_tmp_stage_123", cursor_class=DictCursor
+        f"create temporary stage if not exists IDENTIFIER('{stage}')"
     )
+    assert copy_call == mock.call(f"copy files into @{stage}/ from {expected_stage}/")
+    assert ls_call == mock.call(f"ls @{stage}", cursor_class=DictCursor)
     assert execute_calls == [
-        mock.call(f"execute immediate from @FOO.BAR.snowflake_cli_tmp_stage_123{p}")
-        for p in expected_files
+        mock.call(f"execute immediate from @{stage}{p}") for p in expected_files
     ]
     assert result.output == os_agnostic_snapshot
+    for expected_file in expected_files:
+        assert f"Executing SQL file: @{stage}{expected_file}" in caplog.messages
 
 
 @pytest.mark.parametrize(
@@ -658,6 +657,7 @@ def test_execute_new_git_repository_list_files(
     expected_stage,
     expected_files,
     os_agnostic_snapshot,
+    caplog,
 ):
     mock_execute.return_value = mock_cursor(
         [
@@ -672,20 +672,18 @@ def test_execute_new_git_repository_list_files(
 
     assert result.exit_code == 0, result.output
     create_call, copy_call, ls_call, *execute_calls = mock_execute.mock_calls
+    stage = "FOO.BAR.snowflake_cli_tmp_stage_123"
     assert create_call == mock.call(
-        "create temporary stage if not exists IDENTIFIER('FOO.BAR.snowflake_cli_tmp_stage_123')"
-    )
-    assert copy_call == mock.call(
-        f"copy files into @FOO.BAR.snowflake_cli_tmp_stage_123/ from {expected_stage}/"
-    )
-    assert ls_call == mock.call(
-        f"ls @FOO.BAR.snowflake_cli_tmp_stage_123", cursor_class=DictCursor
+        f"create temporary stage if not exists IDENTIFIER('{stage}')"
     )
+    assert copy_call == mock.call(f"copy files into @{stage}/ from {expected_stage}/")
+    assert ls_call == mock.call(f"ls @{stage}", cursor_class=DictCursor)
     assert execute_calls == [
-        mock.call(f"execute immediate from @FOO.BAR.snowflake_cli_tmp_stage_123{p}")
-        for p in expected_files
+        mock.call(f"execute immediate from @{stage}{p}") for p in expected_files
     ]
     assert result.output == os_agnostic_snapshot
+    for expected_file in expected_files:
+        assert f"Executing SQL file: @{stage}{expected_file}" in caplog.messages
 
 
 @pytest.mark.parametrize(

tests/stage/test_stage.py

@@ -815,6 +815,7 @@ def test_execute(
     expected_stage,
     expected_files,
     os_agnostic_snapshot,
+    caplog,
 ):
     mock_execute.return_value = mock_cursor(
         [
@@ -835,6 +836,8 @@ def test_execute(
         mock.call(f"execute immediate from {p}") for p in expected_files
     ]
     assert result.output == os_agnostic_snapshot
+    for expected_file in expected_files:
+        assert f"Executing SQL file: {expected_file}" in caplog.messages
 
 
 @pytest.mark.parametrize(
@@ -855,6 +858,7 @@ def test_execute_from_user_stage(
     stage_path,
     expected_files,
     snapshot,
+    caplog,
 ):
     mock_execute.return_value = mock_cursor(
         [
@@ -875,6 +879,8 @@ def test_execute_from_user_stage(
         mock.call(f"execute immediate from '{p}'") for p in expected_files
     ]
     assert result.output == snapshot
+    for expected_file in expected_files:
+        assert f"Executing SQL file: {expected_file}" in caplog.messages
 
 
 @mock.patch(f"{STAGE_MANAGER}.execute_query")