Fixes #7753: Fix regression in run-operation to not require the nam…

…e of the package to run (#7811)

.changes/unreleased/Fixes-20230606-145217.yaml

@@ -0,0 +1,7 @@
+kind: Fixes
+body: Fix regression in `run-operation` to not require the name of the package to
+  run
+time: 2023-06-06T14:52:17.38538-07:00
+custom:
+  Author: aranke
+  Issue: "7753"

core/dbt/task/run_operation.py

@@ -16,6 +16,7 @@
     RunningOperationUncaughtError,
     LogDebugStackTrace,
 )
+from dbt.exceptions import DbtInternalError
 from dbt.node_types import NodeType
 from dbt.task.base import ConfiguredTask
 
@@ -28,14 +29,13 @@ def _get_macro_parts(self):
         if "." in macro_name:
             package_name, macro_name = macro_name.split(".", 1)
         else:
-            package_name = self.config.project_name
+            package_name = None
 
         return package_name, macro_name
 
-    def _run_unsafe(self) -> agate.Table:
+    def _run_unsafe(self, package_name, macro_name) -> agate.Table:
         adapter = get_adapter(self.config)
 
-        package_name, macro_name = self._get_macro_parts()
         macro_kwargs = self.args.args
 
         with adapter.connection_named("macro_{}".format(macro_name)):
@@ -52,8 +52,10 @@ def run(self) -> RunResultsArtifact:
 
         success = True
 
+        package_name, macro_name = self._get_macro_parts()
+
         try:
-            self._run_unsafe()
+            self._run_unsafe(package_name, macro_name)
         except dbt.exceptions.Exception as exc:
             fire_event(RunningOperationCaughtError(exc=str(exc)))
             fire_event(LogDebugStackTrace(exc_info=traceback.format_exc()))
@@ -65,9 +67,19 @@ def run(self) -> RunResultsArtifact:
 
         end = datetime.utcnow()
 
-        package_name, macro_name = self._get_macro_parts()
-        fqn = [NodeType.Operation, package_name, macro_name]
-        unique_id = ".".join(fqn)
+        macro = (
+            self.manifest.find_macro_by_name(macro_name, self.config.project_name, package_name)
+            if self.manifest
+            else None
+        )
+
+        if macro:
+            unique_id = macro.unique_id
+            fqn = unique_id.split(".")
+        else:
+            raise DbtInternalError(
+                f"dbt could not find a macro with the name '{macro_name}' in any package"
+            )
 
         run_result = RunResult(
             adapter_response={},

tests/functional/artifacts/test_artifacts.py

@@ -690,7 +690,7 @@ def test_run_operation(self, project):
         results, log_output = run_dbt_and_capture(["run-operation", "alter_timezone"])
         assert len(results) == 1
         assert results[0].status == RunStatus.Success
-        assert results[0].unique_id == "operation.test.alter_timezone"
+        assert results[0].unique_id == "macro.test.alter_timezone"
         assert "Timezone set to: America/Los_Angeles" in log_output
 
     def test_run_model_with_operation(self, project):

tests/functional/retry/test_retry.py

@@ -134,7 +134,7 @@ def test_run_operation(self, project):
         )
 
         expected_statuses = {
-            "operation.test.alter_timezone": RunStatus.Error,
+            "macro.test.alter_timezone": RunStatus.Error,
         }
 
         assert {n.unique_id: n.status for n in results.results} == expected_statuses

tests/functional/run_operations/test_run_operations.py

@@ -1,8 +1,18 @@
 import os
+
 import pytest
 import yaml
 
-from dbt.tests.util import check_table_does_exist, run_dbt
+from dbt.exceptions import DbtInternalError
+from dbt.tests.util import (
+    check_table_does_exist,
+    run_dbt,
+    write_file,
+    mkdir,
+    run_dbt_and_capture,
+    rm_dir,
+    rm_file,
+)
 from tests.functional.run_operations.fixtures import happy_macros_sql, sad_macros_sql, model_sql
 
 
@@ -66,7 +76,11 @@ def test_macro_exception(self, project):
         self.run_operation("syntax_error", False)
 
     def test_macro_missing(self, project):
-        self.run_operation("this_macro_does_not_exist", False)
+        with pytest.raises(
+            DbtInternalError,
+            match="dbt could not find a macro with the name 'this_macro_does_not_exist' in any package",
+        ):
+            self.run_operation("this_macro_does_not_exist", False)
 
     def test_cannot_connect(self, project):
         self.run_operation("no_args", extra_args=["--target", "noaccess"], expect_pass=False)
@@ -90,3 +104,38 @@ def test_access_graph(self, project):
     def test_print(self, project):
         # Tests that calling the `print()` macro does not cause an exception
         self.run_operation("print_something")
+
+    def test_run_operation_local_macro(self, project):
+        pkg_macro = """
+{% macro something_cool() %}
+    {{ log("something cool", info=true) }}
+{% endmacro %}
+        """
+
+        mkdir("pkg/macros")
+
+        write_file(pkg_macro, "pkg/macros/something_cool.sql")
+
+        pkg_yaml = """
+packages:
+    - local: pkg
+        """
+
+        write_file(pkg_yaml, "packages.yml")
+
+        pkg_dbt_project = """
+name: 'pkg'
+        """
+
+        write_file(pkg_dbt_project, "pkg/dbt_project.yml")
+
+        run_dbt(["deps"])
+
+        results, log_output = run_dbt_and_capture(["run-operation", "something_cool"])
+        assert "something cool" in log_output
+
+        results, log_output = run_dbt_and_capture(["run-operation", "pkg.something_cool"])
+        assert "something cool" in log_output
+
+        rm_dir("pkg")
+        rm_file("packages.yml")