feat: [SNOW-1966187] update commands according to backend implementation

Author: sfc-gh-jwilkowski

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

@@ -71,7 +71,8 @@ def deploy_dbt(
         None,
         help="Version of dbt tool to be used. Taken from dbt_project.yml if not provided.",
     ),
-    dbt_adapter_version: str = typer.Option(
+    dbt_adapter_version: Optional[str] = typer.Option(
+        None,
         help="dbt-snowflake adapter version to be used",
     ),
     execute_in_warehouse: Optional[str] = typer.Option(
@@ -82,7 +83,6 @@ def deploy_dbt(
     """
     Copy dbt files and create or update dbt on Snowflake project.
     """
-    # TODO: options for DBT version?
     if source is None:
         path = Path.cwd()
     else:
@@ -131,7 +131,6 @@ def before_callback(
     def _dbt_execute(
         ctx: typer.Context,
     ) -> CommandResult:
-        # TODO: figure out how to present logs to users
         dbt_cli_args = ctx.args
         dbt_command = ctx.command.name
         name = ctx.parent.params["name"]

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

@@ -41,7 +41,7 @@ def execute_query(self, query, **kwargs):
 
 class DBTManager(StdoutExecutionMixin):
     def list(self) -> SnowflakeCursor:  # noqa: A003
-        query = "SHOW DBT PROJECT"
+        query = "SHOW DBT PROJECTS"
         return self.execute_query(query)
 
     def deploy(
@@ -78,20 +78,18 @@ def deploy(
             cli_console.step(f"Copied {len(results)} files")
 
         with cli_console.phase("Creating DBT project"):
-            staged_dbt_project_path = self._get_dbt_project_stage_path(stage_name)
             query = f"""{'CREATE OR REPLACE' if force is True else 'CREATE'} DBT PROJECT {name}
-FROM {stage_name} MAIN_FILE='{staged_dbt_project_path}'
-DBT_VERSION='{dbt_version}' DBT_ADAPTER_VERSION='{dbt_adapter_version}'"""
+FROM {stage_name}
+DBT_VERSION='{dbt_version}'"""
+
+            if dbt_adapter_version:
+                query += f"\nDBT_ADAPTER_VERSION='{dbt_adapter_version}'"
             if execute_in_warehouse:
-                query += f" WAREHOUSE='{execute_in_warehouse}'"
+                query += f"\nWAREHOUSE='{execute_in_warehouse}'"
             return self.execute_query(query)
 
     def execute(self, dbt_command: str, name: str, *dbt_cli_args):
-        query = f"EXECUTE DBT PROJECT {name} {dbt_command}"
         if dbt_cli_args:
-            query += " " + " ".join([arg for arg in dbt_cli_args])
+            dbt_command = dbt_command + " " + " ".join([arg for arg in dbt_cli_args])
+        query = f"EXECUTE DBT PROJECT {name} args='{dbt_command.strip()}'"
         return self.execute_query(query)
-
-    @staticmethod
-    def _get_dbt_project_stage_path(stage_name):
-        return "/".join([stage_name, "dbt_project.yml"])

tests/dbt/test_dbt_commands.py

@@ -37,7 +37,7 @@ def test_dbt_list(self, mock_connect, runner):
         result = runner.invoke(["dbt", "list"])
 
         assert result.exit_code == 0, result.output
-        assert mock_connect.mocked_ctx.get_query() == "SHOW DBT PROJECT"
+        assert mock_connect.mocked_ctx.get_query() == "SHOW DBT PROJECTS"
 
 
 class TestDBTDeploy:
@@ -75,8 +75,9 @@ def test_deploys_project_from_source(
         assert (
             mock_connect.mocked_ctx.get_query()
             == """CREATE DBT PROJECT TEST_PIPELINE
-FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage MAIN_FILE='@MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage/dbt_project.yml'
-DBT_VERSION='1.2.3' DBT_ADAPTER_VERSION='3.4.5'"""
+FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage
+DBT_VERSION='1.2.3'
+DBT_ADAPTER_VERSION='3.4.5'"""
         )
         stage_fqn = FQN.from_string(f"dbt_TEST_PIPELINE_stage").using_context()
         mock_create.assert_called_once_with(stage_fqn, temporary=True)
@@ -104,8 +105,9 @@ def test_dbt_version_from_option_has_precedence_over_file(
         assert (
             mock_connect.mocked_ctx.get_query()
             == """CREATE DBT PROJECT TEST_PIPELINE
-FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage MAIN_FILE='@MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage/dbt_project.yml'
-DBT_VERSION='2.3.4' DBT_ADAPTER_VERSION='3.4.5'"""
+FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage
+DBT_VERSION='2.3.4'
+DBT_ADAPTER_VERSION='3.4.5'"""
         )
 
     @mock.patch("snowflake.cli._plugins.dbt.manager.StageManager.put_recursive")
@@ -149,8 +151,10 @@ def test_execute_in_warehouse(
         assert result.exit_code == 0, result.output
         assert mock_connect.mocked_ctx.get_query() == dedent(
             """CREATE DBT PROJECT TEST_PIPELINE
-FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage MAIN_FILE='@MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage/dbt_project.yml'
-DBT_VERSION='1.2.3' DBT_ADAPTER_VERSION='3.4.5' WAREHOUSE='XL'"""
+FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage
+DBT_VERSION='1.2.3'
+DBT_ADAPTER_VERSION='3.4.5'
+WAREHOUSE='XL'"""
         )
 
     def test_raises_when_dbt_project_is_not_available(
@@ -209,7 +213,7 @@ class TestDBTExecute:
                     "pipeline_name",
                     "test",
                 ],
-                "EXECUTE DBT PROJECT pipeline_name test",
+                "EXECUTE DBT PROJECT pipeline_name args='test'",
                 id="simple-command",
             ),
             pytest.param(
@@ -221,12 +225,12 @@ class TestDBTExecute:
                     "-f",
                     "--select @source:snowplow,tag:nightly models/export",
                 ],
-                "EXECUTE DBT PROJECT pipeline_name run -f --select @source:snowplow,tag:nightly models/export",
+                "EXECUTE DBT PROJECT pipeline_name args='run -f --select @source:snowplow,tag:nightly models/export'",
                 id="with-dbt-options",
             ),
             pytest.param(
                 ["dbt", "execute", "pipeline_name", "compile", "--vars '{foo:bar}'"],
-                "EXECUTE DBT PROJECT pipeline_name compile --vars '{foo:bar}'",
+                "EXECUTE DBT PROJECT pipeline_name args='compile --vars '{foo:bar}''",
                 id="with-dbt-vars",
             ),
             pytest.param(
@@ -242,7 +246,7 @@ class TestDBTExecute:
                     "--info",
                     "--config-file=/",
                 ],
-                "EXECUTE DBT PROJECT pipeline_name compile --format=TXT -v -h --debug --info --config-file=/",
+                "EXECUTE DBT PROJECT pipeline_name args='compile --format=TXT -v -h --debug --info --config-file=/'",
                 id="with-dbt-conflicting-options",
             ),
             pytest.param(
@@ -253,7 +257,7 @@ class TestDBTExecute:
                     "pipeline_name",
                     "compile",
                 ],
-                "EXECUTE DBT PROJECT pipeline_name compile",
+                "EXECUTE DBT PROJECT pipeline_name args='compile'",
                 id="with-cli-flag",
             ),
         ],