[Fleet] Correctly parse falsy YAML fields in agent policy integrations (

elastic#95966) (elastic#96064)
kibanamachine · Apr 1, 2021 · f543e80 · f543e80
1 parent a0fd8e2
commit f543e80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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
@@ -65,6 +65,12 @@ custom: {{ custom }}
 {{#if key.patterns}}
 key.patterns: {{key.patterns}}
 {{/if}}
+{{#if emptyfield}}
+emptyfield: {{emptyfield}}
+{{/if}}
+{{#if nullfield}}
+nullfield: {{nullfield}}
+{{/if}}
 {{ testEmpty }}
       `;
     const vars = {
@@ -82,6 +88,8 @@ foo: bar
         `,
       },
       password: { type: 'password', value: '' },
+      emptyfield: { type: 'yaml', value: '' },
+      nullfield: { type: 'yaml' },
     };
 
     const output = compileTemplate(vars, streamTemplate);

diff --git a/x-pack/plugins/fleet/server/services/epm/agent/agent.ts b/x-pack/plugins/fleet/server/services/epm/agent/agent.ts
@@ -90,7 +90,7 @@ function buildTemplateVariables(variables: PackagePolicyConfigRecord, templateSt
 
     if (recordEntry.type && recordEntry.type === 'yaml') {
       const yamlKeyPlaceholder = `##${key}##`;
-      varPart[lastKeyPart] = `"${yamlKeyPlaceholder}"`;
+      varPart[lastKeyPart] = recordEntry.value ? `"${yamlKeyPlaceholder}"` : null;
       yamlValues[yamlKeyPlaceholder] = recordEntry.value ? safeLoad(recordEntry.value) : null;
     } else if (
       recordEntry.type &&