Don't return empty streams in agent yaml when there aren't any

elastic · Nov 24, 2020 · 493e54a · 493e54a
1 parent f0a9c97
commit 493e54a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 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
@@ -179,7 +179,6 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
           },
         },
         inputVar: 'input-value',
-        streams: [],
       },
     ]);
   });

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
@@ -34,20 +34,24 @@ export const storedPackagePoliciesToAgentInputs = (
           return acc;
         }, {} as { [k: string]: any }),
         ...(input.compiled_input || {}),
-        streams: input.streams
-          .filter((stream) => stream.enabled)
-          .map((stream) => {
-            const fullStream: FullAgentPolicyInputStream = {
-              id: stream.id,
-              data_stream: stream.data_stream,
-              ...stream.compiled_stream,
-              ...Object.entries(stream.config || {}).reduce((acc, [key, { value }]) => {
-                acc[key] = value;
-                return acc;
-              }, {} as { [k: string]: any }),
-            };
-            return fullStream;
-          }),
+        ...(input.streams.length
+          ? {
+              streams: input.streams
+                .filter((stream) => stream.enabled)
+                .map((stream) => {
+                  const fullStream: FullAgentPolicyInputStream = {
+                    id: stream.id,
+                    data_stream: stream.data_stream,
+                    ...stream.compiled_stream,
+                    ...Object.entries(stream.config || {}).reduce((acc, [key, { value }]) => {
+                      acc[key] = value;
+                      return acc;
+                    }, {} as { [k: string]: any }),
+                  };
+                  return fullStream;
+                }),
+            }
+          : {}),
       };
 
       if (packagePolicy.package) {

diff --git a/x-pack/plugins/fleet/common/types/models/agent_policy.ts b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
@@ -49,7 +49,7 @@ export interface FullAgentPolicyInput {
     package?: Pick<PackagePolicyPackage, 'name' | 'version'>;
     [key: string]: unknown;
   };
-  streams: FullAgentPolicyInputStream[];
+  streams?: FullAgentPolicyInputStream[];
   [key: string]: any;
 }