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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: snowflake-cli
-Version: 3.9.0
+Version: 3.9.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-3.9.0 → snowflake_cli-3.9.1}/RELEASE-NOTES.md

@@ -22,6 +22,15 @@
 
 ## Fixes and improvements
 
+# 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
 

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/src/snowflake/cli/__about__.py

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

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/src/snowflake/cli/_plugins/project/commands.py

@@ -40,7 +40,11 @@ from snowflake.cli.api.console.console import cli_console
 from snowflake.cli.api.constants import ObjectType
 from snowflake.cli.api.exceptions import CliError
 from snowflake.cli.api.identifiers import FQN
-from snowflake.cli.api.output.types import MessageResult, QueryResult, SingleQueryResult
+from snowflake.cli.api.output.types import (
+    MessageResult,
+    QueryJsonValueResult,
+    QueryResult,
+)
 
 app = SnowTyperFactory(
     name="project",
@@ -101,7 +105,7 @@ def execute(
         version=version,
         variables=variables,
     )
-    return SingleQueryResult(result)
+    return QueryJsonValueResult(result)
 
 
 @app.command(requires_connection=True)
@@ -122,7 +126,7 @@ def dry_run(
         dry_run=True,
         variables=variables,
     )
-    return SingleQueryResult(result)
+    return QueryJsonValueResult(result)
 
 
 @app.command(requires_connection=True)

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/src/snowflake/cli/_plugins/spcs/image_registry/commands.py

@@ -64,10 +64,10 @@ def url(private_link: bool = PrivateLinkOption, **options) -> MessageResult:
 
 
 @app.command(requires_connection=True)
-def login(**options) -> MessageResult:
+def login(private_link: bool = PrivateLinkOption, **options) -> MessageResult:
     """
     Logs in to the account image registry with the current user's credentials through Docker.
 
     Must be called from a role that can view at least one image repository in the image registry.
     """
-    return MessageResult(RegistryManager().docker_registry_login().strip())
+    return MessageResult(RegistryManager().docker_registry_login(private_link).strip())

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/src/snowflake/cli/_plugins/spcs/image_registry/manager.py

@@ -101,8 +101,8 @@ class RegistryManager(SqlExecutionMixin):
             sample_repository_url = f"//{sample_repository_url}"
         return urlparse(sample_repository_url).netloc
 
-    def docker_registry_login(self) -> str:
-        registry_url = self.get_registry_url()
+    def docker_registry_login(self, private_link: bool = False) -> str:
+        registry_url = self.get_registry_url(private_link)
         token = self.get_token()
         command = [
             "docker",

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/tests/__snapshots__/test_help_messages.ambr

@@ -13202,7 +13202,9 @@
    image registry.                                                                
                                                                                   
   +- Options --------------------------------------------------------------------+
-  | --help  -h        Show this message and exit.                                |
+  | --private-link            Get the private link URL instead of the public     |
+  |                           URL.                                               |
+  | --help          -h        Show this message and exit.                        |
   +------------------------------------------------------------------------------+
   +- Connection configuration ---------------------------------------------------+
   | --connection,--environment    -c      TEXT     Name of the connection, as    |

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/tests/dcm_project/test_commands.py

@@ -132,7 +132,9 @@ def test_add_version_raises_when_project_does_not_exist(
 
 
 @mock.patch(ProjectManager)
-def test_execute_project(mock_pm, runner, project_directory):
+def test_execute_project(mock_pm, runner, project_directory, mock_cursor):
+    mock_pm().execute.return_value = mock_cursor(rows=[("[]",)], columns=("operations"))
+
     result = runner.invoke(["project", "execute", "fooBar"])
     assert result.exit_code == 0, result.output
 
@@ -145,7 +147,11 @@ def test_execute_project(mock_pm, runner, project_directory):
 
 
 @mock.patch(ProjectManager)
-def test_execute_project_with_variables(mock_pm, runner, project_directory):
+def test_execute_project_with_variables(
+    mock_pm, runner, project_directory, mock_cursor
+):
+    mock_pm().execute.return_value = mock_cursor(rows=[("[]",)], columns=("operations"))
+
     result = runner.invoke(
         ["project", "execute", "fooBar", "--version", "v1", "-D", "key=value"]
     )
@@ -160,7 +166,11 @@ def test_execute_project_with_variables(mock_pm, runner, project_directory):
 
 
 @mock.patch(ProjectManager)
-def test_execute_project_with_configuration(mock_pm, runner, project_directory):
+def test_execute_project_with_configuration(
+    mock_pm, runner, project_directory, mock_cursor
+):
+    mock_pm().execute.return_value = mock_cursor(rows=[("[]",)], columns=("operations"))
+
     result = runner.invoke(
         ["project", "execute", "fooBar", "--configuration", "some_configuration"]
     )
@@ -175,7 +185,9 @@ def test_execute_project_with_configuration(mock_pm, runner, project_directory):
 
 
 @mock.patch(ProjectManager)
-def test_validate_project(mock_pm, runner, project_directory):
+def test_validate_project(mock_pm, runner, project_directory, mock_cursor):
+    mock_pm().execute.return_value = mock_cursor(rows=[("[]",)], columns=("operations"))
+
     result = runner.invoke(
         [
             "project",

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/tests/spcs/__snapshots__/test_registry.ambr

@@ -15,6 +15,22 @@
   
   '''
 # ---
+# name: test_docker_registry_login_cli_private_link
+  '''
+  Login Succeeded
+  
+  '''
+# ---
+# name: test_docker_registry_login_cli_private_link_no_repo
+  '''
+  +- Error ----------------------------------------------------------------------+
+  | No image repository found. To run this command, please switch to a role with |
+  | read access to at least one image repository or create a new image           |
+  | repository first.                                                            |
+  +------------------------------------------------------------------------------+
+  
+  '''
+# ---
 # name: test_docker_registry_login_subprocess_error
   'Login Failed: Docker Failed'
 # ---

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/tests/spcs/test_registry.py

@@ -268,7 +268,7 @@ def test_docker_registry_login(mock_check_output, mock_get_url, mock_get_token):
     mock_check_output.assert_called_once_with(
         expected_command, input=json.dumps(test_token), text=True, stderr=PIPE
     )
-    mock_get_url.assert_called_once_with()
+    mock_get_url.assert_called_once_with(False)
     mock_get_token.assert_called_once_with()
     assert result == test_output
 
@@ -355,3 +355,67 @@ def test_docker_registry_login_docker_not_installed_error(
         RegistryManager().docker_registry_login()
 
     assert e.value.message == "Docker is not installed."
+
+
+@mock.patch(
+    "snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager.docker_registry_login"
+)
+def test_docker_registry_login_cli_private_link(
+    mock_docker_login, runner, os_agnostic_snapshot
+):
+    mock_docker_login.return_value = "Login Succeeded\n"
+    result = runner.invoke(["spcs", "image-registry", "login", "--private-link"])
+    assert result.exit_code == 0, result.output
+    mock_docker_login.assert_called_once_with(True)
+    assert result.output == os_agnostic_snapshot
+
+
+@mock.patch(
+    "snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager.get_token"
+)
+@mock.patch(
+    "snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager.get_registry_url"
+)
+@mock.patch(
+    "snowflake.cli._plugins.spcs.image_registry.manager.subprocess.check_output"
+)
+def test_docker_registry_login_private_link_manager(
+    mock_check_output, mock_get_url, mock_get_token
+):
+    test_output = mock_check_output.return_value = "Login Succeeded\n"
+    test_url = (
+        mock_get_url.return_value
+    ) = "orgname-acctname.registry.privatelink.snowflakecomputing.com"
+    test_token = mock_get_token.return_value = {
+        "token": "ver:1-hint:abc",
+        "expires_in": 3600,
+    }
+
+    expected_command = [
+        "docker",
+        "login",
+        "--username",
+        "0sessiontoken",
+        "--password-stdin",
+        test_url,
+    ]
+
+    result = RegistryManager().docker_registry_login(private_link=True)
+    mock_check_output.assert_called_once_with(
+        expected_command, input=json.dumps(test_token), text=True, stderr=PIPE
+    )
+    mock_get_url.assert_called_once_with(True)
+    mock_get_token.assert_called_once_with()
+    assert result == test_output
+
+
+@mock.patch(
+    "snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager.get_registry_url"
+)
+def test_docker_registry_login_cli_private_link_no_repo(
+    mock_get_registry_url, runner, os_agnostic_snapshot
+):
+    mock_get_registry_url.side_effect = NoImageRepositoriesFoundError()
+    result = runner.invoke(["spcs", "image-registry", "login", "--private-link"])
+    assert result.exit_code == 1, result.output
+    assert result.output == os_agnostic_snapshot

{snowflake_cli-3.9.0 → snowflake_cli-3.9.1}/tests_integration/test_dcm_project.py

@@ -33,7 +33,6 @@ def _assert_project_has_versions(
 
 
 @pytest.mark.integration
-@pytest.mark.qa_only
 def test_project_deploy(
     runner,
     test_database,
@@ -92,7 +91,6 @@ def test_project_deploy(
 
 
 @pytest.mark.integration
-@pytest.mark.qa_only
 def test_execute_multiple_configurations(
     runner,
     test_database,
@@ -118,14 +116,16 @@ def test_execute_multiple_configurations(
                     ]
                 )
                 assert result.exit_code == 0, result.output
-                assert (
-                    f"SNOWCLI_TEST_TABLE_{configuration}".upper()
-                    in result.json["operations"]
-                )
+
+                assert result.json[0] == {
+                    "details": {"columns": {"FOOBAR": {"type": "VARCHAR"}}},
+                    "objectDomain": "TABLE",
+                    "objectName": f"{test_database}.PUBLIC.SNOWCLI_TEST_TABLE_{configuration}".upper(),
+                    "operationType": "CREATE",
+                }
 
 
 @pytest.mark.integration
-@pytest.mark.qa_only
 def test_create_corner_cases(
     runner,
     test_database,
@@ -166,7 +166,6 @@ def test_create_corner_cases(
 
 
 @pytest.mark.integration
-@pytest.mark.qa_only
 def test_project_add_version(
     runner,
     test_database,
@@ -288,7 +287,6 @@ def test_project_add_version(
 
 
 @pytest.mark.integration
-@pytest.mark.qa_only
 def test_project_add_version_without_create_fails(
     runner,
     test_database,