Skip to content

Add infrahub.tasks as built-in logger to InfrahubGenerator class #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 20, 2025
Merged

Add infrahub.tasks as built-in logger to InfrahubGenerator class #274

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9863019
Test building in logger to InfrahubGenerator class to allow logs to b…
FragmentedPacket Feb 15, 2025
a043929
Remove unused logging import.
FragmentedPacket Feb 15, 2025
357c46f
Add changelog to describe change.
FragmentedPacket Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions infrahub_sdk/ctl/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ..ctl import config
from ..ctl.client import initialize_client
from ..ctl.repository import get_repository_config
from ..ctl.utils import execute_graphql_query, parse_cli_vars
from ..ctl.utils import execute_graphql_query, init_logging, parse_cli_vars
from ..exceptions import ModuleImportError
from ..node import InfrahubNode

Expand All @@ -20,11 +20,12 @@
async def run(
generator_name: str,
path: str, # noqa: ARG001
debug: bool, # noqa: ARG001
debug: bool,
list_available: bool,
branch: str | None = None,
variables: list[str] | None = None,
) -> None:
init_logging(debug=debug)

Check warning on line 28 in infrahub_sdk/ctl/generator.py

View check run for this annotation

Codecov / codecov/patch

infrahub_sdk/ctl/generator.py#L28 

Added line #L28 was not covered by tests
repository_config = get_repository_config(Path(config.INFRAHUB_REPO_CONFIG_FILE))

if list_available or not generator_name:
Expand All @@ -34,7 +35,6 @@
generator_config = repository_config.get_generator_definition(name=generator_name)

console = Console()

relative_path = str(generator_config.file_path.parent) if generator_config.file_path.parent != Path() else None

try:
Expand Down
3 changes: 3 additions & 0 deletions infrahub_sdk/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import logging
import os
from abc import abstractmethod
from typing import TYPE_CHECKING
Expand Down Expand Up @@ -27,6 +28,7 @@
generator_instance: str = "",
params: dict | None = None,
convert_query_response: bool = False,
logger: logging.Logger | None = None,
) -> None:
self.query = query
self.branch = branch
Expand All @@ -41,6 +43,7 @@
self._related_nodes: list[InfrahubNode] = []
self.infrahub_node = infrahub_node
self.convert_query_response = convert_query_response
self.logger = logger if logger else logging.getLogger("infrahub.tasks")

Check warning on line 46 in infrahub_sdk/generator.py

View check run for this annotation

Codecov / codecov/patch

infrahub_sdk/generator.py#L46 

Added line #L46 was not covered by tests

@property
def store(self) -> NodeStore:
Expand Down