Skip to content

Made deploy show policy errors reported by cf-promises #207

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
Nov 6, 2026
Merged

Made deploy show policy errors reported by cf-promises #207

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
11 changes: 8 additions & 3 deletions cf_remote/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,8 +839,11 @@ def deploy_masterfiles(host, tarball, *, connection=None, switch_user=None):
"mv /var/cfengine/masterfiles /var/cfengine/masterfiles.delete",
"mv masterfiles /var/cfengine/masterfiles",
"rm -rf /var/cfengine/masterfiles.delete",
"{}cf-agent -Kf update.cf".format(cfagent_path),
"{}cf-agent -K".format(cfagent_path),
# cf-promises (run by cf-agent to validate the policy) writes policy
# errors, like a duplicate bundle, to stderr - and ssh_sudo() only
# returns stdout on success - so merge them to be able to show them.
"{}cf-agent -Kf update.cf 2>&1".format(cfagent_path),
"{}cf-agent -K 2>&1".format(cfagent_path),
]
combined = " && ".join(commands)
print("Running: '%s'" % combined)
Expand All @@ -850,7 +853,9 @@ def deploy_masterfiles(host, tarball, *, connection=None, switch_user=None):
log.error("Command failed, policy failed to deploy")
return 1

if re.search(r"(?m)^\s*error:", result):
# Matches both cf-agent's log lines (" error: ...") and the ones
# cf-promises prefixes with the location ("file.cf:12:0: error: ...")
if re.search(r"(?m)^(\s*|\S+:\d+:\d+: )error:", result):
print(result)
log.warning("cf-agent reported errors while running on '%s'" % host)

Expand Down
Loading