From 62effd3db7962e603f963892aed4cbb1c72f842d Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 19 Nov 2020 16:44:16 -0800
Subject: [PATCH] Add compiled input to generated agent yaml

---
 .../package_policies_to_agent_inputs.test.ts  | 43 ++++++++++++++++++-
 .../package_policies_to_agent_inputs.ts       |  1 +
 .../fleet/server/services/package_policy.ts   |  8 ----
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.test.ts b/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.test.ts
index f721afb6391411..728e5d439a1e56 100644
--- a/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.test.ts
+++ b/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.test.ts
@@ -100,7 +100,7 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
     ).toEqual([]);
   });
 
-  it('returns agent inputs', () => {
+  it('returns agent inputs with streams', () => {
     expect(
       storedPackagePoliciesToAgentInputs([
         {
@@ -143,6 +143,47 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
     ]);
   });
 
+  it('returns agent inputs without streams', () => {
+    expect(
+      storedPackagePoliciesToAgentInputs([
+        {
+          ...mockPackagePolicy,
+          package: {
+            name: 'mock-package',
+            title: 'Mock package',
+            version: '0.0.0',
+          },
+          inputs: [
+            {
+              ...mockInput,
+              compiled_input: {
+                inputVar: 'input-value',
+              },
+              streams: [],
+            },
+          ],
+        },
+      ])
+    ).toEqual([
+      {
+        id: 'some-uuid',
+        name: 'mock-package-policy',
+        revision: 1,
+        type: 'test-logs',
+        data_stream: { namespace: 'default' },
+        use_output: 'default',
+        meta: {
+          package: {
+            name: 'mock-package',
+            version: '0.0.0',
+          },
+        },
+        inputVar: 'input-value',
+        streams: [],
+      },
+    ]);
+  });
+
   it('returns agent inputs without disabled streams', () => {
     expect(
       storedPackagePoliciesToAgentInputs([
diff --git a/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts b/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
index e74256ce732a61..452b06cfa0e4ce 100644
--- a/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
+++ b/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
@@ -33,6 +33,7 @@ export const storedPackagePoliciesToAgentInputs = (
           acc[key] = value;
           return acc;
         }, {} as { [k: string]: any }),
+        ...(input.compiled_input || {}),
         streams: input.streams
           .filter((stream) => stream.enabled)
           .map((stream) => {
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index cc87ef7f038675..7b8952bdea2cd8 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -407,7 +407,6 @@ async function _compilePackagePolicyInput(
   pkgInfo: PackageInfo,
   input: PackagePolicyInput
 ) {
-  console.log('jen in _compilePackagePolicyInput');
   if (!input.enabled || !pkgInfo.policy_templates?.[0].inputs) {
     return undefined;
   }
@@ -419,12 +418,9 @@ async function _compilePackagePolicyInput(
   }
 
   if (!packageInput.template_path) {
-    console.log('jen in _compilePackagePolicyInput, no template path');
     return undefined;
   }
 
-  console.log('jen in _compilePackagePolicyInput, found input and template path');
-
   const [pkgInputTemplate] = await getAssetsData(registryPkgInfo, (path: string) =>
     path.endsWith(`/agent/input/${packageInput.template_path!}`)
   );
@@ -433,10 +429,6 @@ async function _compilePackagePolicyInput(
     throw new Error(`Unable to load input template at /agent/input/${packageInput.template_path!}`);
   }
 
-  console.log(
-    'jen in _compilePackagePolicyInput, compiling input with',
-    pkgInputTemplate.buffer.toString()
-  );
   return compileTemplate(
     // Populate template variables from input vars
     Object.assign({}, input.vars),