snowflake-cli 3.9.0__tar.gz → 3.10.0__tar.gz

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/.pre-commit-config.yaml

@@ -63,6 +63,11 @@ repos:
         pass_filenames: true
         files: ^src/.*\.py$
         exclude: ^src/snowflake/cli/_app/constants.py$
+      - id: lock-subdependencies
+        name: "Generate project.dependencies from cli.dependencies in pyproject.toml"
+        language: system
+        entry: python scripts/lock_subdependencies.py
+        files: ^pyproject.toml$
       - id: dependencies-sync
         name: "Copy dependencies from pyproject.toml to requirements.txt"
         language: system

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/CONTRIBUTING.md

@@ -110,7 +110,7 @@ Note: Before running the script, set up your environment variables.
 To build and push all required Docker images, run the following script:
 
 ```bash
-./tests_integration/spcs/docker/build_and_push_all.sh
+./tests_integration/tests_using_container_services/spcs/docker/build_and_push_all.sh
 ```
 
 ## Remote debugging with PyCharm or IntelliJ

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: snowflake-cli
-Version: 3.9.0
+Version: 3.10.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
@@ -217,33 +217,66 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: SQL
 Classifier: Topic :: Database
 Requires-Python: >=3.10
+Requires-Dist: annotated-types==0.7.0
+Requires-Dist: asn1crypto==1.5.1
+Requires-Dist: boto3==1.39.2
+Requires-Dist: botocore==1.39.2
+Requires-Dist: certifi==2025.6.15
+Requires-Dist: cffi==1.17.1
+Requires-Dist: cfgv==3.4.0
+Requires-Dist: charset-normalizer==3.4.2
 Requires-Dist: click==8.1.8
+Requires-Dist: cryptography==45.0.5
+Requires-Dist: faker==37.4.0
+Requires-Dist: filelock==3.18.0
+Requires-Dist: gitdb==4.0.12
 Requires-Dist: gitpython==3.1.44
+Requires-Dist: identify==2.6.12
+Requires-Dist: idna==3.10
+Requires-Dist: iniconfig==2.1.0
 Requires-Dist: jinja2==3.1.6
+Requires-Dist: keyring==25.6.0
+Requires-Dist: markdown-it-py==3.0.0
+Requires-Dist: markupsafe==3.0.2
+Requires-Dist: nodeenv==1.9.1
 Requires-Dist: packaging
 Requires-Dist: pip
+Requires-Dist: platformdirs==4.3.8
 Requires-Dist: pluggy==1.6.0
 Requires-Dist: prompt-toolkit==3.0.51
-Requires-Dist: pydantic==2.11.4
+Requires-Dist: pydantic-core==2.33.2
+Requires-Dist: pydantic==2.11.7
+Requires-Dist: pygments==2.19.2
+Requires-Dist: pyjwt==2.10.1
+Requires-Dist: pyopenssl==25.1.0
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: pytz==2025.2
 Requires-Dist: pyyaml==6.0.2
-Requires-Dist: requests==2.32.3
-Requires-Dist: requirements-parser==0.11.0
+Requires-Dist: requests==2.32.4
+Requires-Dist: requirements-parser==0.13.0
 Requires-Dist: rich==14.0.0
-Requires-Dist: setuptools==80.3.1
+Requires-Dist: setuptools==80.8.0
+Requires-Dist: shellingham==1.5.4
 Requires-Dist: snowflake-connector-python[secure-local-storage]==3.15.0
-Requires-Dist: snowflake-core==1.4.0
-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.5,>=1.24.3
+Requires-Dist: snowflake-core==1.5.1
+Requires-Dist: snowflake-snowpark-python==1.33.0; python_version < '3.12'
+Requires-Dist: sortedcontainers==2.4.0
+Requires-Dist: tomlkit==0.13.3
+Requires-Dist: typer==0.16.0
+Requires-Dist: typing-extensions==4.14.0
+Requires-Dist: typing-inspection==0.4.1
+Requires-Dist: urllib3<2.6,>=1.24.3
+Requires-Dist: virtualenv==20.31.2
+Requires-Dist: wcwidth==0.2.13
+Requires-Dist: werkzeug==3.1.3
 Provides-Extra: development
 Requires-Dist: coverage==7.8.0; extra == 'development'
 Requires-Dist: factory-boy==3.3.3; extra == 'development'
-Requires-Dist: faker==37.3.0; extra == 'development'
+Requires-Dist: faker==37.4.0; extra == 'development'
 Requires-Dist: pre-commit>=3.5.0; extra == 'development'
 Requires-Dist: pytest-httpserver==1.1.3; extra == 'development'
 Requires-Dist: pytest-randomly==3.16.0; extra == 'development'
-Requires-Dist: pytest==8.3.5; extra == 'development'
+Requires-Dist: pytest==8.4.1; extra == 'development'
 Requires-Dist: syrupy==4.9.1; extra == 'development'
 Provides-Extra: packaging
 Description-Content-Type: text/markdown

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/RELEASE-NOTES.md

@@ -23,6 +23,40 @@
 ## Fixes and improvements
 
 
+# v3.10.0
+
+## Deprecations
+* Snowpark processor in Native Apps.
+
+## New additions
+* Add support for passing OAuth token via `--token` flag.
+* Added feature to allow suppressing the new version warning message in the Snowflake CLI, configurable via a configuration file or environment variable.
+* Add support for `--format=CSV`.
+* Add `--enabled-temaplating` flag for `snow sql` command, configuring which template syntax should be used to resolve variables:
+  * standard (`<% ... %>`), enabled by default
+  * legacy (`&{ ... }`), enabled by default
+  * jinja (new) (`{{ ... }}`), disabled by default
+* Added packages alias for artifact_repository_packages in the snowflake.yml schema.
+* Added support for copying files between named stages using `snow stage copy @src_stage @dst_stage` command.
+* DBT commands: `deploy`, `execute` and `list` are now available in preview.
+
+## Fixes and improvements
+* Fixed failing snow sql command when snowflake.yml is invalid and query has no templating.
+* Fix JSON serialization for `Decimal`, `time` and `binary`.
+* Added `--format=JSON_EXT` option to return JSON objects as proper JSON structures rather than strings.
+* Refactored Streamlit app deployment (using `FROM <stage>` syntax); removed deprecated Streamlit features
+
+
+# v3.9.1
+
+## Deprecations
+
+## New additions
+* Added `--private-link` flag to `snow spcs image-registry login` command to login using private link URLs.
+
+## Fixes and improvements
+
+
 # v3.9.0
 
 ## Deprecations

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/pyproject.toml

@@ -16,15 +16,9 @@
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[project]
-name = "snowflake-cli"
-authors = [{ name = "Snowflake Inc." }]
-license = { file = "LICENSE" }
-dynamic = ["version"]
-requires-python = ">=3.10"
-description = "Snowflake CLI"
-readme = "README.md"
+[cli]
 dependencies = [
+  # Actual project dependencies, from which we generate [project.dependencies] section serving as a lockfile for PyPi
   "click==8.1.8",
   "GitPython==3.1.44",
   "PyYAML==6.0.2",
@@ -33,17 +27,83 @@ dependencies = [
   "pip",
   "pluggy==1.6.0",
   "prompt-toolkit==3.0.51",
-  "pydantic==2.11.4",
-  "requests==2.32.3",
-  "requirements-parser==0.11.0",
+  "pydantic==2.11.7",
+  "requests==2.32.4",
+  "requirements-parser==0.13.0",
   "rich==14.0.0",
-  "setuptools==80.3.1",
+  "setuptools==80.8.0",
   "snowflake-connector-python[secure-local-storage]==3.15.0",
-  'snowflake-snowpark-python>=1.15.0,<1.26.0;python_version < "3.12"',
-  "snowflake.core==1.4.0",
-  "tomlkit==0.13.2",
-  "typer==0.15.2",
-  "urllib3>=1.24.3,<2.5",
+  'snowflake-snowpark-python==1.33.0;python_version < "3.12"',
+  "snowflake.core==1.5.1",
+  "tomlkit==0.13.3",
+  "typer==0.16.0",
+  "urllib3>=1.24.3,<2.6",
+]
+
+[project]
+name = "snowflake-cli"
+authors = [{ name = "Snowflake Inc." }]
+license = { file = "LICENSE" }
+dynamic = ["version"]
+requires-python = ">=3.10"
+description = "Snowflake CLI"
+readme = "README.md"
+dependencies = [
+  # v-- section generated from cli.dependencies --v
+  'GitPython==3.1.44',
+  'PyYAML==6.0.2',
+  'annotated-types==0.7.0',
+  'asn1crypto==1.5.1',
+  'boto3==1.39.2',
+  'botocore==1.39.2',
+  'certifi==2025.6.15',
+  'cffi==1.17.1',
+  'cfgv==3.4.0',
+  'charset-normalizer==3.4.2',
+  'click==8.1.8',
+  'cryptography==45.0.5',
+  'faker==37.4.0',
+  'filelock==3.18.0',
+  'gitdb==4.0.12',
+  'identify==2.6.12',
+  'idna==3.10',
+  'iniconfig==2.1.0',
+  'jinja2==3.1.6',
+  'keyring==25.6.0',
+  'markdown-it-py==3.0.0',
+  'markupsafe==3.0.2',
+  'nodeenv==1.9.1',
+  'packaging',
+  'pip',
+  'platformdirs==4.3.8',
+  'pluggy==1.6.0',
+  'prompt-toolkit==3.0.51',
+  'pydantic-core==2.33.2',
+  'pydantic==2.11.7',
+  'pygments==2.19.2',
+  'pyjwt==2.10.1',
+  'pyopenssl==25.1.0',
+  'python-dateutil==2.9.0.post0',
+  'pytz==2025.2',
+  'requests==2.32.4',
+  'requirements-parser==0.13.0',
+  'rich==14.0.0',
+  'setuptools==80.8.0',
+  'shellingham==1.5.4',
+  'snowflake-connector-python[secure-local-storage]==3.15.0',
+  'snowflake-core==1.5.1',
+  'snowflake-snowpark-python==1.33.0;python_version < "3.12"',
+  'snowflake.core==1.5.1',
+  'sortedcontainers==2.4.0',
+  'tomlkit==0.13.3',
+  'typer==0.16.0',
+  'typing-extensions==4.14.0',
+  'typing-inspection==0.4.1',
+  'urllib3>=1.24.3,<2.6',
+  'virtualenv==20.31.2',
+  'wcwidth==0.2.13',
+  'werkzeug==3.1.3',
+  # ^-- section generated from cli.dependencies --^
 ]
 classifiers = [
   "Development Status :: 5 - Production/Stable",
@@ -59,13 +119,13 @@ classifiers = [
 
 [project.optional-dependencies]
 development = [
-  "Faker==37.3.0",
+  "Faker==37.4.0",
   "coverage==7.8.0",
   "factory-boy==3.3.3",
   "pre-commit>=3.5.0",
   "pytest-httpserver==1.1.3",
   "pytest-randomly==3.16.0",
-  "pytest==8.3.5",
+  "pytest==8.4.1",
   "syrupy==4.9.1",
 ]
 packaging = []
@@ -145,13 +205,13 @@ features = ["development"]
 
 [tool.hatch.envs.integration.scripts]
 test = [
-  'pytest -m "integration and not qa_only" -n6 --dist=worksteal --deflake-test-type=integration --ignore=tests_integration/spcs tests_integration/',
+  'pytest -m "integration and not qa_only" -n5 --dist=worksteal --deflake-test-type=integration --ignore=tests_integration/tests_using_container_services tests_integration/',
 ]
-test-spcs = [
-  "pytest -m integration -n6 --dist=worksteal --deflake-test-type=integration tests_integration/spcs",
+test_container_services = [
+  "pytest -m integration -n5 --dist=worksteal --deflake-test-type=integration tests_integration/tests_using_container_services",
 ]
 test_qa = [
-  "pytest -m 'integration and not no_qa' -n6 --dist=worksteal --deflake-test-type=integration tests_integration/",
+  "pytest -m 'integration and not no_qa' -n5 --dist=worksteal --deflake-test-type=integration tests_integration/",
 ]
 
 [[tool.hatch.envs.local.matrix]]

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/scripts/cleanup.py

@@ -92,7 +92,7 @@ if __name__ == "__main__":
         ("compute pool", "compute pools"): [],
         ("service", "services"): [],
         ("application", "applications"): [],
-        ("warehouse", "warehouses"): ["XSMALL"],
+        ("warehouse", "warehouses"): ["XSMALL", "SNOWPARK_TESTS"],
         ("image repository", "image repositories"): ["SNOWCLI_REPOSITORY"],
         ("role", "roles"): [
             "ACCOUNTADMIN",

snowflake_cli-3.10.0/scripts/lock_subdependencies.py

@@ -0,0 +1,143 @@
+# Copyright (c) 2024 Snowflake Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import re
+import sys
+from contextlib import contextmanager
+from pathlib import Path
+from shutil import which
+from subprocess import run
+from tempfile import TemporaryDirectory
+from typing import List, Set
+from venv import create as create_venv
+
+import tomlkit
+
+
+class PyprojectToml:
+    """Class responsible for reading and writing pyproject.toml file"""
+
+    PYPROJECT_TOML = Path(__file__).parent.parent / "pyproject.toml"
+
+    def read_base_dependencies(self):
+        contents = tomlkit.loads(self.PYPROJECT_TOML.read_text())
+        return contents["cli"]["dependencies"]
+
+    def create_minimal_project_with_dependencies(
+        self, dependencies: List[str], path: Path
+    ):
+        original_contents = tomlkit.loads(self.PYPROJECT_TOML.read_text())
+        new_contents = {"project": original_contents["project"]}
+        new_contents["project"]["dependencies"] = dependencies
+        path.write_text(tomlkit.dumps(new_contents))
+
+    def write_generated_dependencies(self, dependencies: List[str]):
+        contents = tomlkit.loads(self.PYPROJECT_TOML.read_text())
+        contents["project"]["dependencies"] = tomlkit.array(
+            "[\n  # v-- section generated from cli.dependencies --v\n"
+            + "\n".join([f"  '{dep}'," for dep in sorted(dependencies)])
+            + "\n  # ^-- section generated from cli.dependencies --^\n]"
+        )
+        self.PYPROJECT_TOML.write_text(tomlkit.dumps(contents))
+
+
+@contextmanager
+def ensure_uv():
+    """Yields command to use to call uv"""
+    if which("uv"):
+        yield ["uv"]
+        return
+
+    # install uv in temporary virtual environment
+    with TemporaryDirectory() as tmpdir:
+        venv_path = Path(tmpdir) / "venv"
+        create_venv(venv_path, with_pip=True)
+        python_path = venv_path / "bin" / "python"
+        run([str(python_path), "-m", "pip", "install", "uv"], check=True)
+        yield [python_path, "-m", "uv"]
+
+
+def recursively_generate_dependencies(
+    base_dependencies: List[str], depth: int
+) -> Set[str]:
+    with TemporaryDirectory() as tmp_project_dir:
+        # create pyproject.toml with dependencies = [cli.dependencies]
+        PyprojectToml().create_minimal_project_with_dependencies(
+            dependencies=base_dependencies,
+            path=Path(tmp_project_dir) / "pyproject.toml",
+        )
+
+        # run uv to list dependencies
+        with ensure_uv() as uv:
+            dependencies_raw = run(
+                [*uv, "tree", "--depth", str(depth), "--project", tmp_project_dir],
+                text=True,
+                capture_output=True,
+                check=True,
+            ).stdout
+
+        # parse uv output
+        dependency_regex = r".* (?P<name>[a-zA-Z].*) v(?P<version>[\.0-9a-zA-Z]+?)(?P<uv_comment>\s.*)?"
+        ignored_comments = [
+            "(*)",  # uv symbol for "repeated row"
+            "(extra: development)",  # CLI deployment mode dependency
+            "(extra: development) (*)",
+        ]
+        dependencies = set()
+        for line in dependencies_raw.splitlines():
+            match = re.fullmatch(dependency_regex, line)
+            if not match or str(match.group("uv_comment")).strip() in ignored_comments:
+                continue
+            dependencies.add(f"{match.group('name')}=={match.group('version')}")
+
+    return dependencies
+
+
+def join_dependencies(
+    dependencies: List[str], generated_dependencies: Set[str]
+) -> None:
+    """Add `generated_dependencies` not listed in `dependencies` to `dependencies`"""
+
+    def _get_name(dependency: str) -> str:
+        """get package name from dependency"""
+        min_found = len(dependency)
+        for sep in "=<>":
+            idx = dependency.find(sep)
+            if idx >= 0:
+                min_found = min(idx, min_found)
+
+        if min_found == len(dependency):
+            # version not provided
+            return dependency.lower()
+        return dependency[:min_found].lower()
+
+    existing_names = set(_get_name(dep) for dep in dependencies)
+    for dep in generated_dependencies:
+        if _get_name(dep) in existing_names:
+            continue
+        existing_names.add(_get_name(dep))
+        dependencies.append(dep)
+
+
+if __name__ == "__main__":
+    if sys.platform.startswith("win"):
+        # do not execute script on Windows, but do not block the commit
+        # reason: the plugin was only tested on unix-like systems (virtualenv and UV output might vary on Windows OS)
+        sys.exit(0)
+    pyproject = PyprojectToml()
+    dependencies = pyproject.read_base_dependencies()
+    # Depth limited to 2 (dependencies and their sub-dependencies) to avoid drastic changes. Can be changed later.
+    generated_dependencies = recursively_generate_dependencies(dependencies, depth=2)
+    join_dependencies(dependencies, generated_dependencies)
+    pyproject.write_generated_dependencies(dependencies)

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/scripts/packaging/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 AS base
+FROM artifactory.ci1.us-west-2.aws-dev.app.snowflake.com/docker-remote/library/ubuntu:18.04 AS base
 
 ENV HOME=/root
 

snowflake_cli-3.10.0/scripts/packaging/delete_mac_certs.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -e -x
+
+# Set the Keychain path where the certificates will be imported
+KEYCHAIN_PATH=$HOME/Library/Keychains/login.keychain-db
+
+# Delete the Developer ID Installer certificate from the keychain
+security delete-identity -c "Developer ID Installer: Snowflake Computing INC. (W4NT6CRQ7U)" "$KEYCHAIN_PATH"
+
+# Delete the Developer ID Application certificate from the keychain
+security delete-identity -c "Developer ID Application: Snowflake Computing INC. (W4NT6CRQ7U)" "$KEYCHAIN_PATH"
+
+# Inform the user about the successful cleanup
+echo "Temporary files cleaned up successfully"

snowflake_cli-3.10.0/scripts/packaging/load_mac_certs.sh

@@ -0,0 +1,77 @@
+#!/bin/bash -e -x
+
+# Set the path to the temporary files for the certificates
+APPLE_CERT_DEVELOPER_INSTALLER="apple_dev_installer_cert.p12"
+APPLE_CERT_DEVELOPER_APPLICATION="apple_dev_application_cert.p12"
+
+# Define the expected MD5 checksum
+EXPECTED_INSTALLER_CHECKSUM="1f9d2dfd1a6dc87c87fe0426a6ee136e"
+EXPECTED_APPLICATION_CHECKSUM="658613e0abe5c3187284e9662f18e1f0"
+
+# Decode Developer ID Installer certificate from base64 into temporary file
+base64 -d < $APPLE_CERT_DEVELOPER_INSTALLER_BASE64 > $APPLE_CERT_DEVELOPER_INSTALLER
+
+# Calculate the actual checksum of the decoded file
+ACTUAL_INSTALLER_CHECKSUM=$(md5 -q $APPLE_CERT_DEVELOPER_INSTALLER)
+
+# Compare the actual checksum with the expected one
+if [ "$ACTUAL_INSTALLER_CHECKSUM" == "$EXPECTED_INSTALLER_CHECKSUM" ]; then
+  echo "$APPLE_CERT_DEVELOPER_INSTALLER: OK"
+else
+  echo "$APPLE_CERT_DEVELOPER_INSTALLER: FAILED"
+  exit 1
+fi
+
+# Decode Developer ID Application certificate from base64 into temporary file
+base64 -d < $APPLE_CERT_DEVELOPER_APPLICATION_BASE64 > $APPLE_CERT_DEVELOPER_APPLICATION
+
+# Calculate the actual checksum of the decoded file
+ACTUAL_APPLICATION_CHECKSUM=$(md5 -q $APPLE_CERT_DEVELOPER_APPLICATION)
+
+# Compare the actual checksum with the expected one
+if [ "$ACTUAL_APPLICATION_CHECKSUM" == "$EXPECTED_APPLICATION_CHECKSUM" ]; then
+  echo "$APPLE_CERT_DEVELOPER_APPLICATION: OK"
+else
+  echo "$APPLE_CERT_DEVELOPER_APPLICATION: FAILED"
+  exit 1
+fi
+
+# Set the Keychain path where the certificates will be imported
+KEYCHAIN_PATH=$HOME/Library/Keychains/login.keychain-db
+
+# Unlock the keychain using the provided password
+security unlock-keychain -p $MAC_USERNAME_PASSWORD $KEYCHAIN_PATH
+
+# Import Developer ID Installer certificate to the keychain
+security import $APPLE_CERT_DEVELOPER_INSTALLER -k $KEYCHAIN_PATH -P $APPLE_CERT_DEVELOPER_INSTALLER_PASSWORD -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/xcrun -T /usr/bin/productsign -T /usr/bin/productbuild
+
+# Check if the import was successful
+if [ $? -ne 0 ]; then
+    echo "Error: Failed to import installer certificate"
+    exit 1
+fi
+
+# reload the keychain to ensure the changes are applied
+security set-key-partition-list -S apple-tool:,apple: -k "$MAC_USERNAME_PASSWORD" $KEYCHAIN_PATH
+
+# Import Developer ID Installer certificate to the keychain
+security import $APPLE_CERT_DEVELOPER_APPLICATION -k $KEYCHAIN_PATH -P $APPLE_CERT_DEVELOPER_APPLICATION_PASSWORD -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/xcrun -T /usr/bin/productsign -T /usr/bin/productbuild
+
+# Check if the import was successful
+if [ $? -ne 0 ]; then
+    echo "Error: Failed to import application certificate"
+    exit 1
+fi
+
+# reload the keychain to ensure the changes are applied
+security set-key-partition-list -S apple-tool:,apple: -k "$MAC_USERNAME_PASSWORD" $KEYCHAIN_PATH
+
+# Inform the user about the successful import
+echo "Certificates imported successfully to $KEYCHAIN_PATH"
+
+# Clean up the temporary files
+rm -f $APPLE_CERT_DEVELOPER_INSTALLER
+rm -f $APPLE_CERT_DEVELOPER_APPLICATION
+
+# Inform the user about the successful cleanup
+echo "Temporary files cleaned up successfully"

{snowflake_cli-3.9.0 → snowflake_cli-3.10.0}/scripts/release-plugin/src/snowflakecli_internal_release_plugin/commands.py

@@ -23,7 +23,10 @@ import typer
 from click.exceptions import ClickException
 from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
 from snowflake.cli.api.console.console import cli_console
-from snowflake.cli.api.output.types import CollectionResult, MessageResult
+from snowflake.cli.api.output.types import (
+    CollectionResult,
+    MessageResult,
+)
 
 from snowflakecli_internal_release_plugin.repo_manager import (
     ReleaseInfo,
@@ -93,26 +96,52 @@ def _commit_bump_version(
     repo.git.commit(m=f"Bump version to {tag_name}")
 
 
-@app.command(name="init")
-def init_release(version: str = VersionArgument, **options):
-    """Update release notes and version on branch `main`, create branch release-vX.Y.Z and release tag rc0."""
-    repo = RepositoryManager()
-    release_info = ReleaseInfo(version, repo)
-    if repo.exists(release_info.release_branch_name):
-        raise ClickException(
-            f'Branch "{release_info.release_branch_name}" already exists'
+def _init_patch_release(release_info: ReleaseInfo) -> MessageResult:
+    repo = release_info.repo
+    with repo.tmp_checkout(release_info.root_branch_name):
+        # create release branch
+        cli_console.step(f"creating branch {release_info.release_branch_name}")
+        repo.git.checkout(release_info.release_branch_name, b=True)
+        repo.git.push("origin", release_info.release_branch_name, set_upstream=True)
+
+        # create cherrypick branch
+        cherrypick_branch = release_info.cherrypick_branch_name(
+            release_info.final_tag_name
         )
+        cli_console.step(f"creating branch {cherrypick_branch}")
+        repo.git.checkout(cherrypick_branch, b=True)
+        _commit_bump_version(repo, release_info.version, release_info.final_tag_name)
+        repo.git.push("origin", cherrypick_branch, set_upstream=True)
 
+    # create empty bump-release-notes branch on main
     with repo.tmp_checkout("main"):
+        bump_release_notes_main_branch = f"bump-release-notes-{release_info.version}"
+        cli_console.step(f"creating branch {bump_release_notes_main_branch}")
+        repo.git.checkout(bump_release_notes_main_branch, b=True)
+        repo.git.push("origin", bump_release_notes_main_branch, set_upstream=True)
+
+    release_pr_url = get_pr_url(cherrypick_branch)
+    main_pr_url = get_pr_url(bump_release_notes_main_branch)
+
+    return MessageResult(
+        f"""Release branch successfully initialized.
+    create PR to '{release_info.release_branch_name}': {release_pr_url}
+    create PR to 'main': {main_pr_url}"""
+    )
+
+
+def _init_normal_release(release_info: ReleaseInfo) -> MessageResult:
+    repo = release_info.repo
+    with repo.tmp_checkout(release_info.root_branch_name):
         # create release branch and update release notes
         repo.git.checkout(release_info.release_branch_name, b=True)
-        _commit_update_release_notes(repo, version)
+        _commit_update_release_notes(repo, release_info.version)
         repo.git.push("origin", release_info.release_branch_name, set_upstream=True)
 
         # create separate brunch bumping main version
-        bump_release_notes_main_branch = f"bump-release-notes-{version}"
+        bump_release_notes_main_branch = f"bump-release-notes-{release_info.version}"
         repo.git.checkout(bump_release_notes_main_branch, b=True)
-        _commit_bump_dev_version(repo, version)
+        _commit_bump_dev_version(repo, release_info.version)
         repo.git.push("origin", bump_release_notes_main_branch, set_upstream=True)
 
         # create rc0 branch
@@ -136,6 +165,22 @@ def init_release(version: str = VersionArgument, **options):
     )
 
 
+@app.command(name="init")
+def init_release(version: str = VersionArgument, **options):
+    """Creates branch release-vX.Y.Z and cherrypick branch for rc0 (normal releases) or final version (patch releases).
+    For normal releases updates release notes and version on branch `main`."""
+    repo = RepositoryManager()
+    release_info = ReleaseInfo(version, repo)
+    if repo.exists(release_info.release_branch_name):
+        raise ClickException(
+            f'Branch "{release_info.release_branch_name}" already exists'
+        )
+
+    if release_info.is_patch_release:
+        return _init_patch_release(release_info)
+    return _init_normal_release(release_info)
+
+
 @app.command()
 def cherrypick_branch(
     version: str = VersionArgument, final: bool = FinalOption, **options