Merge pull request #181 from dbt-labs/fix/issue-180-directory-support

Author: b-per

docs/advanced_config/glob_config_files.md

@@ -14,4 +14,8 @@ dbt-jobs-as-code plan "jobs/**/*.yml" # (1)!
 
 1. Depending on your shell you might have to quote the pattern or not. For example, for `zsh` quoting is required as otherwise the shell will try to expand the pattern before passing it to the command.
 
-If the provided config is a directory, we automatically search for all the `*.yml` files in this directory. This is particularly relevant for users with a shell not supporting the `*` character.
+If the provided config is a directory, we automatically search for all the `*.yml` and `*.yaml` files in this directory. This is particularly relevant for users with a shell not supporting the `*` character.
+
+```bash
+dbt-jobs-as-code plan ./jobs  # Equivalent to ./jobs/*.yml + ./jobs/*.yaml
+```

src/dbt_jobs_as_code/loader/load.py

@@ -1,4 +1,5 @@
 import glob
+import os
 
 from beartype.typing import List, Optional, Set
 from jinja2 import Environment, StrictUndefined, meta
@@ -177,14 +178,37 @@ def _get_jinja_variables(input: str) -> Set[str]:
     return meta.find_undeclared_variables(parsed_input)
 
 
+def _resolve_pattern(pattern: str) -> List[str]:
+    """
+    Resolve a file pattern to a list of file paths.
+
+    If the pattern is a directory, it will be expanded to match all .yml and .yaml files
+    within that directory.
+
+    Args:
+        pattern: File path, directory path, or glob pattern
+
+    Returns:
+        List of matching file paths
+    """
+    if os.path.isdir(pattern):
+        # If a directory is provided, match all .yml and .yaml files in it
+        yml_files = glob.glob(os.path.join(pattern, "*.yml"))
+        yaml_files = glob.glob(os.path.join(pattern, "*.yaml"))
+        return yml_files + yaml_files
+    else:
+        return glob.glob(pattern)
+
+
 def resolve_file_paths(
     config_pattern: Optional[str], vars_pattern: Optional[str] = None
 ) -> tuple[List[str], List[str]]:
     """
     Resolve glob patterns to lists of file paths.
 
     Args:
-        config_pattern: Glob pattern for config files
+        config_pattern: Glob pattern, file path, or directory path for config files.
+            If a directory is provided, all .yml and .yaml files in it will be matched.
         vars_pattern: Optional glob pattern for vars files
 
     Returns:
@@ -196,13 +220,13 @@ def resolve_file_paths(
     if not config_pattern:
         return [], []
 
-    config_files = glob.glob(config_pattern)
+    config_files = _resolve_pattern(config_pattern)
     if not config_files:
         raise LoadingJobsYAMLError(f"No files found matching pattern: {config_pattern}")
 
     vars_files = []
     if vars_pattern:
-        vars_files = glob.glob(vars_pattern)
+        vars_files = _resolve_pattern(vars_pattern)
         if not vars_files:
             raise LoadingJobsYAMLError(f"No files found matching pattern: {vars_pattern}")
 

tests/loader/test_loader.py

@@ -393,6 +393,69 @@ def test_resolve_file_paths_with_glob(self, tmp_path):
         assert all(f.endswith(".yml") for f in config_files)
         assert vars_files == []
 
+    def test_resolve_file_paths_directory_with_yml_files(self, tmp_path):
+        """Test resolving a directory containing .yml files (issue #180)"""
+        jobs_dir = tmp_path / "jobs"
+        jobs_dir.mkdir()
+        (jobs_dir / "job1.yml").write_text("content1")
+        (jobs_dir / "job2.yml").write_text("content2")
+        (jobs_dir / "other.txt").write_text("should be ignored")
+
+        config_files, vars_files = resolve_file_paths(str(jobs_dir))
+        assert len(config_files) == 2
+        assert all(f.endswith(".yml") for f in config_files)
+        assert vars_files == []
+
+    def test_resolve_file_paths_directory_with_yaml_files(self, tmp_path):
+        """Test resolving a directory containing .yaml files (issue #180)"""
+        jobs_dir = tmp_path / "jobs"
+        jobs_dir.mkdir()
+        (jobs_dir / "job1.yaml").write_text("content1")
+        (jobs_dir / "job2.yaml").write_text("content2")
+
+        config_files, vars_files = resolve_file_paths(str(jobs_dir))
+        assert len(config_files) == 2
+        assert all(f.endswith(".yaml") for f in config_files)
+        assert vars_files == []
+
+    def test_resolve_file_paths_directory_with_mixed_yml_yaml(self, tmp_path):
+        """Test resolving a directory containing both .yml and .yaml files (issue #180)"""
+        jobs_dir = tmp_path / "jobs"
+        jobs_dir.mkdir()
+        (jobs_dir / "job1.yml").write_text("content1")
+        (jobs_dir / "job2.yaml").write_text("content2")
+        (jobs_dir / "job3.yml").write_text("content3")
+
+        config_files, vars_files = resolve_file_paths(str(jobs_dir))
+        assert len(config_files) == 3
+        yml_count = sum(1 for f in config_files if f.endswith(".yml"))
+        yaml_count = sum(1 for f in config_files if f.endswith(".yaml"))
+        assert yml_count == 2
+        assert yaml_count == 1
+
+    def test_resolve_file_paths_empty_directory(self, tmp_path):
+        """Test error when directory contains no yml/yaml files (issue #180)"""
+        empty_dir = tmp_path / "empty"
+        empty_dir.mkdir()
+        (empty_dir / "other.txt").write_text("not a yaml file")
+
+        with pytest.raises(LoadingJobsYAMLError, match="No files found matching pattern"):
+            resolve_file_paths(str(empty_dir))
+
+    def test_resolve_file_paths_directory_for_vars(self, tmp_path):
+        """Test resolving a directory for vars files (issue #180)"""
+        config_file = tmp_path / "config.yml"
+        config_file.write_text("content")
+
+        vars_dir = tmp_path / "vars"
+        vars_dir.mkdir()
+        (vars_dir / "vars1.yml").write_text("var1: value1")
+        (vars_dir / "vars2.yaml").write_text("var2: value2")
+
+        config_files, vars_files = resolve_file_paths(str(config_file), str(vars_dir))
+        assert config_files == [str(config_file)]
+        assert len(vars_files) == 2
+
     def test_resolve_file_paths_with_vars(self, tmp_path):
         """Test resolving both config and vars files"""
         config_file = tmp_path / "config.yml"