snowflake-cli-labs 2.4.0rc0__tar.gz → 2.4.1__tar.gz

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.4.0rc0
+Version: 2.4.1
 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-2.4.0rc0 → snowflake_cli_labs-2.4.1}/RELEASE-NOTES.md

@@ -1,4 +1,4 @@
-# Unreleased version
+# v2.4.1
 ## Backward incompatibility
 
 ## Deprecations
@@ -6,7 +6,7 @@
 ## New additions
 
 ## Fixes and improvements
-
+* Fixed MFA caching
 
 # v2.4.0
 ## Backward incompatibility

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/src/snowflake/cli/__about__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-VERSION = "2.4.0rc0"
+VERSION = "2.4.1"

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/src/snowflake/cli/app/constants.py

@@ -3,4 +3,3 @@ from __future__ import annotations
 from typing import Literal
 
 PARAM_APPLICATION_NAME: Literal["snowcli"] = "snowcli"
-PARAM_INTERNAL_APPLICATION_NAME: Literal["snowcli"] = "snowcli"

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/src/snowflake/cli/app/snow_connector.py

@@ -16,7 +16,6 @@ from snowflake.cli.api.exceptions import (
 from snowflake.cli.api.secure_path import SecurePath
 from snowflake.cli.app.constants import (
     PARAM_APPLICATION_NAME,
-    PARAM_INTERNAL_APPLICATION_NAME,
 )
 from snowflake.cli.app.telemetry import command_info
 from snowflake.connector import SnowflakeConnection
@@ -24,7 +23,6 @@ from snowflake.connector.errors import DatabaseError, ForbiddenError
 
 log = logging.getLogger(__name__)
 
-from snowflake.cli.__about__ import VERSION
 
 ENCRYPTED_PKCS8_PK_HEADER = b"-----BEGIN ENCRYPTED PRIVATE KEY-----"
 UNENCRYPTED_PKCS8_PK_HEADER = b"-----BEGIN PRIVATE KEY-----"
@@ -84,6 +82,9 @@ def connect_to_snowflake(
     if mfa_passcode:
         connection_parameters["passcode"] = mfa_passcode
 
+    if connection_parameters.get("authenticator") == "username_password_mfa":
+        connection_parameters["client_request_mfa_token"] = True
+
     if enable_diag:
         connection_parameters["enable_connection_diag"] = enable_diag
         if diag_log_path:
@@ -157,8 +158,6 @@ def _update_connection_application_name(connection_parameters: Dict):
     """Update version and name of app handling connection."""
     connection_application_params = {
         "application_name": PARAM_APPLICATION_NAME,
-        "internal_application_name": PARAM_INTERNAL_APPLICATION_NAME,
-        "internal_application_version": VERSION,
     }
     connection_parameters.update(connection_application_params)
 

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/src/snowflake/cli/plugins/nativeapp/teardown_processor.py

@@ -130,12 +130,14 @@ class NativeAppTeardownProcessor(NativeAppManager, NativeAppCommandProcessor):
                 )
             elif interactive:
                 if interactive:
-                    api_integration = typer.prompt(
-                        f"The following objects are owned by application {self.app_name}:\n{application_objects_str}\n\nWould you like to drop these objects in addition to the application? [y/n/ABORT]"
+                    user_response = typer.prompt(
+                        f"The following objects are owned by application {self.app_name}:\n{application_objects_str}\n\nWould you like to drop these objects in addition to the application? [y/n/ABORT]",
+                        show_default=False,
+                        default="ABORT",
                     )
-                    if api_integration in ["y", "yes", "Y", "Yes", "YES"]:
+                    if user_response in ["y", "yes", "Y", "Yes", "YES"]:
                         cascade = True
-                    elif api_integration in ["n", "no", "N", "No", "NO"]:
+                    elif user_response in ["n", "no", "N", "No", "NO"]:
                         cascade = False
                     else:
                         raise typer.Abort()

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/tests/nativeapp/__snapshots__/test_commands.ambr

@@ -367,6 +367,7 @@
   |                  | App project. It contains minimal code meant to help you   |
   |                  | set up your first application object in your account      |
   |                  | quickly.                                                  |
+  | spcs-basic       | 1. Install Docker                                         |
   | streamlit-java   | This is an example template for a Snowflake Native App    |
   |                  | project which demonstrates the use of Java extension code |
   |                  | and adding Streamlit code. This template is meant to      |

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/tests/test_connection.py

@@ -368,8 +368,6 @@ def test_temporary_connection(mock_connector, mock_ctx, option, runner):
         schema="PUBLIC",
         warehouse="xsmall",
         application_name="snowcli",
-        internal_application_name="snowcli",
-        internal_application_version="0.0.0-test_patched",
     )
 
 
@@ -450,8 +448,6 @@ def test_key_pair_authentication(mock_connector, mock_ctx, runner):
         schema="PUBLIC",
         warehouse="xsmall",
         application_name="snowcli",
-        internal_application_name="snowcli",
-        internal_application_version="0.0.0-test_patched",
     )
 
 
@@ -500,8 +496,6 @@ def test_session_and_master_tokens(mock_connector, mock_ctx, runner):
         warehouse="xsmall",
         server_session_keep_alive=True,
         application_name="snowcli",
-        internal_application_name="snowcli",
-        internal_application_version="0.0.0-test_patched",
     )
 
 
@@ -549,8 +543,6 @@ def test_key_pair_authentication_from_config(
         authenticator="SNOWFLAKE_JWT",
         private_key="secret value",
         application_name="snowcli",
-        internal_application_name="snowcli",
-        internal_application_version="0.0.0-test_patched",
     )
 
 
@@ -636,6 +628,18 @@ def test_no_mfa_passcode(mock_connect, runner):
     assert kwargs.get("passcode") is None
 
 
+@mock.patch("snowflake.connector.connect")
+def test_mfa_cache(mock_connect, runner):
+    result = runner.invoke(
+        ["sql", "-q", "select 1", "--authenticator", "username_password_mfa"]
+    )
+
+    assert result.exit_code == 0, result.output
+    args, kwargs = mock_connect.call_args
+    assert kwargs["authenticator"] == "username_password_mfa"
+    assert kwargs["client_request_mfa_token"]
+
+
 @pytest.mark.parametrize(
     "env",
     [
@@ -676,8 +680,6 @@ def test_connection_details_are_resolved_using_environment_variables(
             "role": "role",
             "password": "dummy",
             "application_name": "snowcli",
-            "internal_application_name": "snowcli",
-            "internal_application_version": "0.0.0-test_patched",
         }
 
 
@@ -737,8 +739,6 @@ def test_flags_take_precedence_before_environment_variables(
             "password": "password_from_flag",
             "role": "role_from_flag",
             "application_name": "snowcli",
-            "internal_application_name": "snowcli",
-            "internal_application_version": "0.0.0-test_patched",
         }
 
 
@@ -776,8 +776,6 @@ def test_source_precedence(mock_connect, runner):
         "database": "database_from_connection_env",
         "role": "role_from_global_env",
         "application_name": "snowcli",
-        "internal_application_name": "snowcli",
-        "internal_application_version": "0.0.0-test_patched",
     }
 
 

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/tests/test_main.py

@@ -49,8 +49,6 @@ def test_custom_config_path(mock_conn, runner, mock_cursor):
         warehouse="xs",
         password="dummy_password",
         application_name="snowcli",
-        internal_application_name="snowcli",
-        internal_application_version="0.0.0-test_patched",
     )
 
 

{snowflake_cli_labs-2.4.0rc0 → snowflake_cli_labs-2.4.1}/tests/test_snow_connector.py

@@ -49,8 +49,6 @@ def test_command_context_is_passed_to_snowflake_connection(
         warehouse="xs",
         password="dummy_password",
         application_name="snowcli",
-        internal_application_name="snowcli",
-        internal_application_version="0.0.0-test_patched",
     )