Fix after review

Author: nchaulet

x-pack/plugins/ingest_manager/common/types/models/agent.ts

@@ -29,7 +29,7 @@ export interface NewAgentAction {
   sent_at?: string;
 }
 
-export interface AgentAction {
+export interface AgentAction extends NewAgentAction {
   type: AgentActionType;
   data?: any;
   sent_at?: string;
@@ -39,7 +39,7 @@ export interface AgentAction {
   ack_data?: any;
 }
 
-export interface AgentPolicyAction {
+export interface AgentPolicyAction extends NewAgentAction {
   id: string;
   type: AgentActionType;
   data?: any;
@@ -58,12 +58,6 @@ interface CommonAgentActionSOAttributes {
   ack_data?: string;
 }
 
-export type BaseAgentActionSOAttributes = CommonAgentActionSOAttributes & {
-  agent_id?: string;
-  policy_id?: string;
-  policy_revision?: number;
-};
-
 export type AgentActionSOAttributes = CommonAgentActionSOAttributes & {
   agent_id: string;
 };
@@ -72,6 +66,8 @@ export type AgentPolicyActionSOAttributes = CommonAgentActionSOAttributes & {
   policy_revision: number;
 };
 
+export type BaseAgentActionSOAttributes = AgentActionSOAttributes | AgentPolicyActionSOAttributes;
+
 export interface NewAgentEvent {
   type: 'STATE' | 'ERROR' | 'ACTION_RESULT' | 'ACTION';
   subtype: // State

x-pack/plugins/ingest_manager/server/services/agent_policy.ts

@@ -398,7 +398,7 @@ class AgentPolicyService {
     const packages = policy.inputs.reduce<string[]>((acc, input) => {
       const packageName = input.meta?.package?.name;
       if (packageName && acc.indexOf(packageName) < 0) {
-        return [packageName, ...acc];
+        acc.push(packageName);
       }
       return acc;
     }, []);

x-pack/plugins/ingest_manager/server/services/agents/actions.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsClientContract, SavedObject } from 'kibana/server';
+import { SavedObjectsClientContract } from 'kibana/server';
 import {
   Agent,
   AgentAction,
@@ -14,7 +14,11 @@ import {
   AgentPolicyActionSOAttributes,
 } from '../../../common/types/models';
 import { AGENT_ACTION_SAVED_OBJECT_TYPE } from '../../../common/constants';
-import { savedObjectToAgentAction } from './saved_objects';
+import {
+  isAgentActionSavedObject,
+  isPolicyActionSavedObject,
+  savedObjectToAgentAction,
+} from './saved_objects';
 import { appContextService } from '../app_context';
 import { nodeTypes } from '../../../../../../src/plugins/data/common';
 
@@ -49,13 +53,18 @@ async function createAction(
     ack_data: newAgentAction.ack_data ? JSON.stringify(newAgentAction.ack_data) : undefined,
   });
 
-  const agentAction =
-    so.attributes.agent_id !== undefined
-      ? savedObjectToAgentAction(so as SavedObject<AgentActionSOAttributes>)
-      : savedObjectToAgentAction(so as SavedObject<AgentPolicyActionSOAttributes>);
-  agentAction.data = newAgentAction.data;
+  if (isAgentActionSavedObject(so)) {
+    const agentAction = savedObjectToAgentAction(so);
+    agentAction.data = newAgentAction.data;
+
+    return agentAction;
+  } else if (isPolicyActionSavedObject(so)) {
+    const agentAction = savedObjectToAgentAction(so);
+    agentAction.data = newAgentAction.data;
 
-  return agentAction;
+    return agentAction;
+  }
+  throw new Error('Invalid action');
 }
 
 export async function getAgentActionsForCheckin(
@@ -163,12 +172,6 @@ export async function getAgentPolicyActionByIds(
   );
 }
 
-function isAgentActionSavedObject(
-  so: SavedObject<BaseAgentActionSOAttributes>
-): so is SavedObject<AgentActionSOAttributes> {
-  return so.attributes.agent_id !== undefined;
-}
-
 export async function getNewActionsSince(soClient: SavedObjectsClientContract, timestamp: string) {
   const filter = nodeTypes.function.buildNode('and', [
     nodeTypes.function.buildNode(
@@ -194,7 +197,7 @@ export async function getNewActionsSince(soClient: SavedObjectsClientContract, t
 
   return res.saved_objects
     .filter(isAgentActionSavedObject)
-    .map((so) => savedObjectToAgentAction(so as SavedObject<AgentActionSOAttributes>));
+    .map((so) => savedObjectToAgentAction(so));
 }
 
 export async function getLatestConfigChangeAction(

x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts

@@ -175,7 +175,7 @@ export function agentCheckinStateNewActionsFactory() {
         if (!data) {
           return;
         }
-        const newActions = data.filter((action) => action.agent_id);
+        const newActions = data.filter((action) => action.agent_id === agent.id);
         if (newActions.length === 0) {
           return;
         }

x-pack/plugins/ingest_manager/server/services/agents/saved_objects.ts

@@ -51,7 +51,7 @@ export function savedObjectToAgentAction(
   }
 
   // If it's an AgentPolicyAction
-  if (so.attributes.policy_id !== undefined && so.attributes.policy_revision !== undefined) {
+  if (isPolicyActionSavedObject(so)) {
     return {
       id: so.id,
       type: so.attributes.type,
@@ -63,7 +63,7 @@ export function savedObjectToAgentAction(
     };
   }
 
-  if (so.attributes.agent_id === undefined) {
+  if (!isAgentActionSavedObject(so)) {
     throw new Error(`Malformed saved object AgentAction ${so.id}`);
   }
 
@@ -77,3 +77,15 @@ export function savedObjectToAgentAction(
     ack_data: so.attributes.ack_data ? JSON.parse(so.attributes.ack_data) : undefined,
   };
 }
+
+export function isAgentActionSavedObject(
+  so: SavedObject<BaseAgentActionSOAttributes>
+): so is SavedObject<AgentActionSOAttributes> {
+  return (so.attributes as AgentActionSOAttributes).agent_id !== undefined;
+}
+
+export function isPolicyActionSavedObject(
+  so: SavedObject<BaseAgentActionSOAttributes>
+): so is SavedObject<AgentPolicyActionSOAttributes> {
+  return (so.attributes as AgentPolicyActionSOAttributes).policy_id !== undefined;
+}