Skip to content

cfengine format: Fixed newline issue when mixing single line promises with multi line promises #80

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
olehermanse merged 1 commit into from
Apr 22, 2026
Merged

cfengine format: Fixed newline issue when mixing single line promises with multi line promises #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/cfengine_cli/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,11 @@ def can_single_line_promise(node: Node, indent: int, line_length: int) -> bool:
next_sib = node.next_named_sibling
while next_sib and next_sib.type == "macro":
next_sib = next_sib.next_named_sibling

if not attrs and not _has_stakeholder(children):
# Promises without attributes and without stakeholder are
# always single line
return True
if len(attrs) > 1:
# We always want to multiline a promise with multiple attributes
# even if it would fit on one line, i.e this should be split:
Expand Down
39 changes: 39 additions & 0 deletions tests/format/009_single_line.expected.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,42 @@ bundle agent main
"libltdl7" package_policy => "delete";
"libltdl-dev" package_policy => "delete";
}

bundle agent mix
{
reports:
DEBUG|DEBUG_cfe_internal_cleanup_agent_reports::
"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";
}
39 changes: 39 additions & 0 deletions tests/format/009_single_line.input.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,42 @@ bundle agent main

"libltdl-dev" package_policy => "delete";
}

bundle agent mix
{
reports:
DEBUG|DEBUG_cfe_internal_cleanup_agent_reports::
"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Client history purge triggered"
if => "cfe_internal_purge_reports";

"DEBUG $(this.bundle): Size of '$(files)' = '$(reports_size[$(files)])'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";
"DEBUG $(this.bundle): Size of all reports = '$(total_report_size)'";
"DEBUG $(this.bundle): Purge threshold = '$(def.max_client_history_size)'";
}
Loading