snowflake-cli 3.8.2__tar.gz → 3.8.3__tar.gz

{snowflake_cli-3.8.2 → snowflake_cli-3.8.3}/PKG-INFO

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

@@ -23,6 +23,16 @@
 ## Fixes and improvements
 
 
+# v3.8.3
+
+## Deprecations
+
+## New additions
+* Added `--private-link` flag to `snow spcs image-registry url` command for retrieving private link URLs.
+
+## Fixes and improvements
+
+
 # v3.8.2
 
 ## Deprecations

{snowflake_cli-3.8.2 → snowflake_cli-3.8.3}/src/snowflake/cli/__about__.py

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

{snowflake_cli-3.8.2 → snowflake_cli-3.8.3}/src/snowflake/cli/_plugins/spcs/image_registry/commands.py

@@ -24,6 +24,14 @@ app = SnowTyperFactory(
     short_help="Manages image registries.",
 )
 
+import typer
+
+PrivateLinkOption: bool = typer.Option(
+    False,
+    "--private-link",
+    help="Get the private link URL instead of the public URL.",
+)
+
 
 _TOKEN_EPILOG = """\
 Usage Example: snow spcs image-registry token --format JSON | docker login $(snow spcs image-registry url) -u 0sessiontoken --password-stdin
@@ -46,13 +54,13 @@ def token(**options) -> ObjectResult:
 
 
 @app.command(requires_connection=True)
-def url(**options) -> MessageResult:
+def url(private_link: bool = PrivateLinkOption, **options) -> MessageResult:
     """
     Gets the image registry URL for the current account.
 
     Must be called from a role that can view at least one image repository in the image registry.
     """
-    return MessageResult(RegistryManager().get_registry_url())
+    return MessageResult(RegistryManager().get_registry_url(private_link))
 
 
 @app.command(requires_connection=True)

{snowflake_cli-3.8.2 → snowflake_cli-3.8.3}/src/snowflake/cli/_plugins/spcs/image_registry/manager.py

@@ -73,7 +73,7 @@ class RegistryManager(SqlExecutionMixin):
     def _has_url_scheme(self, url: str):
         return re.fullmatch(r"^.*//.+", url) is not None
 
-    def get_registry_url(self) -> str:
+    def get_registry_url(self, private_link: bool = False) -> str:
         images_query = "show image repositories in schema snowflake.images;"
         images_result = self.execute_query(images_query, cursor_class=DictCursor)
 
@@ -88,7 +88,15 @@ class RegistryManager(SqlExecutionMixin):
             if not results:
                 raise NoImageRepositoriesFoundError()
 
-        sample_repository_url = results["repository_url"]
+        if private_link:
+            privatelink_repository_url = "privatelink_repository_url"
+
+            if privatelink_repository_url not in results:
+                return ""
+            sample_repository_url = results[privatelink_repository_url]
+        else:
+            sample_repository_url = results["repository_url"]
+
         if not self._has_url_scheme(sample_repository_url):
             sample_repository_url = f"//{sample_repository_url}"
         return urlparse(sample_repository_url).netloc

{snowflake_cli-3.8.2 → snowflake_cli-3.8.3}/tests/__snapshots__/test_help_messages.ambr

@@ -11360,7 +11360,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.8.2 → snowflake_cli-3.8.3}/tests/spcs/test_registry.py

@@ -83,6 +83,83 @@ def test_get_registry_url(mock_execute, mock_conn, mock_cursor):
     assert result == "orgname-alias.registry.snowflakecomputing.com"
 
 
+@mock.patch("snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager._conn")
+@mock.patch(
+    "snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager.execute_query"
+)
+@pytest.mark.parametrize(
+    "column_value, expected",
+    [
+        (
+            "orgname-alias.registry.privatelink.snowflakecomputing.com/DB/SCHEMA/IMAGES",
+            "orgname-alias.registry.privatelink.snowflakecomputing.com",
+        ),
+        ("", ""),
+    ],
+)
+def test_get_registry_privatelink_url(
+    mock_execute, mock_conn, mock_cursor, column_value, expected
+):
+    mock_row = [
+        "2023-01-01 00:00:00",
+        "IMAGES",
+        "DB",
+        "SCHEMA",
+        "orgname-alias.registry.snowflakecomputing.com/DB/SCHEMA/IMAGES",
+        "TEST_ROLE",
+        "ROLE",
+        "",
+        column_value,
+    ]
+
+    mock_execute.return_value = mock_cursor(
+        rows=[
+            {},
+            {
+                col: row
+                for col, row in zip(
+                    [*MOCK_REPO_COLUMNS, "privatelink_repository_url"], mock_row
+                )
+            },
+        ],
+        columns=MOCK_REPO_COLUMNS,
+    )
+    result = RegistryManager().get_registry_url(private_link=True)
+    expected_query = "show image repositories in account"
+    assert mock_execute.call_count == 2
+    mock_execute.assert_any_call(expected_query, cursor_class=DictCursor)
+    assert result == expected
+
+
+@mock.patch("snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager._conn")
+@mock.patch(
+    "snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager.execute_query"
+)
+def test_get_registry_privatelink_url_returns_empty_for_missing_column(
+    mock_execute, mock_conn, mock_cursor
+):
+    mock_row = [
+        "2023-01-01 00:00:00",
+        "IMAGES",
+        "DB",
+        "SCHEMA",
+        "orgname-alias.registry.snowflakecomputing.com/DB/SCHEMA/IMAGES",
+        "TEST_ROLE",
+        "ROLE",
+        "",
+    ]
+
+    mock_execute.return_value = mock_cursor(
+        rows=[{}, {col: row for col, row in zip(MOCK_REPO_COLUMNS, mock_row)}],
+        columns=MOCK_REPO_COLUMNS,
+    )
+    result = RegistryManager().get_registry_url(private_link=True)
+    expected_query = "show image repositories in account"
+    assert mock_execute.call_count == 2
+    mock_execute.assert_any_call(expected_query, cursor_class=DictCursor)
+    assert result == ""
+
+
 @mock.patch("snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager._conn")
 @mock.patch(
     "snowflake.cli._plugins.spcs.image_registry.manager.RegistryManager.execute_query"