removed unnecessary parameter from validate_vars_not_in_both

Author: sriramr98

core/dbt/config/project.py

@@ -122,7 +122,6 @@ def vars_data_from_root(project_root: str) -> Dict[str, Any]:
 
 
 def validate_vars_not_in_both(
-    project_root: str,
     project_dict: Dict[str, Any],
     has_vars_file: bool,
 ) -> None:
@@ -132,7 +131,6 @@ def validate_vars_not_in_both(
     if has_vars_file and has_project_vars:
         raise DbtProjectError(
             f"Variables cannot be defined in both {VARS_FILE_NAME} and {DBT_PROJECT_FILE_NAME}. "
-            f"Please use only one location for defining variables in project at '{project_root}'."
         )
 
 
@@ -834,7 +832,7 @@ def from_project_root(
         )
 
         # Check mutual exclusivity before rendering
-        validate_vars_not_in_both(project_root, partial.project_dict, bool(vars_from_file))
+        validate_vars_not_in_both(partial.project_dict, bool(vars_from_file))
 
         return partial.render(renderer, vars_from_file=vars_from_file)
 

tests/unit/config/test_vars_file.py

@@ -76,20 +76,20 @@ class TestValidateVarsNotInBoth:
     def test_no_error_when_no_vars_file_and_no_project_vars(self) -> None:
         """Should not raise when neither vars.yml nor dbt_project.yml have vars."""
         project_dict: Dict[str, Any] = {"name": "test_project"}
-        validate_vars_not_in_both("/test/path", project_dict, has_vars_file=False)
+        validate_vars_not_in_both(project_dict, has_vars_file=False)
 
     def test_no_error_when_only_vars_file_has_vars(self) -> None:
         """Should not raise when only vars.yml has vars."""
         project_dict: Dict[str, Any] = {"name": "test_project"}
-        validate_vars_not_in_both("/test/path", project_dict, has_vars_file=True)
+        validate_vars_not_in_both(project_dict, has_vars_file=True)
 
     def test_no_error_when_only_project_has_vars(self) -> None:
         """Should not raise when only dbt_project.yml has vars."""
         project_dict: Dict[str, Any] = {
             "name": "test_project",
             "vars": {"my_var": "my_value"},
         }
-        validate_vars_not_in_both("/test/path", project_dict, has_vars_file=False)
+        validate_vars_not_in_both(project_dict, has_vars_file=False)
 
     def test_error_when_both_have_vars(self) -> None:
         """Should raise DbtProjectError when both sources have vars."""
@@ -98,11 +98,10 @@ def test_error_when_both_have_vars(self) -> None:
             "vars": {"my_var": "my_value"},
         }
         with pytest.raises(DbtProjectError) as exc_info:
-            validate_vars_not_in_both("/test/path", project_dict, has_vars_file=True)
+            validate_vars_not_in_both(project_dict, has_vars_file=True)
 
         assert "vars.yml" in str(exc_info.value)
         assert "dbt_project.yml" in str(exc_info.value)
-        assert "/test/path" in str(exc_info.value)
 
     def test_no_error_when_project_vars_is_empty(self) -> None:
         """Should not raise when dbt_project.yml vars is empty dict."""
@@ -111,15 +110,15 @@ def test_no_error_when_project_vars_is_empty(self) -> None:
             "vars": {},
         }
         # Empty vars dict is falsy, so this should not raise
-        validate_vars_not_in_both("/test/path", project_dict, has_vars_file=True)
+        validate_vars_not_in_both(project_dict, has_vars_file=True)
 
     def test_no_error_when_project_vars_is_none(self) -> None:
         """Should not raise when dbt_project.yml vars is None."""
         project_dict: Dict[str, Any] = {
             "name": "test_project",
             "vars": None,
         }
-        validate_vars_not_in_both("/test/path", project_dict, has_vars_file=True)
+        validate_vars_not_in_both(project_dict, has_vars_file=True)
 
 
 class TestVarProviderWithVarsFromFile: