Skip to content
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

Jump to bottom

Fixes #11816: Use built-in function and remove dumpdatastate usage in ncf #659

Merged
merged 1 commit into from
Dec 1, 2017
Merged

Fixes #11816: Use built-in function and remove dumpdatastate usage in ncf #659

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
2 changes: 1 addition & 1 deletion tests/acceptance/30_generic_methods/file_from_template_jinja2.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
#####################################################################################

# @agent_requirements "capabilities": [ "dumpdatastate" ]
# agent_version >= 3.9

#######################################################
#
Expand Down
1 change: 1 addition & 0 deletions tree/10_ncf_internals/modules/templates/datastate.json.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{%-top-}}
20 changes: 14 additions & 6 deletions tree/30_generic_methods/file_from_template_jinja2.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# @name File from a jinja2 template
# @description Build a file from a jinja2 template
# @agent_requirements "capabilities": [ "dumpdatastate" ]
# @agent_version >= 3.9
# @documentation See [file_from_template_type](#file_from_template_type) for general documentation about
# templates usage.
#
Expand Down Expand Up @@ -180,31 +180,39 @@ bundle agent file_from_template_jinja2(source_template, destination)
"args" slist => { "${source_template}", "${destination}" };

"jinja2_script" string => "${sys.workdir}/modules/templates/jinja2-templating.py";
"datastate_tpl" string => "${sys.workdir}/modules/templates/datastate.json.tpl";
"datastate_file" string => "${source_template}.datastate.${this.promiser_pid}.json";
"destination_canon" string => canonify("${destination}");
"destination_tmp" string => "${source_template}.${this.promiser_pid}.new";
state_dumped::
state_dumped_ok::
# Here we put the output into the errors variable. As the stdout is sent to a file, the output is only stderr,
# and can be used to check for errors.
"errors" string => execresult("/usr/bin/python \"${jinja2_script}\" --strict \"${source_template}\" \"${datastate_file}\" > \"${destination_tmp}\"", "useshell");

classes:
# This class may not be set when we cannot write the datastate file.
"state_dumped" expression => dumpdatastate("${datastate_file}");
# If the stderr of the python templating command was empty, we consider that the templating succeeeded.
"templating_ok" expression => strcmp("${errors}", "");

"pass3" expression => "pass2";
"pass2" expression => "pass1";
"pass1" expression => "any";

files:
# We can't use the generic method here because we want to avoid file backups
"${datastate_file}"
template_method => "mustache",
create => "true",
edit_template => "${datastate_tpl}",
edit_defaults => no_backup,
classes => classes_generic("state_dumped");

methods:
pass2.templating_ok::
# Use a file copy to avoid any file size limitations of CFEngine variables.
"copy file" usebundle => file_copy_from_local_source("${destination_tmp}", "${destination}");
"copy classes" usebundle => _classes_copy("file_copy_from_local_source_${destination_canon}", "${old_class_prefix}");

pass3.state_dumped::
pass3.state_dumped_ok::
"clean data file" usebundle => file_remove("${datastate_file}");
"clean template file" usebundle => file_remove("${destination_tmp}");

Expand All @@ -220,7 +228,7 @@ bundle agent file_from_template_jinja2(source_template, destination)

reports:
# Display templating errors in case of failure.
"Templating error: ${errors}" ifvarclass => "state_dumped.!templating_ok";
"Templating error: ${errors}" ifvarclass => "state_dumped_ok.!templating_ok";

}