Fixes #12371: Some methods which let another one do the reporting are…

… broken in 4.3
Normation · Apr 5, 2018 · 4d72335 · 4d72335
1 parent 8d6276c
commit 4d72335
Show file tree

Hide file tree

Showing 35 changed files with 66 additions and 41 deletions.
diff --git a/tree/30_generic_methods/file_copy_from_local_source.cf b/tree/30_generic_methods/file_copy_from_local_source.cf
@@ -30,6 +30,7 @@
 bundle agent file_copy_from_local_source(source, destination)
 {
   vars:
+      "old_class_prefix" string => canonify("file_copy_from_local_source_${destination}");
      "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
      "class_prefix"      string => canonify(join("_", "promisers"));
       "args"             slist => { "${source}", "${destination}" };
@@ -45,5 +46,5 @@ bundle agent file_copy_from_local_source(source, destination)
                              ifvarclass => "should_report";
       "new result classes"     usebundle => _classes_copy("${class_prefix}_copy_without_recursion", "${class_prefix}");
 
-      "report"                 usebundle => _log("Copying ${destination} from ${source}", "", "${class_prefix}", @{args});
+      "report"                 usebundle => _log("Copying ${destination} from local ${source}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_copy_from_local_source_recursion.cf b/tree/30_generic_methods/file_copy_from_local_source_recursion.cf
@@ -50,5 +50,5 @@ bundle agent file_copy_from_local_source_recursion(source, destination, recursio
                          ifvarclass => "file_from_local_source_${canonified_file}_reached";
     "new result classes" usebundle => _classes_copy("${class_prefix}_action", "${class_prefix}"),
                          ifvarclass => "${class_prefix}_action_reached";
-    "report"             usebundle  => _log("Copying ${destination} from ${source}, recursion level ${recursion}", "${old_class_prefix}", "${class_prefix}", @{args});
+    "report"             usebundle  => _log("Copying ${destination} from local ${source}, recursion level ${recursion}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_copy_from_local_source_with_check.cf b/tree/30_generic_methods/file_copy_from_local_source_with_check.cf
@@ -54,6 +54,6 @@ bundle agent file_copy_from_local_source_with_check(source, destination, check_c
                          ifvarclass => "file_from_local_source_with_check_${canonified_file}_reached";
     "new result classes" usebundle => _classes_copy("${class_prefix}_action", "${class_prefix}"),
                          ifvarclass => "${class_prefix}_action_reached";
-    "report"             usebundle  => _log("Copying ${destination} from ${source} with check", "${old_class_prefix}", "${class_prefix}", @{args});
+    "report"             usebundle  => _log("Copying ${destination} from local ${source} with check", "${old_class_prefix}", "${class_prefix}", @{args});
 
 }
diff --git a/tree/30_generic_methods/file_copy_from_remote_source.cf b/tree/30_generic_methods/file_copy_from_remote_source.cf
@@ -47,6 +47,7 @@
 bundle agent file_copy_from_remote_source(source, destination)
 {
   vars:
+      "old_class_prefix" string => canonify("file_copy_from_remote_source_${destination}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${source}", "${destination}" };
@@ -62,5 +63,5 @@ bundle agent file_copy_from_remote_source(source, destination)
                              ifvarclass => "should_report";
       "new result classes"     usebundle => _classes_copy("${class_prefix}_copy_without_recursion", "${class_prefix}");
 
-      "report"                 usebundle => _log("Copying ${destination} from ${source}", "", "${class_prefix}", @{args});
+      "report"                 usebundle => _log("Copying ${destination} from remote ${source}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_copy_from_remote_source_recursion.cf b/tree/30_generic_methods/file_copy_from_remote_source_recursion.cf
@@ -62,5 +62,5 @@ bundle agent file_copy_from_remote_source_recursion(source, destination, recursi
                          ifvarclass => "file_from_remote_source_${canonified_file}_reached";
     "new result classes" usebundle => _classes_copy("${class_prefix}_action", "${class_prefix}"),
                          ifvarclass => "${class_prefix}_action_reached";
-    "report"             usebundle  => _log("Copying ${destination} from ${source}, recursion level ${recursion}", "${old_class_prefix}", "${class_prefix}", @{args});
+    "report"             usebundle  => _log("Copying ${destination} from remote ${source}, recursion level ${recursion}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_create_symlink.cf b/tree/30_generic_methods/file_create_symlink.cf
@@ -30,6 +30,7 @@
 bundle agent file_create_symlink(source, destination)
 {
   vars:
+      "old_class_prefix" string => canonify("file_create_symlink_${destination}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${source}", "${destination}" };
@@ -45,5 +46,5 @@ bundle agent file_create_symlink(source, destination)
                              ifvarclass => "should_report";
       "new result classes"     usebundle => _classes_copy("${class_prefix}_create_without_enforce", "${class_prefix}");
 
-      "report"                 usebundle => _log("Symlink ${destination} targeting ${source}", "", "${class_prefix}", @{args});
+      "report"                 usebundle => _log("Symlink ${destination} targeting ${source} (without overwrite)", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_create_symlink_force.cf b/tree/30_generic_methods/file_create_symlink_force.cf
@@ -30,6 +30,7 @@
 bundle agent file_create_symlink_force(source, destination)
 {
   vars:
+      "old_class_prefix" string => canonify("file_create_symlink_${destination}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${source}", "${destination}" };
@@ -45,5 +46,5 @@ bundle agent file_create_symlink_force(source, destination)
                              ifvarclass => "should_report";
       "new result classes"   usebundle => _classes_copy("${class_prefix}_create_with_enforce", "${class_prefix}");
 
-      "report"               usebundle => _log("Symlink ${destination} targeting ${source}", "", "${class_prefix}", @{args});
+      "report"               usebundle => _log("Symlink ${destination} targeting ${source} with forced overwrite", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_ensure_lines_present.cf b/tree/30_generic_methods/file_ensure_lines_present.cf
@@ -30,7 +30,7 @@
 bundle agent file_ensure_lines_present(file, lines)
 {
   vars:
-      # old_class_prefix is not necessary, as file_enforce_content will report, with the same class prefix
+      "old_class_prefix" string => canonify("file_ensure_lines_present_${file}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"               slist => { "${file}", "${lines}" };
@@ -50,5 +50,5 @@ bundle agent file_ensure_lines_present(file, lines)
 
       "new result classes"    usebundle => _classes_copy("${class_prefix}_enforce_lines_content", "${class_prefix}");
 
-      "report"                usebundle => _log("Insert content ${lines} into ${file}", "", "${class_prefix}", @{args});
+      "report"                usebundle => _log("Append content ${lines} if needed into ${file}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_from_local_source.cf b/tree/30_generic_methods/file_from_local_source.cf
@@ -28,9 +28,10 @@
 bundle agent file_from_local_source(source, destination)
 {
   vars:
+     "old_class_prefix" string => canonify("file_from_local_source_${destination}");
      "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
      "class_prefix"      string => canonify(join("_", "promisers"));
-      "args"             slist => { "${source}", "${destination}" };
+     "args"             slist => { "${source}", "${destination}" };
 
 
   classes:
@@ -43,5 +44,5 @@ bundle agent file_from_local_source(source, destination)
                              ifvarclass => "should_report";
       "new result classes"     usebundle => _classes_copy("${class_prefix}_copy_without_recursion", "${class_prefix}");
 
-      "report"                 usebundle => _log("Copying ${destination} from ${source}", "", "${class_prefix}", @{args});
+      "report"                 usebundle => _log("Copying ${destination} from local ${source}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_from_local_source_recursion.cf b/tree/30_generic_methods/file_from_local_source_recursion.cf
@@ -66,5 +66,5 @@ bundle agent file_from_local_source_recursion(source, destination, recursion)
 
     iteration_2.is_dir_copy::
       "report"
-        usebundle  => _log("Copying ${destination} from ${source}, recursion level ${recursion}", "${old_class_prefix}", "${class_prefix}", @{args});
+        usebundle  => _log("Copying ${destination} from local ${source}, recursion level ${recursion}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_from_local_source_with_check.cf b/tree/30_generic_methods/file_from_local_source_with_check.cf
@@ -84,8 +84,8 @@ bundle agent file_from_local_source_with_check(source, destination, check_comman
               ifvarclass => "file_from_local_source_with_check_${canonified_file}_check_true";
 
 
-      "report" usebundle => _log("Copying ${destination} from ${source} with check", "${old_class_prefix}", "${class_prefix}", @{args}),
+      "report" usebundle => _log("Copying ${destination} from local ${source} with check", "${old_class_prefix}", "${class_prefix}", @{args}),
               ifvarclass => "!condition_from_command_file_from_local_source_with_check_${canonified_file}_check_failed";
-      "report" usebundle => _log("Copying ${destination} from ${source} failed at check command", "${old_class_prefix}", "${class_prefix}", @{args}),
+      "report" usebundle => _log("Copying ${destination} from local ${source} failed at check command", "${old_class_prefix}", "${class_prefix}", @{args}),
               ifvarclass => "condition_from_command_file_from_local_source_with_check_${canonified_file}_check_failed";
 }
diff --git a/tree/30_generic_methods/file_from_remote_source.cf b/tree/30_generic_methods/file_from_remote_source.cf
@@ -45,6 +45,7 @@
 bundle agent file_from_remote_source(source, destination)
 {
   vars:
+      "old_class_prefix" string => canonify("file_from_remote_source_${destination}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${source}", "${destination}" };
@@ -60,5 +61,5 @@ bundle agent file_from_remote_source(source, destination)
                              ifvarclass => "should_report";
       "new result classes"     usebundle => _classes_copy("${class_prefix}_copy_without_recursion", "${class_prefix}");
 
-      "report"                 usebundle => _log("Copying ${destination} from ${source}", "", "${class_prefix}", @{args});
+      "report"                 usebundle => _log("Copying ${destination} from ${source}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_from_template_jinja2.cf b/tree/30_generic_methods/file_from_template_jinja2.cf
@@ -231,7 +231,7 @@ bundle agent file_from_template_jinja2(source_template, destination)
 
       "new result classes"  usebundle  => _classes_copy("${old_class_prefix}", "${class_prefix}"),
                             ifvarclass => "${old_class_prefix}_reached";
-      "report"              usebundle  => _log("Build file ${destination} from template ${source_template}", "${old_class_prefix}", "${class_prefix}", @{args});
+      "report"              usebundle  => _log("Build file ${destination} from jinja2 template ${source_template}", "${old_class_prefix}", "${class_prefix}", @{args});
 
    reports:
      # Display templating errors in case of failure.

diff --git a/tree/30_generic_methods/file_from_template_mustache.cf b/tree/30_generic_methods/file_from_template_mustache.cf
@@ -172,6 +172,7 @@
 bundle agent file_from_template_mustache(source_template, destination)
 {
   vars:
+    "old_class_prefix" string => canonify("file_from_template_${destination}");
     "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
     "class_prefix"      string => canonify(join("_", "promisers"));
     "args"              slist => { "${source_template}", "${destination}" };
@@ -187,5 +188,5 @@ bundle agent file_from_template_mustache(source_template, destination)
                              ifvarclass => "should_report";
     "new result classes"           usebundle => _classes_copy("${class_prefix}_file_template_mustache_type", "${class_prefix}");
 
-    "report"                       usebundle => _log("Build file ${destination} from template ${source_template}", "", "${class_prefix}", @{args});
+    "report"                       usebundle => _log("Build file ${destination} from mustache template ${source_template}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_from_template_type.cf b/tree/30_generic_methods/file_from_template_type.cf
@@ -144,11 +144,11 @@ bundle agent file_from_template_type(source_template, destination, template_type
 
     is_jinja2.template_exists::
       "new result classes" usebundle => _classes_copy("${class_prefix}_file_from_template_jinja2", "${class_prefix}");
-      "report" usebundle => _log("Build file ${destination} from ${template_type} template ${source_template}", "", "${class_prefix}", @{args});
+      "report" usebundle => _log("Build file ${destination} from ${template_type} template ${source_template}", "${old_class_prefix}", "${class_prefix}", @{args});
 
     !(is_jinja2.template_exists)::
       "sanitize" usebundle => _classes_sanitize("${class_prefix}");
       "sanitize" usebundle => _classes_sanitize("${old_class_prefix}");
-      "report"   usebundle => _log("Build file ${destination} from ${template_type} template ${source_template}", "${old_class_prefix}", "${class_prefix}", @{args});
+      "report"   usebundle => _log("Build file ${destination} from ${template_type} type template ${source_template}", "${old_class_prefix}", "${class_prefix}", @{args});
 
 }
diff --git a/tree/30_generic_methods/file_lines_present.cf b/tree/30_generic_methods/file_lines_present.cf
@@ -28,6 +28,7 @@
 bundle agent file_lines_present(file, lines)
 {
   vars:
+      "old_class_prefix" string => canonify("file_lines_present_${file}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${file}", "${lines}" };
@@ -43,5 +44,5 @@ bundle agent file_lines_present(file, lines)
                              ifvarclass => "should_report";
       "new result classes"    usebundle => _classes_copy("${class_prefix}_enforce_lines_content", "${class_prefix}");
 
-      "report"                usebundle => _log("Insert content ${lines} into ${file}", "", "${class_prefix}", @{args});
+      "report"                usebundle => _log("Append content ${lines} if needed into ${file}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_symlink_present.cf b/tree/30_generic_methods/file_symlink_present.cf
@@ -28,6 +28,7 @@
 bundle agent file_symlink_present(source, destination)
 {
   vars:
+      "old_class_prefix" string => canonify("file_symlink_present_${destination}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${source}", "${destination}" };
@@ -43,5 +44,5 @@ bundle agent file_symlink_present(source, destination)
                              ifvarclass => "should_report";
       "new result classes"     usebundle => _classes_copy("${class_prefix}_create_without_enforce", "${class_prefix}");
 
-      "report"                 usebundle => _log("Symlink ${destination} targeting ${source}", "", "${class_prefix}", @{args});
+      "report"                 usebundle => _log("Symlink ${destination} targeting ${source} (without overwrite)", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/file_symlink_present_force.cf b/tree/30_generic_methods/file_symlink_present_force.cf
@@ -28,6 +28,7 @@
 bundle agent file_symlink_present_force(source, destination)
 {
   vars:
+      "old_class_prefix" string => canonify("file_symlink_present_${destination}");
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${source}", "${destination}" };
@@ -43,5 +44,5 @@ bundle agent file_symlink_present_force(source, destination)
                              ifvarclass => "should_report";
       "new result classes"   usebundle => _classes_copy("${class_prefix}_create_with_enforce", "${class_prefix}");
 
-      "report"               usebundle => _log("Symlink ${destination} targeting ${source}", "", "${class_prefix}", @{args});
+      "report"               usebundle => _log("Symlink ${destination} targeting ${source} with forced overwrite", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/package_install.cf b/tree/30_generic_methods/package_install.cf
@@ -28,6 +28,7 @@
 bundle agent package_install(package_name)
 {
   vars:
+      "old_class_prefix"        string => "package_install_${canonified_package_name}";
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${package_name}" };
@@ -43,5 +44,5 @@ bundle agent package_install(package_name)
                              ifvarclass => "should_report";
       "new result classes" usebundle => _classes_copy("${class_prefix}_install_latest", "${class_prefix}");
 
-      "report"             usebundle => _log("Install package ${package_name}", "", "${class_prefix}", @{args});
+      "report"             usebundle => _log("Install package ${package_name}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/package_install_version.cf b/tree/30_generic_methods/package_install_version.cf
@@ -29,6 +29,7 @@
 bundle agent package_install_version(package_name, package_version)
 {
   vars:
+      "old_class_prefix"        string => "package_install_${canonified_package_name}";
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${package_name}", "${package_version}" };
@@ -44,6 +45,6 @@ bundle agent package_install_version(package_name, package_version)
                              ifvarclass => "should_report";
       "new result classes"    usebundle => _classes_copy("${class_prefix}_install_vith_version", "${class_prefix}");
 
-      "report"                usebundle => _log("Install package ${package_name} version ${package_version}", "", "${class_prefix}", @{args});
+      "report"                usebundle => _log("Install package ${package_name} version ${package_version}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
 
diff --git a/tree/30_generic_methods/package_install_version_cmp.cf b/tree/30_generic_methods/package_install_version_cmp.cf
@@ -37,6 +37,7 @@
 bundle agent package_install_version_cmp(package_name, version_comparator, package_version, action)
 {
   vars:
+      "old_class_prefix"        string => "package_install_${canonified_package_name}";
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${package_name}", "${version_comparator}", "${package_version}", "${action}" };
@@ -52,5 +53,5 @@ bundle agent package_install_version_cmp(package_name, version_comparator, packa
                              ifvarclass => "should_report";
       "new result classes" usebundle => _classes_copy("${class_prefix}_install_or_update", "${class_prefix}");
 
-      "report"             usebundle => _log("Install package ${package_name} version ${package_version}", "", "${class_prefix}", @{args});
+      "report"             usebundle => _log("Install package ${package_name} version ${version_comparator} ${package_version}", "${old_class_prefix}", "${class_prefix}", @{args});
 }
diff --git a/tree/30_generic_methods/package_verify.cf b/tree/30_generic_methods/package_verify.cf
@@ -27,6 +27,7 @@
 bundle agent package_verify(package_name)
 {
   vars:
+      "old_class_prefix"        string => "package_install_${canonified_package_name}";
       "promisers"          slist => { @{this.callers_promisers}, cf_null }, policy => "ifdefined";
       "class_prefix"      string => canonify(join("_", "promisers"));
       "args"              slist => { "${package_name}" };
@@ -42,6 +43,6 @@ bundle agent package_verify(package_name)
                              ifvarclass => "should_report";
       "new result classes" usebundle => _classes_copy("${class_prefix}_verify_latest", "${class_prefix}");
 
-      "report"             usebundle => _log("Verify that package ${package_name} is installed", "", "${class_prefix}", @{args});
+      "report"             usebundle => _log("Verify that package ${package_name} is installed", "${old_class_prefix}", "${class_prefix}", @{args});
 }