snowflake-cli 3.0.1__tar.gz → 3.0.2__tar.gz

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli
-Version: 3.0.1
+Version: 3.0.2
 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-3.0.1 → snowflake_cli-3.0.2}/RELEASE-NOTES.md

@@ -23,6 +23,18 @@
 ## Fixes and improvements
 
 
+# v3.0.2
+## Backward incompatibility
+
+## Deprecations
+
+## New additions
+
+## Fixes and improvements
+* Fix handling empty default values for strings by `snow snowpark deploy`.
+* Log error details in case pip command fails.
+
+
 # v3.0.1
 
 ## Backward incompatibility

snowflake_cli-3.0.2/scripts/packaging/build_binaries.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+set -oeux pipefail
+
+git config --global --add safe.directory /snowflake-cli
+
+MACHINE=$(uname -m | tr '[:upper:]' '[:lower:]')
+SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]')
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+BUILD_DIR="${ROOT_DIR}/build"
+DIST_DIR="${ROOT_DIR}/dist"
+
+VERSION=$(hatch version)
+ENTRY_POINT="src/snowflake/cli/_app/__main__.py"
+
+clean_build_workspace() {
+  rm -rf $DIST_DIR $BUILD_DIR || true
+}
+
+build_binaries() {
+  if [[ ${SYSTEM} == "darwin" ]]; then
+    echo "Building for Darwin moved to build_darwin_package.sh"
+    exit 0
+  elif [[ ${SYSTEM} == "linux" ]]; then
+    hatch -e packaging run pyinstaller \
+      --name=snow \
+      --target-architecture=$MACHINE \
+      --onedir \
+      --clean \
+      --noconfirm \
+      --contents-directory=snowflake-cli-${VERSION} \
+      ${ENTRY_POINT}
+  else
+    echo "Unsupported platform: ${SYSTEM}"
+    exit 1
+  fi
+}
+
+execute_build() {
+  echo "Executing build"
+  if [[ ${SYSTEM} == "linux" ]]; then
+    $DIST_DIR/snow/snow --help
+  else
+    echo "Unsupported platform: ${SYSTEM}"
+    exit 1
+  fi
+}
+
+clean_build_workspace
+build_binaries
+execute_build

snowflake_cli-3.0.2/scripts/packaging/build_darwin_package.sh

@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+set -xeuo pipefail
+
+git config --global --add safe.directory /snowflake-cli
+brew install -q tree
+
+ROOT_DIR=$(git rev-parse --show-toplevel)
+PACKAGING_DIR=$ROOT_DIR/scripts/packaging
+
+SYSTEM=$(uname -s | tr '[:upper:]' '[:lower:]')
+MACHINE=$(uname -m | tr '[:upper:]' '[:lower:]')
+PLATFORM="${SYSTEM}-${MACHINE}"
+
+CLI_VERSION=$(hatch version)
+
+ENTRY_POINT="src/snowflake/cli/_app/__main__.py"
+BUILD_DIR="${ROOT_DIR}/build"
+DIST_DIR=$ROOT_DIR/dist
+BINARY_NAME="snow"
+APP_NAME="SnowflakeCLI.app"
+APP_DIR=$DIST_DIR/app
+APP_SCRIPTS=$APP_DIR/scripts
+CODESIGN_IDENTITY="Developer ID Application: Snowflake Computing INC. (W4NT6CRQ7U)"
+PRODUCTSIGN_IDENTITY="Developer ID Installer: Snowflake Computing INC. (W4NT6CRQ7U)"
+
+loginfo() {
+  logger -s -p INFO -- $1
+}
+
+clean_build_workspace() {
+  rm -rf $DIST_DIR $BUILD_DIR || true
+}
+
+clean_build_workspace
+
+security -v unlock-keychain -p $MAC_USERNAME_PASSWORD login.keychain-db
+
+loginfo "---------------------------------"
+security find-identity -v -p codesigning
+loginfo "---------------------------------"
+
+hatch -e packaging run pyinstaller \
+  --name=${BINARY_NAME} \
+  --target-architecture=$MACHINE \
+  --onedir \
+  --clean \
+  --noconfirm \
+  --windowed \
+  --osx-bundle-identifier=com.snowflake.snowflake-cli \
+  --osx-entitlements-file=scripts/packaging/macos/SnowflakeCLI_entitlements.plist \
+  --codesign-identity="${CODESIGN_IDENTITY}" \
+  --icon=scripts/packaging/macos/snowflake_darwin.icns \
+  ${ENTRY_POINT}
+
+ls -l $DIST_DIR
+mkdir $APP_DIR || true
+mv $DIST_DIR/${BINARY_NAME}.app ${APP_DIR}/${APP_NAME}
+${APP_DIR}/${APP_NAME}/Contents/MacOS/snow --help
+
+cat >${APP_DIR}/${APP_NAME}/Contents/Info.plist <<INFO_PLIST
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleName</key>
+    <string>SnowflakeCLI</string>
+    <key>CFBundleDisplayName</key>
+    <string>SnowflakeCLI</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.snowflake.snowflake-cli</string>
+    <key>CFBundleVersion</key>
+    <string>$CLI_VERSION</string>
+    <key>CFBundleShortVersionString</key>
+    <string>$CLI_VERSION</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>SnowflakeCLI.bash</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleSignature</key>
+    <string>snow</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright © 2016-2019 Snowflake, Inc. All rights reserved.</string>
+    <key>CFBundleGetInfoString</key>
+    <string>$CLI_VERSION Copyright © 2016-2019 Snowflake, Inc. All rights reserved.</string>
+    <key>CFBundleIconFile</key>
+    <string>SnowflakeCLI.icns</string>
+</dict>
+</plist>
+INFO_PLIST
+
+cp -r $PACKAGING_DIR/macos/snowflake_darwin.icns ${APP_DIR}/${APP_NAME}/Contents/Resources/SnowflakeCLI.icns
+cp -r $PACKAGING_DIR/macos/SnowflakeCLI.bash ${APP_DIR}/${APP_NAME}/Contents/MacOS/SnowflakeCLI.bash
+chmod +x $APP_DIR/${APP_NAME}/Contents/MacOS/SnowflakeCLI.bash
+
+# POSTINSTALL SCRIPT
+prepare_postinstall_script() {
+  rm -rf $APP_SCRIPTS || true
+  mkdir -p $APP_SCRIPTS || true
+  cp -r $PACKAGING_DIR/macos/postinstall $APP_SCRIPTS/postinstall
+}
+
+prepare_postinstall_script
+
+ls -l $DIST_DIR
+tree -d $DIST_DIR
+
+chmod +x $APP_SCRIPTS/postinstall
+
+# codesign after changes
+codesign \
+  --timestamp \
+  --deep \
+  --force \
+  --verify \
+  --verbose \
+  --options runtime \
+  --entitlements $PACKAGING_DIR/macos/SnowflakeCLI_entitlements.plist \
+  --sign "${CODESIGN_IDENTITY}" ${APP_DIR}/${APP_NAME}
+
+PKG_UNSIGNED_NAME="snowflake-cli-${SYSTEM}.unsigned.pkg"
+loginfo "---------------------------------"
+loginfo "Package build ${DIST_DIR}/${PKG_UNSIGNED_NAME}"
+loginfo "---------------------------------"
+pkgbuild \
+  --identifier com.snowflake.snowflake-cli \
+  --install-location '/Applications' \
+  --version $CLI_VERSION \
+  --scripts $APP_SCRIPTS \
+  --root $APP_DIR \
+  --component-plist ${PACKAGING_DIR}/macos/SnowflakeCLI.plist \
+  ${DIST_DIR}/${PKG_UNSIGNED_NAME}
+
+ls -l $DIST_DIR
+
+PRODUCT_UNSIGNED_NAME="snowflake-cli-${SYSTEM}.unsigned.pkg"
+PRODUCT_SIGNED_NAME="snowflake-cli-${SYSTEM}.pkg"
+loginfo "---------------------------------"
+loginfo "Procuct sign ${DIST_DIR}/${PRODUCT_UNSIGNED_NAME} -> ${DIST_DIR}/${PRODUCT_SIGNED_NAME}"
+loginfo "---------------------------------"
+productsign \
+  --sign "${PRODUCTSIGN_IDENTITY}" \
+  ${DIST_DIR}/${PRODUCT_UNSIGNED_NAME} \
+  ${DIST_DIR}/${PRODUCT_SIGNED_NAME}
+
+ls -l $DIST_DIR
+
+PRODUCT_BUILD_UNSIGNED_NAME="snowflake-cli-${PLATFORM}.unsigned.pkg"
+loginfo "---------------------------------"
+loginfo "Procuct build ${DIST_DIR}/${PRODUCT_BUILD_UNSIGNED_NAME} <- ${DIST_DIR}/${PRODUCT_SIGNED_NAME}"
+loginfo "---------------------------------"
+productbuild \
+  --distribution $PACKAGING_DIR/macos/Distribution.xml \
+  --version $CLI_VERSION \
+  --resources $PACKAGING_DIR/macos/Resources \
+  --package-path $DIST_DIR \
+  ${DIST_DIR}/${PRODUCT_BUILD_UNSIGNED_NAME}
+
+ls -l $DIST_DIR
+
+PRODUCT_BUILD_SIGNED_NAME="snowflake-cli-${PLATFORM}.pkg"
+loginfo "---------------------------------"
+loginfo "Procuct sign ${DIST_DIR}${PRODUCT_BUILD_UNSIGNED_NAME} -> ${DIST_DIR}/${PRODUCT_BUILD_SIGNED_NAME}"
+loginfo "---------------------------------"
+productsign \
+  --sign "${PRODUCTSIGN_IDENTITY}" \
+  ${DIST_DIR}/${PRODUCT_BUILD_UNSIGNED_NAME} \
+  ${DIST_DIR}/${PRODUCT_BUILD_SIGNED_NAME}
+
+FINAL_PKG_NAME="snowflake-cli-${CLI_VERSION}-${PLATFORM}.pkg"
+cp -p ${DIST_DIR}/${PRODUCT_BUILD_SIGNED_NAME} ${DIST_DIR}/${FINAL_PKG_NAME}
+
+ls -l $DIST_DIR
+
+cat <<ASKPASS >./asker.sh
+  #!/bin/bash
+  printf "%s\n" "$MAC_USERNAME_PASSWORD"
+ASKPASS
+
+validate_installation() {
+  local pkg_name=$1
+  ls -la $pkg_name
+
+  export SUDO_ASKPASS=./asker.sh
+  sudo -A installer -pkg $pkg_name -target /
+  [ -f /Applications/${APP_NAME}/Contents/MacOS/snow ]
+  PATH=/Applications/${APP_NAME}/Contents/MacOS:$PATH snow
+
+  sudo rm -rf /Applications/${APP_NAME} || true
+}
+
+validate_installation $DIST_DIR/snowflake-cli-${CLI_VERSION}-${SYSTEM}-${MACHINE}.pkg

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/scripts/packaging/macos/SnowflakeCLI.bash

@@ -4,7 +4,7 @@ BASEDIR=$(dirname $0)
 osascript <<APPL_SCRIPT
 tell application "Terminal"
     if not (exists window 1) then reopen
-    do script "$BASEDIR/snow/snow" in the last window
+    do script "$BASEDIR/snow" in the last window
     set the bounds of the last window to {0, 0, 1400, 800}
     activate
 end tell

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/scripts/packaging/macos/postinstall

@@ -16,7 +16,7 @@ export PATH=$dest:\$PATH" >>$profile
 }
 
 echo "[DEBUG] Parameters: $1 $2"
-SNOWFLAKE_CLI_DEST=$2/SnowflakeCLI.app/Contents/MacOS/snow/
+SNOWFLAKE_CLI_DEST=$2/SnowflakeCLI.app/Contents/MacOS/
 
 SNOWFLAKE_CLI_LOGIN_SHELL=~/.profile
 if [[ -e ~/.zprofile ]]; then

snowflake_cli-3.0.2/scripts/packaging/win/build_installer.bat

@@ -0,0 +1,68 @@
+@echo on
+
+set PATH=C:\Program Files\7-Zip;C:\Users\jenkins\AppData\Local\Programs\Python\Python38;C:\Users\jenkins\AppData\Local\Programs\Python\Python38\Scripts;C:\Program Files (x86)\WiX Toolset v3.11\bin;%PATH%
+
+python.exe --version
+python.exe -c "import platform as p; print(f'{p.system()=}, {p.architecture()=}')"
+
+python.exe -m pip install hatch
+FOR /F "delims=" %%I IN ('hatch run packaging:win-build-version') DO SET CLI_VERSION=%%I
+FOR /F "delims=" %%I IN ('git rev-parse %svnRevision%') DO SET REVISION=%%I
+FOR /F "delims=" %%I IN ('echo %releaseType%') DO SET RELEASE_TYPE=%%I
+
+echo CLI_VERSION = %CLI_VERSION%
+echo REVISION = %REVISION%`
+echo RELEASE_TYPE = %RELEASE_TYPE%`
+
+set CLI_ZIP=snowflake-cli-%CLI_VERSION%.zip
+set CLI_MSI=snowflake-cli-%CLI_VERSION%-x86_64.msi
+set STAGE_URL=s3://sfc-eng-jenkins/repository/snowflake-cli/staging/%RELEASE_TYPE%/windows_x86_64/%REVISION%
+set RELEASE_URL=s3://sfc-eng-jenkins/repository/snowflake-cli/%RELEASE_TYPE%/windows_x86_64/%REVISION%
+
+echo "[INFO] downloading artifacts"
+cmd /c aws s3 cp %STAGE_URL%/%CLI_ZIP% . || goto :error
+
+echo "[INFO] building installer"
+7z x %CLI_ZIP% || goto :error
+
+signtool sign /debug /sm /d "Snowflake CLI" /t http://timestamp.digicert.com /a dist\snow\snow.exe || goto :error
+signtool verify /v /pa dist\snow\snow.exe || goto :error
+
+heat.exe dir dist\snow\_internal ^
+   -gg ^
+   -cg SnowflakeCLIInternalFiles ^
+   -dr TESTFILEPRODUCTDIR ^
+   -var var.SnowflakeCLIInternalFiles ^
+   -sfrag ^
+   -o _internal.wxs || goto :error
+
+candle.exe ^
+  -arch x64 ^
+  -dSnowflakeCLIVersion=%CLI_VERSION% ^
+  -dSnowflakeCLIInternalFiles=dist\\snow\\_internal ^
+  scripts\packaging\win\snowflake_cli.wxs ^
+  scripts\packaging\win\snowflake_cli_exitdlg.wxs ^
+  _internal.wxs || goto :error
+
+light.exe ^
+  -ext WixUIExtension ^
+  -ext WixUtilExtension ^
+  -cultures:en-us ^
+  -loc scripts\packaging\win\snowflake_cli_en-us.wxl ^
+  -out %CLI_MSI% ^
+  snowflake_cli.wixobj ^
+  snowflake_cli_exitdlg.wixobj ^
+  _internal.wixobj || goto :error
+
+signtool sign /debug /sm /d "Snowflake CLI" /t http://timestamp.digicert.com /a %CLI_MSI% || goto :error
+signtool verify /v /pa %CLI_MSI% || goto :error
+
+echo "[INFO] uploading artifacts"
+cmd /c aws s3 cp %CLI_MSI% %RELEASE_URL%/%CLI_MSI% || goto :error
+
+REM FINISH SCRIPT EXECUTION HERE
+GOTO :EOF
+
+:error
+echo Failed with error code #%errorlevel%.
+exit /b %errorlevel%

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/scripts/packaging/win/build_version.py

@@ -17,7 +17,7 @@ def parse_version_for_windows_build() -> list[str]:
         case last if "dev" in last:
             version = msv + last.split("dev")
 
-    return version
+    return [segment for segment in version if segment]
 
 
 if __name__ == "__main__":

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/src/snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "3.0.1"
+VERSION = "3.0.2"

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/src/snowflake/cli/_plugins/snowpark/commands.py

@@ -345,8 +345,6 @@ def build(
                 skip_version_check=skip_version_check,
                 pip_index_url=index_url,
             )
-            if not download_result.succeeded:
-                raise ClickException(download_result.error_message)
 
             log.info("Checking to see if packages have shared (.so/.dll) libraries...")
             if package_utils.detect_and_log_shared_libraries(

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/src/snowflake/cli/_plugins/snowpark/package/commands.py

@@ -147,8 +147,6 @@ def package_create(
             skip_version_check=skip_version_check,
             pip_index_url=index_url,
         )
-        if not download_result.succeeded:
-            raise ClickException(download_result.error_message)
 
         # check if package was detected as available
         package_available_in_conda = any(

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/src/snowflake/cli/_plugins/snowpark/package_utils.py

@@ -21,7 +21,6 @@ import os
 import re
 import subprocess
 from pathlib import Path
-from textwrap import dedent
 from typing import Dict, List, Optional
 
 from click import ClickException
@@ -97,6 +96,7 @@ def get_package_name_from_pip_wheel(package: str, index_url: str | None = None)
             download_dir=tmp_dir.path,
             index_url=index_url,
             dependencies=False,
+            raise_on_error=False,
         )
         file_list = [
             f.path.name for f in tmp_dir.iterdir() if f.path.name.endswith(".whl")
@@ -117,7 +117,6 @@ def _write_requirements_file(file_path: SecurePath, requirements: List[Requireme
 
 @dataclasses.dataclass
 class DownloadUnavailablePackagesResult:
-    succeeded: bool
     error_message: str | None = None
     anaconda_packages: List[Requirement] = dataclasses.field(default_factory=list)
     downloaded_packages_details: List[RequirementWithFiles] = dataclasses.field(
@@ -151,8 +150,7 @@ def download_unavailable_packages(
     if not requirements:
         # all packages are available in Snowflake
         return DownloadUnavailablePackagesResult(
-            succeeded=True,
-            anaconda_packages=packages_in_snowflake,
+            anaconda_packages=packages_in_snowflake
         )
 
     # download all packages with their dependencies
@@ -160,19 +158,14 @@ def download_unavailable_packages(
         # This is a Windows workaround where use TemporaryDirectory instead of NamedTemporaryFile
         requirements_file = downloads_dir / "requirements.txt"
         _write_requirements_file(requirements_file, requirements)  # type: ignore
-        pip_wheel_result = pip_wheel(
+        pip_wheel(
             package_name=None,
             requirements_file=requirements_file.path,  # type: ignore
             download_dir=downloads_dir.path,
             index_url=pip_index_url,
             dependencies=True,
+            raise_on_error=True,
         )
-        if pip_wheel_result != 0:
-            log.info(_pip_failed_log_msg(pip_wheel_result))
-            return DownloadUnavailablePackagesResult(
-                succeeded=False,
-                error_message=_pip_failed_log_msg(pip_wheel_result),
-            )
 
         # scan all downloaded packages and filter out ones available on Anaconda
         dependencies = split_downloaded_dependencies(
@@ -196,7 +189,6 @@ def download_unavailable_packages(
         for package in dependencies.unavailable_dependencies_wheels:
             package.extract_files(target_dir.path)
         return DownloadUnavailablePackagesResult(
-            succeeded=True,
             anaconda_packages=packages_in_snowflake,
             downloaded_packages_details=[
                 RequirementWithFiles(requirement=dep.requirement, files=dep.namelist())
@@ -211,7 +203,8 @@ def pip_wheel(
     download_dir: Path,
     index_url: Optional[str],
     dependencies: bool = True,
-):
+    raise_on_error: bool = True,
+) -> int:
     command = ["-m", "pip", "wheel", "-w", str(download_dir)]
     if package_name:
         command.append(package_name)
@@ -222,23 +215,30 @@ def pip_wheel(
     if not dependencies:
         command.append("--no-deps")
 
-    try:
+    log.info(
+        "Running pip wheel with command: %s",
+        " ".join([str(com) for com in command]),
+    )
+    result = subprocess.run(
+        ["python", *command],
+        capture_output=True,
+        text=True,
+        encoding=locale.getpreferredencoding(),
+    )
+    if result.returncode != 0:
         log.info(
-            "Running pip wheel with command: %s",
-            " ".join([str(com) for com in command]),
-        )
-        process = subprocess.run(
-            ["python", *command],
-            capture_output=True,
-            text=True,
-            encoding=locale.getpreferredencoding(),
+            "pip wheel finished with error code %d. Details: %s",
+            result.returncode,
+            result.stdout + result.stderr,
         )
-    except subprocess.CalledProcessError as e:
-        log.error("Encountered error %s", e.stderr)
-        raise ClickException(f"Encountered error while running pip wheel.")
+        if raise_on_error:
+            raise ClickException(
+                f"pip wheel finished with error code {result.returncode}. Please re-run with --verbose or --debug for more details."
+            )
+    else:
+        log.info("pip wheel command executed successfully")
 
-    log.info("Pip wheel command executed successfully")
-    return process.returncode
+    return result.returncode
 
 
 @dataclasses.dataclass
@@ -341,14 +341,3 @@ def _log_dependencies_found_in_conda(available_dependencies: List[Requirement])
         )
     else:
         log.info("None of the package dependencies were found on Anaconda")
-
-
-def _pip_failed_log_msg(return_code: int) -> str:
-    return dedent(
-        f"""
-        pip failed with return code {return_code}. Most likely reasons:
-         * incorrect package name or version
-         * package isn't compatible with host architecture (most probably due to .so libraries)
-         * pip is not installed correctly
-        """
-    )

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/src/snowflake/cli/_plugins/snowpark/snowpark_entity_model.py

@@ -147,8 +147,11 @@ class UdfSprocIdentifier:
             self._arg_names, self._arg_types, self._arg_defaults
         ):
             s = f"{name} {_type}"
-            if _default:
-                if self._is_signature_type_a_string(_type):
+            if _default is not None:
+                if (
+                    self._is_signature_type_a_string(_type)
+                    and _default.lower() != "null"
+                ):
                     _default = f"'{_default}'"
                 s += f" default {_default}"
             sig.append(s)

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/tests/snowpark/test_build.py

@@ -23,7 +23,7 @@ from snowflake.cli._plugins.snowpark.package_utils import (
 def test_snowpark_build_no_deprecated_warnings_by_default(
     mock_download, runner, project_directory
 ):
-    mock_download.return_value = DownloadUnavailablePackagesResult(succeeded=True)
+    mock_download.return_value = DownloadUnavailablePackagesResult()
     with project_directory("snowpark_functions"):
         result = runner.invoke(["snowpark", "build", "--ignore-anaconda"])
         assert result.exit_code == 0, result.output

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/tests/snowpark/test_function.py

@@ -391,6 +391,66 @@ def test_deploy_function_fully_qualified_name(
         assert result.output == os_agnostic_snapshot(name="ok")
 
 
+@pytest.mark.parametrize(
+    "parameter_type,default_value",
+    [
+        ("string", None),
+        ("string", ""),
+        ("int", None),
+        ("variant", None),
+        ("bool", None),
+    ],
+)
+@mock.patch("snowflake.connector.connect")
+@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager")
+@mock_session_has_warehouse
+def test_deploy_function_with_empty_default_value(
+    mock_object_manager,
+    mock_connector,
+    mock_ctx,
+    runner,
+    project_directory,
+    alter_snowflake_yml,
+    parameter_type,
+    default_value,
+):
+    mock_object_manager.return_value.describe.side_effect = ProgrammingError(
+        errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED
+    )
+    ctx = mock_ctx()
+    mock_connector.return_value = ctx
+    with project_directory("snowpark_functions") as project_dir:
+        snowflake_yml = project_dir / "snowflake.yml"
+        for param, value in [("type", parameter_type), ("default", default_value)]:
+            alter_snowflake_yml(
+                snowflake_yml,
+                parameter_path=f"snowpark.functions.0.signature.0.{param}",
+                value=value,
+            )
+        alter_snowflake_yml(
+            snowflake_yml,
+            parameter_path=f"snowpark.functions.0.runtime",
+            value="3.10",
+        )
+        result = runner.invoke(
+            ["snowpark", "deploy", "--format", "json"], catch_exceptions=False
+        )
+    default_value_json = default_value
+    if default_value is None:
+        default_value_json = "null"
+    elif parameter_type == "string":
+        default_value_json = f"'{default_value}'"
+
+    assert result.exit_code == 0, result.output
+    assert json.loads(result.output) == [
+        {
+            "object": f"MockDatabase.MockSchema.func1(a {parameter_type} default {default_value_json}, b variant)",
+            "status": "created",
+            "type": "function",
+        }
+    ]
+
+
 @mock.patch("snowflake.connector.connect")
 def test_execute_function(mock_connector, runner, mock_ctx):
     ctx = mock_ctx()
@@ -419,11 +479,14 @@ def _deploy_function(
 ):
     ctx = mock_ctx(mock_cursor(rows=rows, columns=[]))
     mock_connector.return_value = ctx
-    with mock.patch(
-        "snowflake.cli._plugins.snowpark.commands.ObjectManager.describe"
-    ) as om_describe, mock.patch(
-        "snowflake.cli._plugins.snowpark.commands.ObjectManager.show"
-    ) as om_show:
+    with (
+        mock.patch(
+            "snowflake.cli._plugins.snowpark.commands.ObjectManager.describe"
+        ) as om_describe,
+        mock.patch(
+            "snowflake.cli._plugins.snowpark.commands.ObjectManager.show"
+        ) as om_show,
+    ):
         om_describe.return_value = rows
 
         with project_directory("snowpark_functions") as temp_dir:

{snowflake_cli-3.0.1 → snowflake_cli-3.0.2}/tests/snowpark/test_package.py

@@ -72,7 +72,6 @@ class TestPackage:
         mock_pip_wheel.return_value = 9
 
         mock_download.return_value = DownloadUnavailablePackagesResult(
-            succeeded=True,
             anaconda_packages=[Requirement.parse("in-anaconda-package>=2")],
         )