snowflake-cli-labs 2.6.0.dev0__tar.gz → 2.6.1__tar.gz

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.6.0.dev0
+Version: 2.6.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_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/RELEASE-NOTES.md

@@ -23,6 +23,16 @@
 
 ## Fixes and improvements
 
+# v2.6.1
+## Backward incompatibility
+
+## Deprecations
+
+## New additions
+
+## Fixes and improvements
+* `snow object create` message returns meaningful error if connection database is not defined.
+* Fixed crashing when save_logs is false and log directory does not exist
 
 # v2.6.0
 ## Backward incompatibility

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/src/snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.6.0.dev0"
+VERSION = "2.6.1"

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/src/snowflake/cli/api/config.py

@@ -114,6 +114,8 @@ def config_init(config_file: Optional[Path]):
     Initializes the app configuration. Config provided via cli flag takes precedence.
     If config file does not exist we create an empty one.
     """
+    from snowflake.cli.app.loggers import create_initial_loggers
+
     if config_file:
         CONFIG_MANAGER.file_path = config_file
     else:
@@ -121,6 +123,7 @@ def config_init(config_file: Optional[Path]):
     if not CONFIG_MANAGER.file_path.exists():
         _initialise_config(CONFIG_MANAGER.file_path)
     _read_config_file()
+    create_initial_loggers()
 
 
 def add_connection(name: str, connection_config: ConnectionConfig):

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/src/snowflake/cli/api/rest_api.py

@@ -16,16 +16,27 @@ from __future__ import annotations
 
 import json
 import logging
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Optional
 
+from click import ClickException
 from snowflake.cli.api.constants import SF_REST_API_URL_PREFIX
 from snowflake.connector.connection import SnowflakeConnection
-from snowflake.connector.errors import InterfaceError
+from snowflake.connector.errors import BadRequest, InterfaceError
 from snowflake.connector.network import SnowflakeRestful
 
 log = logging.getLogger(__name__)
 
 
+def _pluralize_object_type(object_type: str) -> str:
+    """
+    Pluralize object type without depending on OBJECT_TO_NAMES.
+    """
+    if object_type.endswith("y"):
+        return object_type[:-1].lower() + "ies"
+    else:
+        return object_type.lower() + "s"
+
+
 class RestApi:
     def __init__(self, connection: SnowflakeConnection):
         self.conn = connection
@@ -43,6 +54,13 @@ class RestApi:
                 return False
             raise err
 
+    def _fetch_endpoint_exists(self, url: str) -> bool:
+        try:
+            result = self.send_rest_request(url, method="get")
+            return bool(result)
+        except BadRequest:
+            return False
+
     def send_rest_request(
         self, url: str, method: str, data: Optional[Dict[str, Any]] = None
     ):
@@ -75,12 +93,18 @@ class RestApi:
             no_retry=True,
         )
 
-    def determine_url_for_create_query(
-        self, *, plural_object_type: str
-    ) -> Optional[str]:
+    def _database_exists(self, db_name: str) -> bool:
+        url = f"{SF_REST_API_URL_PREFIX}/databases/{db_name}"
+        return self._fetch_endpoint_exists(url)
+
+    def _schema_exists(self, db_name: str, schema_name: str) -> bool:
+        url = f"{SF_REST_API_URL_PREFIX}/databases/{db_name}/schemas/{schema_name}"
+        return self._fetch_endpoint_exists(url)
+
+    def determine_url_for_create_query(self, object_type: str) -> str:
         """
         Determine an url for creating an object of given type via REST API.
-        The function returns None if URL cannot be determined.
+        If URL cannot be determined, the function throws CannotDetermineCreateURLException exception.
 
         URLs we check:
          * /api/v2/<type>/
@@ -92,22 +116,57 @@ class RestApi:
          To check whether an URL exists, we send read-only GET request (LIST endpoint,
          which should imply CREATE endpoint).
         """
-        urls_to_be_checked: List[Optional[str]] = [
-            f"{SF_REST_API_URL_PREFIX}/{plural_object_type}/",
-            (
-                f"{SF_REST_API_URL_PREFIX}/databases/{self.conn.database}/{plural_object_type}/"
-                if self.conn.database
-                else None
-            ),
-            (
-                f"{SF_REST_API_URL_PREFIX}/databases/{self.conn.database}/schemas/{self.conn.schema}/{plural_object_type}/"
-                if self.conn.database and self.conn.schema
-                else None
-            ),
-        ]
-
-        for url in urls_to_be_checked:
-            if url and self.get_endpoint_exists(url):
-                return url
-
-        return None
+        plural_object_type = _pluralize_object_type(object_type)
+
+        if self.get_endpoint_exists(
+            url := f"{SF_REST_API_URL_PREFIX}/{plural_object_type}/"
+        ):
+            return url
+
+        db = self.conn.database
+        if not db:
+            raise DatabaseNotDefinedException(
+                "Database not defined in connection. Please try again with `--database` flag."
+            )
+        if not self._database_exists(db):
+            raise DatabaseNotExistsException(f"Database '{db}' does not exist.")
+        if self.get_endpoint_exists(
+            url := f"{SF_REST_API_URL_PREFIX}/databases/{db}/{plural_object_type}/"
+        ):
+            return url
+
+        schema = self.conn.schema
+        if not schema:
+            raise SchemaNotDefinedException(
+                "Schema not defined in connection. Please try again with `--schema` flag."
+            )
+        if not self._schema_exists(db_name=db, schema_name=schema):
+            raise SchemaNotExistsException(f"Schema '{schema}' does not exist.")
+        if self.get_endpoint_exists(
+            url := f"{SF_REST_API_URL_PREFIX}/databases/{self.conn.database}/schemas/{self.conn.schema}/{plural_object_type}/"
+        ):
+            return url
+
+        raise CannotDetermineCreateURLException(
+            f"Create operation for type {object_type} is not supported. Try using `sql -q 'CREATE ...'` command."
+        )
+
+
+class DatabaseNotDefinedException(ClickException):
+    pass
+
+
+class SchemaNotDefinedException(ClickException):
+    pass
+
+
+class DatabaseNotExistsException(ClickException):
+    pass
+
+
+class SchemaNotExistsException(ClickException):
+    pass
+
+
+class CannotDetermineCreateURLException(ClickException):
+    pass

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/src/snowflake/cli/app/cli_app.py

@@ -30,7 +30,6 @@ from snowflake.cli.api.config import config_init
 from snowflake.cli.api.output.formats import OutputFormat
 from snowflake.cli.api.output.types import CollectionResult
 from snowflake.cli.api.secure_path import SecurePath
-from snowflake.cli.app import loggers
 from snowflake.cli.app.api_impl.plugin.plugin_config_provider_impl import (
     PluginConfigProviderImpl,
 )
@@ -89,7 +88,6 @@ def _commands_registration_callback(value: bool):
 @_commands_registration.before
 def _config_init_callback(configuration_file: Optional[Path]):
     config_init(configuration_file)
-    loggers.create_initial_loggers()
 
 
 @_commands_registration.before

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/src/snowflake/cli/app/loggers.py

@@ -20,9 +20,6 @@ from dataclasses import asdict, dataclass, field
 from typing import Any, Dict, List
 
 import typer
-from snowflake.cli.api.config import (
-    get_logs_config,
-)
 from snowflake.cli.api.exceptions import InvalidLogsConfiguration
 from snowflake.cli.api.secure_path import SecurePath
 from snowflake.connector.errors import ConfigSourceError
@@ -103,6 +100,10 @@ def _remove_underscore_prefixes_from_keys(d: Dict[str, Any]) -> None:
 
 class FileLogsConfig:
     def __init__(self, debug: bool) -> None:
+        from snowflake.cli.api.config import (
+            get_logs_config,
+        )
+
         config = get_logs_config()
 
         self.path: SecurePath = SecurePath(config["path"])
@@ -142,8 +143,9 @@ def create_initial_loggers():
     config = InitialLoggingConfig()
     try:
         file_logs_config = FileLogsConfig(debug=False)
-        config.handlers["file"]["filename"] = file_logs_config.filename
-        _configurate_logging(config)
+        if file_logs_config.save_logs:
+            config.handlers["file"]["filename"] = file_logs_config.filename
+            _configurate_logging(config)
     except ConfigSourceError:
         pass
 

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/src/snowflake/cli/plugins/object/commands.py

@@ -33,7 +33,7 @@ app = SnowTyperFactory(
 
 NameArgument = typer.Argument(help="Name of the object")
 ObjectArgument = typer.Argument(
-    help="Type of object. For example table, procedure, streamlit.",
+    help="Type of object. For example table, database, compute-pool.",
     case_sensitive=False,
     show_default=False,
 )

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/src/snowflake/cli/plugins/object/manager.py

@@ -36,16 +36,6 @@ def _get_object_names(object_type: str) -> ObjectNames:
     return OBJECT_TO_NAMES[object_type]
 
 
-def _pluralize_object_type(object_type: str) -> str:
-    """
-    Pluralize object type without depending on OBJECT_TO_NAMES.
-    """
-    if object_type.endswith("y"):
-        return object_type[:-1].lower() + "ies"
-    else:
-        return object_type.lower() + "s"
-
-
 class ObjectManager(SqlExecutionMixin):
     def show(
         self,
@@ -85,11 +75,8 @@ class ObjectManager(SqlExecutionMixin):
 
     def create(self, object_type: str, object_data: Dict[str, Any]) -> str:
         rest = RestApi(self._conn)
-        url = rest.determine_url_for_create_query(
-            plural_object_type=_pluralize_object_type(object_type)
-        )
-        if not url:
-            return f"Create operation for type {object_type} is not supported. Try using `sql -q 'CREATE ...'` command"
+        url = rest.determine_url_for_create_query(object_type=object_type)
+
         try:
             response = rest.send_rest_request(url=url, method="post", data=object_data)
             # workaround as SnowflakeRestful class ignores some errors, dropping their info and returns {} instead.

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/tests/__snapshots__/test_help_messages.ambr

@@ -2261,8 +2261,8 @@
                                                                                   
   +- Arguments ------------------------------------------------------------------+
   | *    object_type            TEXT                    Type of object. For      |
-  |                                                     example table,           |
-  |                                                     procedure, streamlit.    |
+  |                                                     example table, database, |
+  |                                                     compute-pool.            |
   |                                                     [required]               |
   |      object_attributes      [OBJECT_ATTRIBUTES]...  Object attributes        |
   |                                                     provided as a list of    |
@@ -2349,8 +2349,8 @@
    secret, service, stage, stream, streamlit, table, task, user, view, warehouse  
                                                                                   
   +- Arguments ------------------------------------------------------------------+
-  | *    object_type      TEXT  Type of object. For example table, procedure,    |
-  |                             streamlit.                                       |
+  | *    object_type      TEXT  Type of object. For example table, database,     |
+  |                             compute-pool.                                    |
   |                             [required]                                       |
   | *    object_name      TEXT  Name of the object [default: None] [required]    |
   +------------------------------------------------------------------------------+
@@ -2424,8 +2424,8 @@
    task, user, view, warehouse                                                    
                                                                                   
   +- Arguments ------------------------------------------------------------------+
-  | *    object_type      TEXT  Type of object. For example table, procedure,    |
-  |                             streamlit.                                       |
+  | *    object_type      TEXT  Type of object. For example table, database,     |
+  |                             compute-pool.                                    |
   |                             [required]                                       |
   | *    object_name      TEXT  Name of the object [default: None] [required]    |
   +------------------------------------------------------------------------------+
@@ -2499,8 +2499,8 @@
    task, user, view, warehouse                                                    
                                                                                   
   +- Arguments ------------------------------------------------------------------+
-  | *    object_type      TEXT  Type of object. For example table, procedure,    |
-  |                             streamlit.                                       |
+  | *    object_type      TEXT  Type of object. For example table, database,     |
+  |                             compute-pool.                                    |
   |                             [required]                                       |
   +------------------------------------------------------------------------------+
   +- Options --------------------------------------------------------------------+

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/tests/api/test_rest_api.py

@@ -18,7 +18,7 @@ from typing import Any, Dict, List
 from unittest import mock
 
 import pytest
-from snowflake.cli.api.rest_api import RestApi
+from snowflake.cli.api.rest_api import CannotDetermineCreateURLException, RestApi
 from snowflake.connector.errors import InterfaceError
 
 _DUMMY_SERVER_URL = "https://DUMMY_SERVER_URL"
@@ -106,15 +106,20 @@ def test_determine_create_url(mock_rest_connection, number_of_fails):
 
     a_type = "a_type"
     urls = [
-        f"/api/v2/{a_type}/",
-        f"/api/v2/databases/DB/{a_type}/",
-        f"/api/v2/databases/DB/schemas/SCHEMA/{a_type}/",
-        None,
+        f"/api/v2/{a_type}s/",
+        f"/api/v2/databases/DB/{a_type}s/",
+        f"/api/v2/databases/DB/schemas/SCHEMA/{a_type}s/",
     ]
 
     rest = RestApi(mock_rest_connection.connection)
-    result = rest.determine_url_for_create_query(plural_object_type=a_type)
-    assert result == urls[number_of_fails]
+    # mock additional check
+    rest._fetch_endpoint_exists = lambda _: True  # noqa: SLF001
+
+    try:
+        result = rest.determine_url_for_create_query(a_type)
+        assert result == urls[number_of_fails]
+    except CannotDetermineCreateURLException:
+        assert number_of_fails == 3
 
     mock_rest_connection.assert_rest_fetch_calls_matches(
         [

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/tests/test_config.py

@@ -137,9 +137,12 @@ def test_get_all_connections(test_snowcli_config):
 
 
 @mock.patch("snowflake.cli.api.config.CONFIG_MANAGER")
+@mock.patch("snowflake.cli.api.config.get_config_section")
 def test_create_default_config_if_not_exists_with_proper_permissions(
+    mock_get_config_section,
     mock_config_manager,
 ):
+    mock_get_config_section.return_value = {}
     with TemporaryDirectory() as tmp_dir:
         config_path = Path(f"{tmp_dir}/snowflake/config.toml")
         mock_config_manager.file_path = config_path

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/tests/test_logs.py

@@ -65,12 +65,17 @@ def setup_config_and_logs(snowflake_home):
         )
         config_path.chmod(0o700)
 
+        # Make sure we start without any leftovers
+        shutil.rmtree(logs_path, ignore_errors=True)
         clean_logging_handlers()
+
+        # Setup loggers
         config_init(config_path)
         loggers.create_loggers(verbose=verbose, debug=debug)
         assert len(_list_handlers()) == (2 if save_logs else 1)
+
         yield logs_path
-        shutil.rmtree(logs_path)
+        shutil.rmtree(logs_path, ignore_errors=True)
 
     return _setup_config_and_logs
 
@@ -94,7 +99,7 @@ def _list_handlers():
     return logging.getLogger("snowflake.cli").handlers
 
 
-def _get_logs_file(logs_path: Path) -> Path:
+def get_logs_file(logs_path: Path) -> Path:
     return next(logs_path.iterdir())
 
 
@@ -110,11 +115,11 @@ def assert_log_level(log_messages: str, expected_level: str) -> None:
 
 
 def assert_file_log_level(logs_path: Path, expected_level: str) -> None:
-    assert_log_level(_get_logs_file(logs_path).read_text(), expected_level)
+    assert_log_level(get_logs_file(logs_path).read_text(), expected_level)
 
 
 def assert_log_is_empty(logs_path: Path) -> None:
-    assert _get_logs_file(logs_path).read_text() == ""
+    assert get_logs_file(logs_path).read_text() == ""
 
 
 def test_logs_section_appears_in_fresh_config_file(temp_dir):
@@ -141,7 +146,7 @@ def test_default_logs_location_is_created_automatically(setup_config_and_logs):
 def test_logs_can_be_turned_off_by_config(setup_config_and_logs):
     with setup_config_and_logs(save_logs=False) as logs_path:
         print_log_messages()
-        assert_log_is_empty(logs_path)
+        assert not logs_path.exists()
 
 
 def test_logs_path_is_configurable(setup_config_and_logs):
@@ -205,4 +210,4 @@ def test_incorrect_log_level_in_config(setup_config_and_logs):
 def test_log_files_permissions(setup_config_and_logs):
     with setup_config_and_logs(save_logs=True) as logs_path:
         print_log_messages()
-        assert_file_permissions_are_strict(_get_logs_file(logs_path))
+        assert_file_permissions_are_strict(get_logs_file(logs_path))

{snowflake_cli_labs-2.6.0.dev0 → snowflake_cli_labs-2.6.1}/tests_integration/test_object.py

@@ -149,6 +149,20 @@ def test_show_drop_image_repository(runner, test_database, snowflake_session):
             },
         ),
         ("image-repository", {"name": "test_image_repo"}),
+        (
+            "table",
+            {
+                "name": "test_table",
+                "columns": [{"name": "col1", "datatype": "number", "nullable": False}],
+                "constraints": [
+                    {
+                        "name": "prim_key",
+                        "column_names": ["col1"],
+                        "constraint_type": "PRIMARY KEY",
+                    }
+                ],
+            },
+        ),
     ],
 )
 @pytest.mark.integration
@@ -185,13 +199,14 @@ def test_create(object_type, object_definition, runner, test_database):
         _test_create(["--json", json.dumps(object_definition)])
     # test key=value format
     with _cleanup_object():
-        list_definition = [f"{key}={value}" for key, value in object_definition.items()]
+        list_definition = [
+            f"{key}={json.dumps(value)}" for key, value in object_definition.items()
+        ]
         _test_create(list_definition)
 
 
 @pytest.mark.integration
-def test_create_errors(runner, test_database, caplog):
-
+def test_create_error_conflict(runner, test_database, caplog):
     # conflict - an object already exists
     schema_name = "schema_noble_knight"
     result = runner.invoke_with_connection(
@@ -207,6 +222,9 @@ def test_create_errors(runner, test_database, caplog):
     assert "409 Conflict" in caplog.text
     caplog.clear()
 
+
+@pytest.mark.integration
+def test_create_error_misspelled_argument(runner, test_database, caplog):
     # misspelled argument
     schema_name = "another_schema_name"
     result = runner.invoke_with_connection(
@@ -220,13 +238,67 @@ def test_create_errors(runner, test_database, caplog):
     assert "HTTP 400: Bad Request" in caplog.text
     caplog.clear()
 
+
+@pytest.mark.integration
+def test_create_error_unsupported_type(runner, test_database):
     # object type that don't exist
     result = runner.invoke_with_connection(
-        ["object", "create", "type_that_does_not_exist", "name=anything", "--debug"]
+        ["object", "create", "type_that_does_not_exist", "name=anything"]
+    )
+    assert result.exit_code == 1
+    assert "Error" in result.output
+    assert (
+        "Create operation for type type_that_does_not_exist is not supported."
+        in result.output
+    )
+    assert "using `sql -q 'CREATE ...'` command." in result.output
+
+
+@pytest.mark.integration
+def test_create_error_database_not_exist(runner):
+    # database does not exist
+    result = runner.invoke_with_connection(
+        [
+            "object",
+            "create",
+            "schema",
+            "name=test_schema",
+            "--database",
+            "this_db_does_not_exist",
+        ]
+    )
+    assert result.exit_code == 1, result.output
+    assert "Error" in result.output
+    assert "Database 'THIS_DB_DOES_NOT_EXIST' does not exist." in result.output
+
+
+@pytest.mark.integration
+def test_create_error_schema_not_exist(runner, test_database):
+    # schema does not exist
+    result = runner.invoke_with_connection(
+        [
+            "object",
+            "create",
+            "image-repository",
+            "name=test_schema",
+            "--schema",
+            "this_schema_does_not_exist",
+        ]
+    )
+    assert result.exit_code == 1, result.output
+    assert "Error" in result.output
+    assert "Schema 'THIS_SCHEMA_DOES_NOT_EXIST' does not exist." in result.output
+
+
+@pytest.mark.integration
+def test_create_error_undefined_database(runner):
+    # undefined database
+    result = runner.invoke_with_connection(
+        ["object", "create", "schema", f"name=test_schema"]
     )
-    assert result.exit_code == 0
+    assert result.exit_code == 1, result.output
+    assert "Error" in result.output
     assert (
-        "Create operation for type type_that_does_not_exist is not supported. Try using `sql -q 'CREATE ...'` command"
+        "Database not defined in connection. Please try again with `--database` flag."
         in result.output
     )
-    assert "404 Not Found" in caplog.text