feat: [SNOW-1890085] remove options for dbt_version and dbt_adapter_version

Author: sfc-gh-jwilkowski

src/snowflake/cli/_plugins/dbt/commands.py

@@ -70,14 +70,6 @@ def deploy_dbt(
         False,
         help="Overwrites conflicting files in the project, if any.",
     ),
-    dbt_version: Optional[str] = typer.Option(
-        None,
-        help="Version of dbt tool to be used. Taken from dbt_project.yml if not provided.",
-    ),
-    dbt_adapter_version: Optional[str] = typer.Option(
-        None,
-        help="dbt-snowflake adapter version to be used",
-    ),
     **options,
 ) -> CommandResult:
     """
@@ -91,8 +83,6 @@ def deploy_dbt(
         DBTManager().deploy(
             path.resolve(),
             name,
-            dbt_version,
-            dbt_adapter_version,
             force=force,
         )
     )

src/snowflake/cli/_plugins/dbt/manager.py

@@ -14,14 +14,11 @@
 
 from __future__ import annotations
 
-from typing import Optional
-
-import yaml
 from click import ClickException
 from snowflake.cli._plugins.object.manager import ObjectManager
 from snowflake.cli._plugins.stage.manager import StageManager
 from snowflake.cli.api.console import cli_console
-from snowflake.cli.api.constants import DEFAULT_SIZE_LIMIT_MB, ObjectType
+from snowflake.cli.api.constants import ObjectType
 from snowflake.cli.api.identifiers import FQN
 from snowflake.cli.api.secure_path import SecurePath
 from snowflake.cli.api.sql_execution import SqlExecutionMixin
@@ -43,24 +40,12 @@ def deploy(
         self,
         path: SecurePath,
         name: FQN,
-        dbt_version: Optional[str],
-        dbt_adapter_version: str,
         force: bool,
     ) -> SnowflakeCursor:
         dbt_project_path = path / "dbt_project.yml"
         if not dbt_project_path.exists():
             raise ClickException(f"dbt_project.yml does not exist in provided path.")
 
-        if dbt_version is None:
-            with dbt_project_path.open(read_file_limit_mb=DEFAULT_SIZE_LIMIT_MB) as fd:
-                dbt_project_config = yaml.safe_load(fd)
-                try:
-                    dbt_version = dbt_project_config["version"]
-                except (KeyError, TypeError):
-                    raise ClickException(
-                        f"dbt-version was not provided and is not available in dbt_project.yml"
-                    )
-
         if self.exists(name=name) and force is not True:
             raise ClickException(
                 f"DBT project {name} already exists. Use --force flag to overwrite"
@@ -78,11 +63,8 @@ def deploy(
 
         with cli_console.phase("Creating DBT project"):
             query = f"""{'CREATE OR REPLACE' if force is True else 'CREATE'} DBT PROJECT {name}
-FROM {stage_name}
-DBT_VERSION='{dbt_version}'"""
+FROM {stage_name}"""
 
-            if dbt_adapter_version:
-                query += f"\nDBT_ADAPTER_VERSION='{dbt_adapter_version}'"
             return self.execute_query(query)
 
     def execute(self, dbt_command: str, name: str, run_async: bool, *dbt_cli_args):

tests/dbt/test_dbt_commands.py

@@ -17,19 +17,9 @@
 from unittest import mock
 
 import pytest
-import yaml
 from snowflake.cli.api.identifiers import FQN
 
 
-@pytest.fixture
-def mock_connect(mock_ctx):
-    with mock.patch("snowflake.connector.connect") as _fixture:
-        ctx = mock_ctx()
-        _fixture.return_value = ctx
-        _fixture.mocked_ctx = _fixture.return_value
-        yield _fixture
-
-
 class TestDBTList:
     def test_list_command_alias(self, mock_connect, runner):
         result = runner.invoke(
@@ -67,8 +57,6 @@ def dbt_project_path(self, tmp_path_factory):
         source_path = tmp_path_factory.mktemp("dbt_project")
         dbt_file = source_path / "dbt_project.yml"
         dbt_file.touch()
-        with dbt_file.open(mode="w") as fd:
-            yaml.dump({"version": "1.2.3"}, fd)
         yield source_path
 
     @pytest.fixture
@@ -101,17 +89,14 @@ def test_deploys_project_from_source(
                 "deploy",
                 "TEST_PIPELINE",
                 f"--source={dbt_project_path}",
-                "--dbt-adapter-version=3.4.5",
             ]
         )
 
         assert result.exit_code == 0, result.output
         assert (
             mock_connect.mocked_ctx.get_query()
             == """CREATE DBT PROJECT TEST_PIPELINE
-FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage
-DBT_VERSION='1.2.3'
-DBT_ADAPTER_VERSION='3.4.5'"""
+FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage"""
         )
         stage_fqn = FQN.from_string(f"dbt_TEST_PIPELINE_stage").using_context()
         mock_create.assert_called_once_with(stage_fqn, temporary=True)
@@ -136,18 +121,14 @@ def test_dbt_version_from_option_has_precedence_over_file(
                 "deploy",
                 "TEST_PIPELINE",
                 f"--source={dbt_project_path}",
-                "--dbt-version=2.3.4",
-                "--dbt-adapter-version=3.4.5",
             ]
         )
 
         assert result.exit_code == 0, result.output
         assert (
             mock_connect.mocked_ctx.get_query()
             == """CREATE DBT PROJECT TEST_PIPELINE
-FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage
-DBT_VERSION='2.3.4'
-DBT_ADAPTER_VERSION='3.4.5'"""
+FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage"""
         )
 
     @pytest.mark.parametrize("exists", (True, False))
@@ -172,7 +153,6 @@ def test_force_flag_uses_create_or_replace(
                 "TEST_PIPELINE",
                 f"--source={dbt_project_path}",
                 "--force",
-                "--dbt-adapter-version=3.4.5",
             ]
         )
 
@@ -193,38 +173,13 @@ def test_raises_when_dbt_project_is_not_available(
                 "deploy",
                 "TEST_PIPELINE",
                 f"--source={dbt_project_path}",
-                "--dbt-adapter-version=3.4.5",
             ],
         )
 
         assert result.exit_code == 1, result.output
         assert "dbt_project.yml does not exist in provided path." in result.output
         assert mock_connect.mocked_ctx.get_query() == ""
 
-    def test_raises_when_dbt_project_version_is_not_specified(
-        self, dbt_project_path, mock_connect, runner
-    ):
-        dbt_file = dbt_project_path / "dbt_project.yml"
-        with dbt_file.open(mode="w") as fd:
-            yaml.dump({}, fd)
-
-        result = runner.invoke(
-            [
-                "dbt",
-                "deploy",
-                "TEST_PIPELINE",
-                f"--source={dbt_project_path}",
-                "--dbt-adapter-version=3.4.5",
-            ]
-        )
-
-        assert result.exit_code == 1, result.output
-        assert (
-            "dbt-version was not provided and is not available in dbt_project.yml"
-            in result.output
-        )
-        assert mock_connect.mocked_ctx.get_query() == ""
-
     def test_raises_when_dbt_project_exists_and_is_not_force(
         self, dbt_project_path, mock_connect, runner, mock_exists
     ):