Fixes #15174: Rudder directives posthook can not support multilines c…

…ommand execution
Normation · Jul 8, 2019 · 995a62d · 995a62d
1 parent 2f967cc
commit 995a62d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/techniques/applications/packageManagement/1.2/packageManagement.st b/techniques/applications/packageManagement/1.2/packageManagement.st
@@ -55,7 +55,7 @@ bundle agent package_management_RudderUniqueID {
       &PACKAGE_MANAGER_ALLOW_UNTRUSTED:{manager_allow_untrusted |"manager_allow_untrusted[&i0&]" string => "&manager_allow_untrusted&";
 }&
 
-      &PACKAGE_POST_HOOK_COMMAND:{command |"posthook[&i0&]" string => "&command&";
+&PACKAGE_POST_HOOK_COMMAND:{command |"posthook[&i0&]" string => "&command&";
 }&
 
       "index_pkg" slist => getindices("package");

diff --git a/techniques/fileConfiguration/fileManagement/4.1/manageFilesAndFolders.st b/techniques/fileConfiguration/fileManagement/4.1/manageFilesAndFolders.st
@@ -32,7 +32,7 @@ bundle agent manageFilesAndFolders_RudderUniqueID {
 }&
     &FILE_AND_FOLDER_MANAGEMENT_GROUP:{group |"file[&i&][group]" string => "&group&";
 }&
-    &FILE_AND_FOLDER_MANAGEMENT_POST_HOOK_COMMAND:{cmd |"file[&i&][post_hook_command]" string => "&cmd&";
+&FILE_AND_FOLDER_MANAGEMENT_POST_HOOK_COMMAND:{cmd |"file[&i&][post_hook_command]" string => "&cmd&";
 }&
     &FILE_AND_FOLDER_MANAGEMENT_SYMLINK_SOURCE:{src |"file[&i&][source]" string => "&src&";
 }&

diff --git a/techniques/fileDistribution/checkGenericFileContent/8.0/checkGenericFileContent.st b/techniques/fileDistribution/checkGenericFileContent/8.0/checkGenericFileContent.st
@@ -39,7 +39,7 @@ bundle agent check_generic_file_content_RudderUniqueID {
 
       &GENERIC_FILE_CONTENT_ENFORCE:{enforce |"generic_file_content_enforced[&i&]" string => "&enforce&";
 }&
-      &GENERIC_FILE_CONTENT_POST_HOOK_COMMAND:{command |"generic_file_content_posthook[&i&]" string => "&command&";
+&GENERIC_FILE_CONTENT_POST_HOOK_COMMAND:{command |"generic_file_content_posthook[&i&]" string => "&command&";
 }&
       &GENERIC_FILE_CONTENT_DELETION_REGEXP:{delreg |"generic_file_content_deletion_regexp[&i&]" string => "&delreg&";
 }&

diff --git a/techniques/fileDistribution/copyGitFile/2.3/copyFileFromSharedFolder.st b/techniques/fileDistribution/copyGitFile/2.3/copyFileFromSharedFolder.st
@@ -56,7 +56,7 @@ bundle agent download_from_shared_folder_RudderUniqueID
       &COPYFILE_DESTINATION:{destination |"copyfile[&i&][raw_destination]" string => "&destination&";
 }&
 
-      &COPYFILE_POST_HOOK_COMMAND:{command |"copyfile[&i&][posthook]" string => "&command&";
+&COPYFILE_POST_HOOK_COMMAND:{command |"copyfile[&i&][posthook]" string => "&command&";
 }&
 
       &TRACKINGKEY:{piuuid |"copyfile[&i&][uuid]" string => "&piuuid&";

diff --git a/techniques/fileDistribution/fileTemplate/1.0/fileTemplate.st b/techniques/fileDistribution/fileTemplate/1.0/fileTemplate.st
@@ -62,7 +62,8 @@ bundle agent fileTemplate_RudderUniqueID {
       &FILE_TEMPLATE_TEMPLATE_TYPE: {type|"types[&i&]" string => "&type&";}&
 
       #Post hook command
-      &FILE_TEMPLATE_TEMPLATE_POST_HOOK_COMMAND: {command |"posthook[&i&]" string => "&command&";}&
+&FILE_TEMPLATE_TEMPLATE_POST_HOOK_COMMAND: {command |"posthook[&i&]" string => "&command&";
+}&
 
       #Post hook persistence
       &FILE_TEMPLATE_PERSISTENT_POST_HOOK: {persistence | "persist[&i&]" string => "&persistence&";}&

diff --git a/techniques/fileDistribution/manageKeyValueFile/1.3/manage-key-value-file.st b/techniques/fileDistribution/manageKeyValueFile/1.3/manage-key-value-file.st
@@ -28,7 +28,7 @@ bundle agent manage_key_value_file_RudderUniqueID {
 }&
       &MANAGE_KEY_VALUE_OPTION:{option |  "option[&i&]"   string => "&option&";
 }&
-      &MANAGE_KEY_VALUE_POST_HOOK_COMMAND:{post_hook |  "post_hook[&i&]"   string => "&post_hook&";
+&MANAGE_KEY_VALUE_POST_HOOK_COMMAND:{post_hook |  "post_hook[&i&]"   string => "&post_hook&";
 }&
       &TRACKINGKEY:{uuid |  "trackingkey[&i&]" string => "&uuid&";
 }&

diff --git a/techniques/systemSettings/process/services/1.1/services.st b/techniques/systemSettings/process/services/1.1/services.st
@@ -28,7 +28,7 @@ bundle agent services_RudderUniqueID
 }&
     &SERVICES_TECHNIQUE_BOOT:{boot |"boot[&i&]" string => "&boot&";
 }&
-    &SERVICES_TECHNIQUE_POSTHOOK:{posthook |"posthook[&i&]" string => "&posthook&";
+&SERVICES_TECHNIQUE_POSTHOOK:{posthook |"posthook[&i&]" string => "&posthook&";
 }&
     &SERVICES_TECHNIQUE_POSTHOOK_PERSISTENT:{persistent |"persistent[&i&]" string => "&persistent&";
 }&