Fixes #18009: File in INI section method does not work as intended #1233
Conversation
| "sanitize" usebundle => _classes_sanitize("${class_prefix}"); | ||
| "sanitize" usebundle => _classes_sanitize("${old_class_prefix}"); | ||
| "report" usebundle => _log_v3("Insert line(s) into ${file}", "${file}", "${old_class_prefix}", "${class_prefix}", @{args}); | ||
| } | ||
|
|
||
| bundle edit_line append_block(block) { |
There was a problem hiding this comment.
these bundle should go in the ncf lib
| "section_and_blank_line" string => "[${section}] | ||
| "; | ||
| "hash" string => hash("${report_param}", "md5"); | ||
| "last_line" string => execresult("/usr/bin/tail -n 1 ${file} #${hash}", "useshell"); |
There was a problem hiding this comment.
i'm not sure this path is the same every platform. Is it ?
…nded Fixes #18009: File in INI section method does not work as intended
|
PR updated with a new commit |
| @@ -34,32 +34,60 @@ bundle agent file_line_present_in_ini_section(file, section, line) | |||
| "report_param" string => join("_", args); | |||
| "full_class_prefix" string => canonify("file_line_present_in_ini_section_${report_param}"); | |||
| "class_prefix" string => string_head("${full_class_prefix}", "1000"); | |||
| "section_and_blank_line" string => "[${section}] | |||
| "; | |||
| "hash" string => hash("${report_param}", "md5"); | |||
There was a problem hiding this comment.
this seems overkill. file and section should be enough
There was a problem hiding this comment.
you can have 2 edit in the same sections and file in 2 directives, this is fine
|
|
||
| pass2:: | ||
| "line_list" slist => splitstring("${line}", "${const.n}", "999999"); | ||
| "unique_lines" slist => unique("line_list"); |
There was a problem hiding this comment.
i don't understand why this is deduplicated. nowhere in the method it is stated that it should behave like that, and this is really surprising for user
There was a problem hiding this comment.
This is the current behaviour, it currently only uses "insert_lines" promises so you can't have 2 times the same line in your section. And here it done manually since the section delimiters are limited in cfengine and do not work if the section is the last one in a file and is empty, the section automatically becomes the whole file.... so we need to create a block of text, clean its duplicated lines and insert it at the end without any duplication check.
There was a problem hiding this comment.
it was ncf_insert_block, which is insert_type => "preserve_block", so it doesn't deduplicate
There was a problem hiding this comment.
This was an issue: at section creation it used ncf_insert_block, with preserver_block (which in fact still do a dedupolicate but with the whole block and not line per line), but afterward, when the section exist, it uses "ensure_line_in_ini_section" https://github.com/Normation/ncf/blob/fc517e756083b0d05f44001d17f01e785b3a2f27/tree/30_generic_methods/file_line_present_in_ini_section.cf#L57
There was a problem hiding this comment.
There was a problem hiding this comment.
And does apply a "deduplicate" which makes it inconsistent
| ifvarclass => "section_absent", | ||
| comment => "Add section to file with a blank line"; | ||
| comment => "Add lines at the end of the file since the target section exists, is empty and is the last one in the file", |
There was a problem hiding this comment.
comment should state "since target seection doesn't exists"
…as intended Fixes #18009: File in INI section method does not work as intended
|
PR updated with a new commit |
https://issues.rudder.io/issues/18009