refactor: parse_dag_directory take a path

tdp/core/collection/__init__.py

@@ -0,0 +1,9 @@
+# Copyright 2022 TOSIT.IO
+# SPDX-License-Identifier: Apache-2.0
+
+from .collection import (
+    Collection,
+    MissingMandatoryDirectoryError,
+    PathDoesNotExistsError,
+    PathIsNotADirectoryError,
+)

tdp/core/collection.py → tdp/core/collection/collection.py

@@ -8,9 +8,7 @@
 from pathlib import Path
 from typing import Optional
 
-import yaml
-from pydantic import BaseModel, ConfigDict, ValidationError
-
+from tdp.core.collection.read_dag import TDPLibDagNodeModel, read_dag_directory
 from tdp.core.constants import (
     DAG_DIRECTORY_NAME,
     DEFAULT_VARS_DIRECTORY_NAME,
@@ -25,11 +23,6 @@
 from tdp.core.variables.schema import ServiceCollectionSchema
 from tdp.core.variables.schema.exceptions import InvalidSchemaError
 
-try:
-    from yaml import CLoader as Loader
-except ImportError:
-    from yaml import Loader
-
 MANDATORY_DIRECTORIES = [
     DAG_DIRECTORY_NAME,
     DEFAULT_VARS_DIRECTORY_NAME,
@@ -126,7 +119,7 @@ def schema_directory(self) -> Path:
     @property
     def dag_nodes(self) -> Generator[TDPLibDagNodeModel, None, None]:
         """Read DAG nodes."""
-        return read_dag_directory(self._path)
+        return read_dag_directory(self.dag_directory)
 
     @property
     def playbooks(self) -> dict[str, Playbook]:
@@ -252,56 +245,3 @@ def read_hosts_from_playbook(
             return inventory_reader.get_hosts_from_playbook(fd)
     except Exception as e:
         raise ValueError(f"Can't parse playbook {playbook_path}.") from e
-
-
-def read_dag_directory(
-    collection_path: Path, dag_directory_name=DAG_DIRECTORY_NAME
-) -> Generator[TDPLibDagNodeModel, None, None]:
-    """Get the DAG nodes of a collection.
-
-    Args:
-        collection_path: Path to the collection.
-        dag_directory_name: Name of the DAG directory.
-
-    Returns:
-        List of DAG nodes.
-    """
-    for dag_file in (collection_path / dag_directory_name).glob("*" + YML_EXTENSION):
-        yield from read_dag_file(dag_file)
-
-
-class TDPLibDagNodeModel(BaseModel):
-    """Model for a TDP operation defined in a tdp_lib_dag file."""
-
-    model_config = ConfigDict(extra="ignore")
-
-    name: str
-    depends_on: list[str] = []
-
-
-class TDPLibDagModel(BaseModel):
-    """Model for a TDP DAG defined in a tdp_lib_dag file."""
-
-    model_config = ConfigDict(extra="ignore")
-
-    operations: list[TDPLibDagNodeModel]
-
-
-def read_dag_file(
-    file_path: Path,
-) -> Generator[TDPLibDagNodeModel, None, None]:
-    """Read a tdp_lib_dag file and return a list of DAG operations.
-
-    Args:
-        file_path: Path to the tdp_lib_dag file.
-    """
-    with file_path.open("r") as operations_file:
-        file_content = yaml.load(operations_file, Loader=Loader)
-
-    try:
-        tdp_lib_dag = TDPLibDagModel(operations=file_content)
-        for operation in tdp_lib_dag.operations:
-            yield operation
-    except ValidationError as e:
-        logger.error(f"Error while parsing tdp_lib_dag file {file_path}: {e}")
-        raise

tdp/core/collection/read_dag.py

@@ -0,0 +1,74 @@
+# Copyright 2022 TOSIT.IO
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import logging
+from collections.abc import Generator
+from pathlib import Path
+
+import yaml
+from pydantic import BaseModel, ConfigDict, ValidationError
+
+from tdp.core.constants import (
+    YML_EXTENSION,
+)
+
+try:
+    from yaml import CLoader as Loader
+except ImportError:
+    from yaml import Loader
+
+logger = logging.getLogger(__name__)
+
+
+def read_dag_directory(
+    directory_path: Path,
+) -> Generator[TDPLibDagNodeModel, None, None]:
+    """Get the DAG nodes of a collection.
+
+    Args:
+        directory_path: Path to the DAG directory.
+
+    Returns:
+        List of DAG nodes.
+    """
+    for dag_file in (directory_path).glob("*" + YML_EXTENSION):
+        yield from read_dag_file(dag_file)
+
+
+class TDPLibDagNodeModel(BaseModel):
+    """Model for a TDP operation defined in a tdp_lib_dag file."""
+
+    model_config = ConfigDict(extra="ignore")
+
+    name: str
+    depends_on: list[str] = []
+
+
+class TDPLibDagModel(BaseModel):
+    """Model for a TDP DAG defined in a tdp_lib_dag file."""
+
+    model_config = ConfigDict(extra="ignore")
+
+    operations: list[TDPLibDagNodeModel]
+
+
+def read_dag_file(
+    file_path: Path,
+) -> Generator[TDPLibDagNodeModel, None, None]:
+    """Read a tdp_lib_dag file and return a list of DAG operations.
+
+    Args:
+        file_path: Path to the tdp_lib_dag file.
+    """
+    with file_path.open("r") as operations_file:
+        file_content = yaml.load(operations_file, Loader=Loader)
+
+    try:
+        tdp_lib_dag = TDPLibDagModel(operations=file_content)
+        for operation in tdp_lib_dag.operations:
+            yield operation
+    except ValidationError as e:
+        logger.error(f"Error while parsing tdp_lib_dag file {file_path}: {e}")
+        raise

tdp/core/variables/service_variables.py

@@ -10,8 +10,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
-from tdp.core.collection import YML_EXTENSION
-from tdp.core.constants import SERVICE_NAME_MAX_LENGTH
+from tdp.core.constants import SERVICE_NAME_MAX_LENGTH, YML_EXTENSION
 from tdp.core.types import PathLike
 from tdp.core.variables.schema.exceptions import SchemaValidationError
 from tdp.core.variables.variables import (

tests/unit/core/collection/__init__.py

@@ -0,0 +1,2 @@
+# Copyright 2022 TOSIT.IO
+# SPDX-License-Identifier: Apache-2.0

tests/unit/core/collection/test_parse_dag.py

@@ -0,0 +1,90 @@
+# Copyright 2022 TOSIT.IO
+# SPDX-License-Identifier: Apache-2.0
+
+from pathlib import Path
+
+import pytest
+from pydantic import ValidationError
+
+from tdp.core.collection.read_dag import read_dag_directory, read_dag_file
+
+
+def test_read_dag_file(tmp_path: Path):
+    dag_file_path = tmp_path / "dag_file.yml"
+    dag_file_path.write_text(
+        """---
+- name: s1_c1_a
+  depends_on:
+    - sx_cx_a
+- name: s2_c2_a
+  depends_on:
+    - s1_c1_a
+- name: s3_c3_a
+  depends_on:
+    - sx_cx_a
+    - sy_cy_a
+"""
+    )
+    operations = list(read_dag_file(dag_file_path))
+    assert len(operations) == 3
+    assert operations[0].name == "s1_c1_a"
+    assert operations[0].depends_on == ["sx_cx_a"]
+    assert operations[1].name == "s2_c2_a"
+    assert operations[1].depends_on == ["s1_c1_a"]
+    assert operations[2].name == "s3_c3_a"
+    assert operations[2].depends_on == ["sx_cx_a", "sy_cy_a"]
+
+
+def test_read_dag_file_empty(tmp_path: Path):
+    dag_file_path = tmp_path / "dag_file.yml"
+    dag_file_path.write_text("")
+    with pytest.raises(ValidationError):
+        list(read_dag_file(dag_file_path))
+
+
+def test_read_dag_file_with_additional_props(tmp_path: Path):
+    dag_file_path = tmp_path / "dag_file.yml"
+    dag_file_path.write_text(
+        """---
+- name: s1_c1_a
+  depends_on:
+    - sx_cx_a
+  foo: bar
+"""
+    )
+    operations = list(read_dag_file(dag_file_path))
+    assert len(operations) == 1
+    assert operations[0].name == "s1_c1_a"
+    assert operations[0].depends_on == ["sx_cx_a"]
+
+
+def test_get_collection_dag_nodes(tmp_path: Path):
+    collection_path = tmp_path / "collection"
+    dag_directory = "dag"
+    (dag_directory_path := collection_path / dag_directory).mkdir(
+        parents=True, exist_ok=True
+    )
+    dag_file_1 = dag_directory_path / "dag1.yml"
+    dag_file_2 = dag_directory_path / "dag2.yml"
+    dag_file_1.write_text(
+        """---
+- name: s1_c1_a
+  depends_on:
+    - sx_cx_a
+"""
+    )
+    dag_file_2.write_text(
+        """---
+- name: s2_c2_a
+  depends_on:
+    - s1_c1_a
+"""
+    )
+    dag_nodes = list(read_dag_directory(dag_directory_path))
+    assert len(dag_nodes) == 2
+    assert any(
+        node.name == "s1_c1_a" and node.depends_on == ["sx_cx_a"] for node in dag_nodes
+    )
+    assert any(
+        node.name == "s2_c2_a" and node.depends_on == ["s1_c1_a"] for node in dag_nodes
+    )

tests/unit/core/test_collection.py

@@ -4,17 +4,14 @@
 from pathlib import Path
 
 import pytest
-from pydantic import ValidationError
 
-from tdp.core.collection import (
+from tdp.core.collection.collection import (
     Collection,
     MissingMandatoryDirectoryError,
     PathDoesNotExistsError,
     PathIsNotADirectoryError,
     check_collection_structure,
-    read_dag_directory,
     get_collection_playbooks,
-    read_dag_file,
     read_hosts_from_playbook,
 )
 from tdp.core.constants import (
@@ -144,84 +141,3 @@ def test_check_collection_structure_valid_collection(tmp_path: Path):
     ):
         (collection_path / mandatory_directory).mkdir(parents=True, exist_ok=True)
     assert check_collection_structure(collection_path) is None
-
-
-def test_read_dag_file(tmp_path: Path):
-    dag_file_path = tmp_path / "dag_file.yml"
-    dag_file_path.write_text(
-        """---
-- name: s1_c1_a
-  depends_on:
-    - sx_cx_a
-- name: s2_c2_a
-  depends_on:
-    - s1_c1_a
-- name: s3_c3_a
-  depends_on:
-    - sx_cx_a
-    - sy_cy_a
-"""
-    )
-    operations = list(read_dag_file(dag_file_path))
-    assert len(operations) == 3
-    assert operations[0].name == "s1_c1_a"
-    assert operations[0].depends_on == ["sx_cx_a"]
-    assert operations[1].name == "s2_c2_a"
-    assert operations[1].depends_on == ["s1_c1_a"]
-    assert operations[2].name == "s3_c3_a"
-    assert operations[2].depends_on == ["sx_cx_a", "sy_cy_a"]
-
-
-def test_read_dag_file_empty(tmp_path: Path):
-    dag_file_path = tmp_path / "dag_file.yml"
-    dag_file_path.write_text("")
-    with pytest.raises(ValidationError):
-        list(read_dag_file(dag_file_path))
-
-
-def test_read_dag_file_with_additional_props(tmp_path: Path):
-    dag_file_path = tmp_path / "dag_file.yml"
-    dag_file_path.write_text(
-        """---
-- name: s1_c1_a
-  depends_on:
-    - sx_cx_a
-  foo: bar
-"""
-    )
-    operations = list(read_dag_file(dag_file_path))
-    assert len(operations) == 1
-    assert operations[0].name == "s1_c1_a"
-    assert operations[0].depends_on == ["sx_cx_a"]
-
-
-def test_get_collection_dag_nodes(tmp_path: Path):
-    collection_path = tmp_path / "collection"
-    dag_directory = "dag"
-    (dag_directory_path := collection_path / dag_directory).mkdir(
-        parents=True, exist_ok=True
-    )
-    dag_file_1 = dag_directory_path / "dag1.yml"
-    dag_file_2 = dag_directory_path / "dag2.yml"
-    dag_file_1.write_text(
-        """---
-- name: s1_c1_a
-  depends_on:
-    - sx_cx_a
-"""
-    )
-    dag_file_2.write_text(
-        """---
-- name: s2_c2_a
-  depends_on:
-    - s1_c1_a
-"""
-    )
-    dag_nodes = list(read_dag_directory(collection_path, dag_directory))
-    assert len(dag_nodes) == 2
-    assert any(
-        node.name == "s1_c1_a" and node.depends_on == ["sx_cx_a"] for node in dag_nodes
-    )
-    assert any(
-        node.name == "s2_c2_a" and node.depends_on == ["s1_c1_a"] for node in dag_nodes
-    )