Skip to content

import yml or yaml #6990

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
Parent: Merge develop into release-1.2
merged 2 commits into from
Aug 7, 2025
Merged

import yml or yaml #6990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7c4e0f
import yml or yaml
petercrocker Aug 7, 2025
dcde6fe
improve error handling
petercrocker Aug 7, 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
16 changes: 12 additions & 4 deletions backend/infrahub/git/integrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,18 @@ async def get_repository_config(self, branch_name: str, commit: str) -> Infrahub
branch_wt = self.get_worktree(identifier=commit or branch_name)
log = get_run_logger()

config_file_name = ".infrahub.yml"
config_file = branch_wt.directory / config_file_name
if not config_file.is_file():
log.debug(f"Unable to find the configuration file {config_file_name}, skipping")
# Check for both .infrahub.yml and .infrahub.yaml, prefer .yml if both exist
config_file_yml = branch_wt.directory / ".infrahub.yml"
config_file_yaml = branch_wt.directory / ".infrahub.yaml"

if config_file_yml.is_file():
config_file = config_file_yml
config_file_name = ".infrahub.yml"
elif config_file_yaml.is_file():
config_file = config_file_yaml
config_file_name = ".infrahub.yaml"
else:
log.debug("Unable to find the configuration file (.infrahub.yml or .infrahub.yaml), skipping")
return None

config_file_content = config_file.read_text(encoding="utf-8")
Expand Down
21 changes: 20 additions & 1 deletion backend/infrahub/proposed_change/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,16 @@ async def run_proposed_change_user_tests(model: RequestProposedChangeUserTests)
def _execute(
directory: Path, repository: ProposedChangeRepository, proposed_change: InfrahubNode
) -> int | pytest.ExitCode:
config_file = str(directory / ".infrahub.yml")
# Check for both .infrahub.yml and .infrahub.yaml, prefer .yml if both exist
config_file_yml = directory / ".infrahub.yml"
config_file_yaml = directory / ".infrahub.yaml"

if config_file_yml.is_file():
config_file = str(config_file_yml)
elif config_file_yaml.is_file():
config_file = str(config_file_yaml)
else:
config_file = str(config_file_yml) # Default to .yml for error messages
test_directory = directory / "tests"
log = get_logger()

Expand All @@ -545,6 +554,16 @@ def _execute(
)
return 1

# Check if config file exists and log error if neither extension is found
if not config_file_yml.is_file() and not config_file_yaml.is_file():
log.error(
event="repository_tests_failed",
proposed_change=proposed_change,
repository=repository.repository_name,
message="Configuration file not found (.infrahub.yml or .infrahub.yaml)",
)
return 1

# Redirect stdout/stderr to avoid showing pytest lines in the git agent
old_out = sys.stdout
old_err = sys.stderr
Expand Down