snowflake-cli 3.6.0__tar.gz → 3.7.0__tar.gz

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: snowflake-cli
-Version: 3.6.0
+Version: 3.7.0
 Summary: Snowflake CLI
 Project-URL: Source code, https://github.com/snowflakedb/snowflake-cli
 Project-URL: Bug Tracker, https://github.com/snowflakedb/snowflake-cli/issues
@@ -222,27 +222,27 @@ Requires-Dist: jinja2==3.1.6
 Requires-Dist: packaging
 Requires-Dist: pip
 Requires-Dist: pluggy==1.5.0
-Requires-Dist: pydantic==2.10.6
+Requires-Dist: pydantic==2.11.2
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: requirements-parser==0.11.0
-Requires-Dist: rich==13.9.4
-Requires-Dist: setuptools==76.0.0
+Requires-Dist: rich==14.0.0
+Requires-Dist: setuptools==78.1.0
 Requires-Dist: snowflake-connector-python[secure-local-storage]==3.14.0
-Requires-Dist: snowflake-core==1.0.2; python_version < '3.12'
+Requires-Dist: snowflake-core==1.2.0; python_version < '3.12'
 Requires-Dist: snowflake-snowpark-python<1.26.0,>=1.15.0; python_version < '3.12'
 Requires-Dist: tomlkit==0.13.2
 Requires-Dist: typer==0.15.2
 Requires-Dist: urllib3<2.4,>=1.24.3
 Provides-Extra: development
-Requires-Dist: coverage==7.6.12; extra == 'development'
+Requires-Dist: coverage==7.8.0; extra == 'development'
 Requires-Dist: factory-boy==3.3.3; extra == 'development'
-Requires-Dist: faker==37.0.0; extra == 'development'
+Requires-Dist: faker==37.1.0; extra == 'development'
 Requires-Dist: pre-commit>=3.5.0; extra == 'development'
 Requires-Dist: pytest-httpserver==1.1.2; extra == 'development'
 Requires-Dist: pytest-randomly==3.16.0; extra == 'development'
 Requires-Dist: pytest==8.3.5; extra == 'development'
-Requires-Dist: syrupy==4.9.0; extra == 'development'
+Requires-Dist: syrupy==4.9.1; extra == 'development'
 Provides-Extra: packaging
 Description-Content-Type: text/markdown
 

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/RELEASE-NOTES.md

@@ -23,6 +23,20 @@
 ## Fixes and improvements
 
 
+# v3.7.0
+
+## Deprecations
+
+## New additions
+* Added `--prune` flag to `deploy` commands, which removes files that exist in the stage,
+  but not in the local filesystem.
+* Added `snow logs` command for retrieving and streaming logs from the server.
+* Added `snow helper check-snowsql-env-vars` which reports environment variables from SnowSQL with replacements in CLI.
+
+## Fixes and improvements
+* Updated MacOS postinstall script to update PATH if snow not exist.
+
+
 # v3.6.0
 
 ## Deprecations

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/pyproject.toml

@@ -30,15 +30,15 @@ dependencies = [
   "packaging",
   "pip",
   "pluggy==1.5.0",
-  "pydantic==2.10.6",
+  "pydantic==2.11.2",
   "PyYAML==6.0.2",
   "requests==2.32.3",
   "requirements-parser==0.11.0",
-  "rich==13.9.4",
-  "setuptools==76.0.0",
+  "rich==14.0.0",
+  "setuptools==78.1.0",
   "snowflake-connector-python[secure-local-storage]==3.14.0",
   'snowflake-snowpark-python>=1.15.0,<1.26.0;python_version < "3.12"',
-  'snowflake.core==1.0.2; python_version < "3.12"',
+  'snowflake.core==1.2.0; python_version < "3.12"',
   "tomlkit==0.13.2",
   "typer==0.15.2",
   "urllib3>=1.24.3,<2.4",
@@ -57,14 +57,14 @@ classifiers = [
 
 [project.optional-dependencies]
 development = [
-  "coverage==7.6.12",
+  "coverage==7.8.0",
   "pre-commit>=3.5.0",
   "pytest==8.3.5",
   "pytest-randomly==3.16.0",
   "pytest-httpserver==1.1.2",
-  "syrupy==4.9.0",
+  "syrupy==4.9.1",
   "factory-boy==3.3.3",
-  "Faker==37.0.0",
+  "Faker==37.1.0",
 ]
 packaging = []
 
@@ -108,7 +108,6 @@ features = ["development", "packaging"]
 build-isolated-binary = ["python scripts/packaging/build_isolated_binary_with_hatch.py"]
 build-binaries = ["./scripts/packaging/build_binaries.sh"]
 build-packages = ["./scripts/packaging/build_packages.sh"]
-package-darwin-binaries = ["./scripts/packaging/build_darwin_package.sh"]
 build-all = [
   "./scripts/packaging/build_binaries.sh",
   "./scripts/packaging/build_packages.sh",

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/scripts/cleanup.py

@@ -45,7 +45,10 @@ def remove_resources(single: str, plural: str, known_instances: t.List[str], rol
     items = session.sql(f"show {plural}").collect()
 
     for item in items:
-        if item.name not in known_instances:
+        # services don't have an owner
+        if item.name not in known_instances and (
+            plural == "services" or item.owner == "INTEGRATION_TESTS"
+        ):
             remove_resource(resource_type=single, item=item, role=role)
 
 
@@ -80,6 +83,15 @@ if __name__ == "__main__":
         ("application", "applications"): [],
         ("warehouse", "warehouses"): ["XSMALL"],
         ("image repository", "image repositories"): ["SNOWCLI_REPOSITORY"],
+        ("role", "roles"): [
+            "ACCOUNTADMIN",
+            "PUBLIC",
+            "SECURITYADMIN",
+            "SYSADMIN",
+            "USERADMIN",
+            "INTEGRATION_TESTS",
+            "APP_PUBLIC",
+        ],
     }
 
     for (single, plural), known in known_objects.items():

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/scripts/packaging/build_darwin_package.sh

@@ -1,19 +1,44 @@
 #!/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}"
 
+echo "--- creating virtualenv ---"
+python3.11 -m venv venv
+. venv/bin/activate
+python --version
+
+echo "--- installing dependencies ---"
+pip install hatch
+
+# install cargo
+if [[ ${MACHINE} == "arm64" ]]; then
+  echo "installing cargo on arm64"
+  curl https://sh.rustup.rs -sSf | bash -s -- -y
+elif [[ ${MACHINE} == "x86_64" ]]; then
+  echo "installing cargo on x86_64"
+  curl https://sh.rustup.rs -sSf | bash -s -- -y --no-modify-path
+  source $HOME/.cargo/env
+else
+  echo "Unsupported machine: ${MACHINE}"
+  exit 1
+fi
+rustup default stable
+
+
+echo "--- setup variables ---"
+BRANCH=${branch}
+REVISION=$(git rev-parse ${svnRevision})
 CLI_VERSION=$(hatch version)
 
+STAGE_URL="s3://sfc-eng-jenkins/repository/snowflake-cli/${releaseType}/${SYSTEM}_${MACHINE}/${REVISION}/"
+
+ROOT_DIR=$(git rev-parse --show-toplevel)
+PACKAGING_DIR=$ROOT_DIR/scripts/packaging
 DIST_DIR=$ROOT_DIR/dist
+
 BINARY_NAME="snow-${CLI_VERSION}"
 APP_NAME="SnowflakeCLI.app"
 APP_DIR=$DIST_DIR/app
@@ -21,6 +46,7 @@ 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
 }
@@ -29,26 +55,6 @@ clean_build_workspace() {
   rm -rf $DIST_DIR || true
 }
 
-install_cargo() {
-  curl https://sh.rustup.rs -sSf > rustup-init.sh
-
-  if [[ ${MACHINE} == "arm64" ]]; then
-    sudo bash rustup-init.sh -y
-    . $HOME/.cargo/env
-  elif [[ ${MACHINE} == "x86_64" ]]; then
-    export CARGO_HOME="$HOME/.cargo"
-    export RUSTUP_HOME="$HOME/.rustup"
-    bash -s rustup-init.sh -y
-    . $HOME/.cargo/env
-    rustup default stable
-  else
-    echo "Unsupported machine: ${MACHINE}"
-    exit 1
-  fi
-
-  rm rustup-init.sh
-}
-
 create_app_template() {
   rm -r ${APP_DIR}/${APP_NAME} || true
   mkdir -p ${APP_DIR}/${APP_NAME}/Contents/MacOS
@@ -61,9 +67,9 @@ loginfo "---------------------------------"
 security find-identity -v -p codesigning
 loginfo "---------------------------------"
 
-clean_build_workspace
-install_cargo
+echo "--- build binary ---"
 
+clean_build_workspace
 hatch -e packaging run build-isolated-binary
 create_app_template
 mv $DIST_DIR/binary/${BINARY_NAME} ${APP_DIR}/${APP_NAME}/Contents/MacOS/snow
@@ -118,7 +124,6 @@ prepare_postinstall_script() {
 prepare_postinstall_script
 
 ls -l $DIST_DIR
-tree -d $DIST_DIR
 
 chmod +x $APP_SCRIPTS/postinstall
 
@@ -209,3 +214,9 @@ validate_installation() {
 }
 
 validate_installation $DIST_DIR/snowflake-cli-${CLI_VERSION}-${SYSTEM}-${MACHINE}.pkg
+
+echo "--- Upload artifacts to AWS ---"
+ls -la ./dist/
+echo "${STAGE_URL}"
+command -v aws
+aws s3 cp ./dist/ ${STAGE_URL} --recursive --exclude "*" --include="snowflake-cli-${CLI_VERSION}*.pkg"

snowflake_cli-3.7.0/scripts/packaging/macos/postinstall

@@ -0,0 +1,39 @@
+#!/bin/bash -e
+#
+# $2 is the install location
+#
+SNOWFLAKE_CLI_COMMENT="# added by Snowflake SnowflakeCLI installer v1.0"
+RC_FILES=(~/.zprofile ~/.zshrc ~/.profile ~/.bash_profile ~/.bashrc)
+
+function add_dest_path_to_profile() {
+  local dest=$1
+  local profile=$2
+  echo "Updating $profile to have $dest in PATH"
+  touch $profile
+  cp -p $profile "$profile-snowflake.bak" || true
+  echo "
+$SNOWFLAKE_CLI_COMMENT
+export PATH=$dest:\$PATH" >>$profile
+}
+
+echo "[DEBUG] Parameters: $1 $2"
+SNOWFLAKE_CLI_DEST=$2/SnowflakeCLI.app/Contents/MacOS/
+
+# List of potential login shell RC files
+
+# Check if the path is already in the PATH variable
+if [[ ":$PATH:" == *":$SNOWFLAKE_CLI_DEST:"* ]]; then
+  echo "[INFO] Path $SNOWFLAKE_CLI_DEST is already in PATH. No changes needed."
+else
+  for rc_file in "${RC_FILES[@]}"; do
+    # Expand tilde (~) to the user's home directory
+    rc_file_expanded=$(eval echo "$rc_file")
+
+    if [[ -e "$rc_file_expanded" ]]; then
+      # Add the PATH update to the file
+      add_dest_path_to_profile "$SNOWFLAKE_CLI_DEST" "$rc_file_expanded"
+    else
+      echo "[INFO] $rc_file_expanded does not exist, skipping..."
+    fi
+  done
+fi

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/snyk/requirements.txt

@@ -3,23 +3,23 @@ jinja2==3.1.6
 packaging
 pip
 pluggy==1.5.0
-pydantic==2.10.6
+pydantic==2.11.2
 PyYAML==6.0.2
 requests==2.32.3
 requirements-parser==0.11.0
-rich==13.9.4
-setuptools==76.0.0
+rich==14.0.0
+setuptools==78.1.0
 snowflake-connector-python[secure-local-storage]==3.14.0
 snowflake-snowpark-python>=1.15.0,<1.26.0;python_version < "3.12"
-snowflake.core==1.0.2; python_version < "3.12"
+snowflake.core==1.2.0; python_version < "3.12"
 tomlkit==0.13.2
 typer==0.15.2
 urllib3>=1.24.3,<2.4
-coverage==7.6.12
+coverage==7.8.0
 pre-commit>=3.5.0
 pytest==8.3.5
 pytest-randomly==3.16.0
 pytest-httpserver==1.1.2
-syrupy==4.9.0
+syrupy==4.9.1
 factory-boy==3.3.3
-Faker==37.0.0
+Faker==37.1.0

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/src/snowflake/cli/__about__.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 
 from enum import Enum, unique
 
-VERSION = "3.6.0"
+VERSION = "3.7.0"
 
 
 @unique

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/src/snowflake/cli/_app/commands_registration/builtin_plugins.py

@@ -18,6 +18,7 @@ from snowflake.cli._plugins.cortex import plugin_spec as cortex_plugin_spec
 from snowflake.cli._plugins.git import plugin_spec as git_plugin_spec
 from snowflake.cli._plugins.helpers import plugin_spec as migrate_plugin_spec
 from snowflake.cli._plugins.init import plugin_spec as init_plugin_spec
+from snowflake.cli._plugins.logs import plugin_spec as logs_plugin_spec
 from snowflake.cli._plugins.nativeapp import plugin_spec as nativeapp_plugin_spec
 from snowflake.cli._plugins.notebook import plugin_spec as notebook_plugin_spec
 from snowflake.cli._plugins.object import plugin_spec as object_plugin_spec
@@ -51,6 +52,7 @@ def get_builtin_plugin_name_to_plugin_spec():
         "init": init_plugin_spec,
         "workspace": workspace_plugin_spec,
         "plugin": plugin_plugin_spec,
+        "logs": logs_plugin_spec,
     }
 
     return plugin_specs

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/src/snowflake/cli/_app/loggers.py

@@ -20,7 +20,7 @@ from dataclasses import asdict, dataclass, field
 from typing import Any, Dict, List
 
 import typer
-from snowflake.cli.api.exceptions import InvalidLogsConfiguration
+from snowflake.cli.api.exceptions import InvalidLogsConfigurationError
 from snowflake.cli.api.secure_path import SecurePath
 from snowflake.connector.errors import ConfigSourceError
 
@@ -129,7 +129,7 @@ class FileLogsConfig:
             logging.CRITICAL,
         ]
         if self.level not in possible_log_levels:
-            raise InvalidLogsConfiguration(
+            raise InvalidLogsConfigurationError(
                 f"Invalid 'level' value set in [logs] section: {config['level']}. "
                 f"'level' should be one of: {' / '.join(logging.getLevelName(lvl) for lvl in possible_log_levels)}"
             )

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/src/snowflake/cli/_app/snow_connector.py

@@ -33,7 +33,7 @@ from snowflake.cli.api.config import (
 )
 from snowflake.cli.api.constants import DEFAULT_SIZE_LIMIT_MB
 from snowflake.cli.api.exceptions import (
-    InvalidConnectionConfiguration,
+    InvalidConnectionConfigurationError,
     SnowflakeConnectionError,
 )
 from snowflake.cli.api.feature_flags import FeatureFlag
@@ -169,7 +169,7 @@ def connect_to_snowflake(
     except ForbiddenError as err:
         raise SnowflakeConnectionError(err)
     except DatabaseError as err:
-        raise InvalidConnectionConfiguration(err.msg)
+        raise InvalidConnectionConfigurationError(err.msg)
 
 
 def _avoid_closing_the_connection_if_it_was_shared(

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/src/snowflake/cli/_plugins/connection/commands.py

@@ -66,6 +66,7 @@ from snowflake.cli.api.config import (
 )
 from snowflake.cli.api.console import cli_console
 from snowflake.cli.api.constants import ObjectType
+from snowflake.cli.api.feature_flags import FeatureFlag
 from snowflake.cli.api.output.types import (
     CollectionResult,
     CommandResult,
@@ -289,7 +290,7 @@ def add(
     if connection_exists(connection_name):
         raise UsageError(f"Connection {connection_name} already exists")
 
-    if not no_interactive:
+    if FeatureFlag.ENABLE_AUTH_KEYPAIR.is_enabled() and not no_interactive:
         connection_options, keypair_error = _extend_add_with_key_pair(
             connection_name, connection_options
         )

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/src/snowflake/cli/_plugins/helpers/commands.py

@@ -15,12 +15,14 @@
 from __future__ import annotations
 
 import logging
+import os
 from pathlib import Path
 from typing import Any, List, Optional
 
 import typer
 import yaml
 from click import ClickException
+from snowflake.cli._plugins.helpers.snowsl_vars_reader import check_env_vars
 from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
 from snowflake.cli.api.config import (
     ConnectionConfig,
@@ -29,7 +31,12 @@ from snowflake.cli.api.config import (
     set_config_value,
 )
 from snowflake.cli.api.console import cli_console
-from snowflake.cli.api.output.types import CommandResult, MessageResult
+from snowflake.cli.api.output.types import (
+    CollectionResult,
+    CommandResult,
+    MessageResult,
+    MultipleResults,
+)
 from snowflake.cli.api.project.definition_conversion import (
     convert_project_definition_to_v2,
 )
@@ -293,3 +300,20 @@ def _validate_and_save_connections_imported_from_snowsql(
             path=["default_connection_name"],
             value=default_cli_connection_name,
         )
+
+
+@app.command(name="check-snowsql-env-vars", requires_connection=False)
+def check_snowsql_env_vars(**options):
+    """Check if there are any SnowSQL environment variables set."""
+
+    env_vars = os.environ.copy()
+    discovered, unused, summary = check_env_vars(env_vars)
+
+    results = []
+    if discovered:
+        results.append(CollectionResult(discovered))
+    if unused:
+        results.append(CollectionResult(unused))
+
+    results.append(MessageResult(summary))
+    return MultipleResults(results)

snowflake_cli-3.7.0/src/snowflake/cli/_plugins/helpers/snowsl_vars_reader.py

@@ -0,0 +1,133 @@
+from __future__ import annotations
+
+EnvVars = dict[str, str]
+
+DicoveredVars = list[dict[str, str]]
+UnusedVars = list[dict[str, str]]
+Summary = str
+
+CheckResult = tuple[DicoveredVars, UnusedVars, Summary]
+
+KNOWN_SNOWSQL_ENV_VARS = {
+    "SNOWSQL_ACCOUNT": {
+        "Found": "SNOWSQL_ACCOUNT",
+        "Suggested": "SNOWFLAKE_ACCOUNT",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_PWD": {
+        "Found": "SNOWSQL_PASSWORD",
+        "Suggested": "SNOWFLAKE_PASSWORD",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_USER": {
+        "Found": "SNOWSQL_USER",
+        "Suggested": "SNOWFLAKE_USER",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_REGION": {
+        "Found": "SNOWSQL_REGION",
+        "Suggested": "SNOWFLAKE_REGION",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_ROLE": {
+        "Found": "SNOWSQL_ROLE",
+        "Suggested": "SNOWFLAKE_ROLE",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_WAREHOUSE": {
+        "Found": "SNOWSQL_WAREHOUSE",
+        "Suggested": "SNOWFLAKE_WAREHOUSE",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_DATABASE": {
+        "Found": "SNOWSQL_DATABASE",
+        "Suggested": "SNOWFLAKE_DATABASE",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_SCHEMA": {
+        "found": "SNOWSQL_SCHEMA",
+        "Suggested": "SNOWFLAKE_SCHEMA",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_HOST": {
+        "Found": "SNOWSQL_HOST",
+        "Suggested": "SNOWFLAKE_HOST",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_PORT": {
+        "Found": "SNOWSQL_PORT",
+        "Suggested": "SNOWFLAKE_PORT",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_PROTOCOL": {
+        "Found": "SNOWSQL_PROTOCOL",
+        "Suggested": "SNOWFLAKE_PROTOCOL",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections#use-environment-variables-for-snowflake-credentials",
+    },
+    "SNOWSQL_PROXY_HOST": {
+        "Found": "SNOWSQL_PROXY_HOST",
+        "Suggested": "PROXY_HOST",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-cli#use-a-proxy-server",
+    },
+    "SNOWSQL_PROXY_PORT": {
+        "Found": "SNOWSQL_PROXY_HOST",
+        "Suggested": "PROXY_HOST",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-cli#use-a-proxy-server",
+    },
+    "SNOWSQL_PROXY_USER": {
+        "Found": "SNOWSQL_PROXY_PORT",
+        "Suggested": "PROXY_PORT",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-cli#use-a-proxy-server",
+    },
+    "SNOWSQL_PROXY_PWD": {
+        "Found": "SNOWSQL_PROXY_PWD",
+        "Suggested": "PROXY_PWD",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-cli#use-a-proxy-server",
+    },
+    "SNOWSQL_PRIVATE_KEY_PASSPHRASE": {
+        "Found": "SNOWSQL_PRIVATE_KEY_PASSPHRASE",
+        "Suggested": "PRIVATE_KEY_PASSPHRASE",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/connecting/configure-connections",
+    },
+    "EXIT_ON_ERROR": {
+        "Found": "EXIT_ON_ERROR",
+        "Suggested": "SNOWFLAKE_ENHANCED_EXIT_CODES",
+        "Additional info": "https://docs.snowflake.com/en/developer-guide/snowflake-cli/sql/execute-sql",
+    },
+}
+
+
+def check_env_vars(variables: EnvVars) -> CheckResult:
+    """Checks passed dict objects for possible SnowSQL variables.
+
+    Returns tuple of
+    - sequence of variables that can be adjusted
+    - sequence of variables that have no corresponding variables
+    - a summary messages
+    """
+    discovered: DicoveredVars = []
+    unused: UnusedVars = []
+
+    prefix_matched = (e for e in variables if e.lower().startswith("snowsql"))
+
+    for var in prefix_matched:
+        if suggestion := KNOWN_SNOWSQL_ENV_VARS.get(var, None):
+            discovered.append(suggestion)
+        else:
+            unused.append(
+                {
+                    "Found": var,
+                    "Suggested": "n/a",
+                    "Additional info": "Unused variable",
+                }
+            )
+
+    discovered_cnt = len(discovered)
+    unused_cnt = len(unused)
+
+    summary: Summary = (
+        f"Found {discovered_cnt + unused_cnt} SnowSQL environment variables,"
+        f" {discovered_cnt} with replacements, {unused_cnt} unused."
+    )
+
+    return discovered, unused, summary

{snowflake_cli-3.6.0 → snowflake_cli-3.7.0}/src/snowflake/cli/_plugins/init/commands.py

@@ -28,7 +28,7 @@ from snowflake.cli.api.commands.flags import (
 from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
 from snowflake.cli.api.commands.utils import parse_key_value_variables
 from snowflake.cli.api.constants import DEFAULT_SIZE_LIMIT_MB
-from snowflake.cli.api.exceptions import InvalidTemplate
+from snowflake.cli.api.exceptions import InvalidTemplateError
 from snowflake.cli.api.output.types import (
     CommandResult,
     MessageResult,
@@ -138,7 +138,7 @@ def _read_template_metadata(template_root: SecurePath, args_error_msg: str) -> T
     template_metadata_path = template_root / TEMPLATE_METADATA_FILE_NAME
     log.debug("Reading template metadata from %s", template_metadata_path.path)
     if not template_metadata_path.exists():
-        raise InvalidTemplate(
+        raise InvalidTemplateError(
             f"File {TEMPLATE_METADATA_FILE_NAME} not found. {args_error_msg}"
         )
     with template_metadata_path.open(read_file_limit_mb=DEFAULT_SIZE_LIMIT_MB) as fd:
@@ -201,8 +201,9 @@ def init(
     variables_from_flags = {
         v.key: v.value for v in parse_key_value_variables(variables)
     }
-    is_remote = any(
-        template_source.startswith(prefix) for prefix in ["git@", "http://", "https://"]  # type: ignore
+    is_remote = template_source is not None and any(
+        template_source.startswith(prefix)
+        for prefix in ["git@", "http://", "https://"]  # type: ignore
     )
     args_error_msg = f"Check whether {TemplateOption.param_decls[0]} and {SourceOption.param_decls[0]} arguments are correct."
 
@@ -210,11 +211,13 @@ def init(
     with SecurePath.temporary_directory() as tmpdir:
         if is_remote:
             template_root = _fetch_remote_template(
-                url=template_source, path=template, destination=tmpdir  # type: ignore
+                url=template_source,  # type: ignore
+                path=template,
+                destination=tmpdir,  # type: ignore
             )
         else:
             template_root = _fetch_local_template(
-                template_source=SecurePath(template_source),
+                template_source=SecurePath(template_source),  # type: ignore
                 path=template,
                 destination=tmpdir,
             )