[Fleet] Make stream id unique in agent policy (elastic#82447)

gmmorris · Nov 8, 2020 · 8560b2d · 8560b2d
1 parent c77de15
commit 8560b2d
Show file tree

Hide file tree

Showing 15 changed files with 124 additions and 94 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts
@@ -84,16 +84,14 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
         {
           type: 'foo',
           enabled: true,
-          streams: [
-            { id: 'foo-foo', enabled: true, data_stream: { dataset: 'foo', type: 'logs' } },
-          ],
+          streams: [{ enabled: true, data_stream: { dataset: 'foo', type: 'logs' } }],
         },
         {
           type: 'bar',
           enabled: true,
           streams: [
-            { id: 'bar-bar', enabled: true, data_stream: { dataset: 'bar', type: 'logs' } },
-            { id: 'bar-bar2', enabled: true, data_stream: { dataset: 'bar2', type: 'logs' } },
+            { enabled: true, data_stream: { dataset: 'bar', type: 'logs' } },
+            { enabled: true, data_stream: { dataset: 'bar2', type: 'logs' } },
           ],
         },
       ]);
@@ -142,7 +140,6 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
           enabled: true,
           streams: [
             {
-              id: 'foo-foo',
               enabled: true,
               data_stream: { dataset: 'foo', type: 'logs' },
               vars: { 'var-name': { value: 'foo-var-value' } },
@@ -154,13 +151,11 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
           enabled: true,
           streams: [
             {
-              id: 'bar-bar',
               enabled: true,
               data_stream: { dataset: 'bar', type: 'logs' },
               vars: { 'var-name': { type: 'text', value: 'bar-var-value' } },
             },
             {
-              id: 'bar-bar2',
               enabled: true,
               data_stream: { dataset: 'bar2', type: 'logs' },
               vars: { 'var-name': { type: 'yaml', value: 'bar2-var-value' } },
@@ -258,7 +253,6 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
           },
           streams: [
             {
-              id: 'foo-foo',
               enabled: true,
               data_stream: { dataset: 'foo', type: 'logs' },
               vars: {
@@ -276,15 +270,13 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
           },
           streams: [
             {
-              id: 'bar-bar',
               enabled: true,
               data_stream: { dataset: 'bar', type: 'logs' },
               vars: {
                 'var-name': { value: 'bar-var-value' },
               },
             },
             {
-              id: 'bar-bar2',
               enabled: true,
               data_stream: { dataset: 'bar2', type: 'logs' },
               vars: {
@@ -298,15 +290,13 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
           enabled: false,
           streams: [
             {
-              id: 'with-disabled-streams-disabled',
               enabled: false,
               data_stream: { dataset: 'disabled', type: 'logs' },
               vars: {
                 'var-name': { value: [] },
               },
             },
             {
-              id: 'with-disabled-streams-disabled2',
               enabled: false,
               data_stream: { dataset: 'disabled2', type: 'logs' },
             },

diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.ts b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.ts
@@ -8,11 +8,10 @@ import {
   RegistryPolicyTemplate,
   RegistryVarsEntry,
   RegistryStream,
-  PackagePolicy,
   PackagePolicyConfigRecord,
   PackagePolicyConfigRecordEntry,
-  PackagePolicyInput,
-  PackagePolicyInputStream,
+  NewPackagePolicyInput,
+  NewPackagePolicyInputStream,
   NewPackagePolicy,
 } from '../types';
 
@@ -42,8 +41,10 @@ const getStreamsForInputType = (
 /*
  * This service creates a package policy inputs definition from defaults provided in package info
  */
-export const packageToPackagePolicyInputs = (packageInfo: PackageInfo): PackagePolicy['inputs'] => {
-  const inputs: PackagePolicy['inputs'] = [];
+export const packageToPackagePolicyInputs = (
+  packageInfo: PackageInfo
+): NewPackagePolicy['inputs'] => {
+  const inputs: NewPackagePolicy['inputs'] = [];
 
   // Assume package will only ever ship one package policy template for now
   const packagePolicyTemplate: RegistryPolicyTemplate | null =
@@ -71,12 +72,11 @@ export const packageToPackagePolicyInputs = (packageInfo: PackageInfo): PackageP
       };
 
       // Map each package input stream into package policy input stream
-      const streams: PackagePolicyInputStream[] = getStreamsForInputType(
+      const streams: NewPackagePolicyInputStream[] = getStreamsForInputType(
         packageInput.type,
         packageInfo
       ).map((packageStream) => {
-        const stream: PackagePolicyInputStream = {
-          id: `${packageInput.type}-${packageStream.data_stream.dataset}`,
+        const stream: NewPackagePolicyInputStream = {
           enabled: packageStream.enabled === false ? false : true,
           data_stream: packageStream.data_stream,
         };
@@ -86,7 +86,7 @@ export const packageToPackagePolicyInputs = (packageInfo: PackageInfo): PackageP
         return stream;
       });
 
-      const input: PackagePolicyInput = {
+      const input: NewPackagePolicyInput = {
         type: packageInput.type,
         enabled: streams.length ? !!streams.find((stream) => stream.enabled) : true,
         streams,

diff --git a/x-pack/plugins/ingest_manager/common/types/models/package_policy.ts b/x-pack/plugins/ingest_manager/common/types/models/package_policy.ts
@@ -18,7 +18,6 @@ export interface PackagePolicyConfigRecordEntry {
 export type PackagePolicyConfigRecord = Record<string, PackagePolicyConfigRecordEntry>;
 
 export interface NewPackagePolicyInputStream {
-  id: string;
   enabled: boolean;
   data_stream: {
     dataset: string;
@@ -29,6 +28,7 @@ export interface NewPackagePolicyInputStream {
 }
 
 export interface PackagePolicyInputStream extends NewPackagePolicyInputStream {
+  id: string;
   compiled_stream?: any;
 }
 

diff --git a/...ctions/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx b/...ctions/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
@@ -14,7 +14,7 @@ import {
   EuiSpacer,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { PackagePolicyInput, RegistryVarsEntry } from '../../../../types';
+import { NewPackagePolicyInput, RegistryVarsEntry } from '../../../../types';
 import {
   isAdvancedVar,
   PackagePolicyConfigValidationResults,
@@ -28,8 +28,8 @@ const FlexItemWithMaxWidth = styled(EuiFlexItem)`
 
 export const PackagePolicyInputConfig: React.FunctionComponent<{
   packageInputVars?: RegistryVarsEntry[];
-  packagePolicyInput: PackagePolicyInput;
-  updatePackagePolicyInput: (updatedInput: Partial<PackagePolicyInput>) => void;
+  packagePolicyInput: NewPackagePolicyInput;
+  updatePackagePolicyInput: (updatedInput: Partial<NewPackagePolicyInput>) => void;
   inputVarsValidationResults: PackagePolicyConfigValidationResults;
   forceShowErrors?: boolean;
 }> = memo(

diff --git a/...ections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx b/...ections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
@@ -17,7 +17,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import {
-  PackagePolicyInput,
+  NewPackagePolicyInput,
   PackagePolicyInputStream,
   RegistryInput,
   RegistryStream,
@@ -40,7 +40,7 @@ const ShortenedHorizontalRule = styled(EuiHorizontalRule)`
 const shouldShowStreamsByDefault = (
   packageInput: RegistryInput,
   packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>,
-  packagePolicyInput: PackagePolicyInput
+  packagePolicyInput: NewPackagePolicyInput
 ): boolean => {
   return (
     packagePolicyInput.enabled &&
@@ -63,8 +63,8 @@ const shouldShowStreamsByDefault = (
 export const PackagePolicyInputPanel: React.FunctionComponent<{
   packageInput: RegistryInput;
   packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>;
-  packagePolicyInput: PackagePolicyInput;
-  updatePackagePolicyInput: (updatedInput: Partial<PackagePolicyInput>) => void;
+  packagePolicyInput: NewPackagePolicyInput;
+  updatePackagePolicyInput: (updatedInput: Partial<NewPackagePolicyInput>) => void;
   inputValidationResults: PackagePolicyInputValidationResults;
   forceShowErrors?: boolean;
 }> = memo(
@@ -210,7 +210,7 @@ export const PackagePolicyInputPanel: React.FunctionComponent<{
                       ...updatedStream,
                     };
 
-                    const updatedInput: Partial<PackagePolicyInput> = {
+                    const updatedInput: Partial<NewPackagePolicyInput> = {
                       streams: newStreams,
                     };
 
@@ -227,7 +227,7 @@ export const PackagePolicyInputPanel: React.FunctionComponent<{
                     updatePackagePolicyInput(updatedInput);
                   }}
                   inputStreamValidationResults={
-                    inputValidationResults.streams![packagePolicyInputStream!.id]
+                    inputValidationResults.streams![packagePolicyInputStream!.data_stream!.dataset]
                   }
                   forceShowErrors={forceShowErrors}
                 />

diff --git a/...ctions/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx b/...ctions/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
@@ -16,7 +16,7 @@ import {
   EuiSpacer,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { PackagePolicyInputStream, RegistryStream, RegistryVarsEntry } from '../../../../types';
+import { NewPackagePolicyInputStream, RegistryStream, RegistryVarsEntry } from '../../../../types';
 import {
   isAdvancedVar,
   PackagePolicyConfigValidationResults,
@@ -30,8 +30,8 @@ const FlexItemWithMaxWidth = styled(EuiFlexItem)`
 
 export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
   packageInputStream: RegistryStream;
-  packagePolicyInputStream: PackagePolicyInputStream;
-  updatePackagePolicyInputStream: (updatedStream: Partial<PackagePolicyInputStream>) => void;
+  packagePolicyInputStream: NewPackagePolicyInputStream;
+  updatePackagePolicyInputStream: (updatedStream: Partial<NewPackagePolicyInputStream>) => void;
   inputStreamValidationResults: PackagePolicyConfigValidationResults;
   forceShowErrors?: boolean;
 }> = memo(