[Fleet] Fix root level yaml variables dollar escape (elastic#190615)

kgeller · Aug 15, 2024 · 17b2be1 · 17b2be1
1 parent 444b8d0
commit 17b2be1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts b/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts
@@ -327,6 +327,25 @@ input: logs
     });
   });
 
+  it('should support $$$$ yaml values at root level', () => {
+    const streamTemplate = `
+input: logs
+{{custom}}
+    `;
+    const vars = {
+      custom: {
+        type: 'yaml',
+        value: 'test: $$$$',
+      },
+    };
+
+    const output = compileTemplate(vars, streamTemplate);
+    expect(output).toEqual({
+      input: 'logs',
+      test: '$$$$',
+    });
+  });
+
   it('should suport !!str for string values', () => {
     const stringTemplate = `
 my-package:

diff --git a/x-pack/plugins/fleet/server/services/epm/agent/agent.ts b/x-pack/plugins/fleet/server/services/epm/agent/agent.ts
@@ -164,8 +164,7 @@ function replaceRootLevelYamlVariables(yamlVariables: { [k: string]: any }, yaml
 
   let patchedTemplate = yamlTemplate;
   Object.entries(yamlVariables).forEach(([key, val]) => {
-    patchedTemplate = patchedTemplate.replace(
-      new RegExp(`^"${key}"`, 'gm'),
+    patchedTemplate = patchedTemplate.replace(new RegExp(`^"${key}"`, 'gm'), () =>
       val ? safeDump(val) : ''
     );
   });