EMT-248: use union type, do some clean up

elastic · Mar 19, 2020 · 74a4729 · 74a4729
1 parent d343c93
commit 74a4729
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -20,10 +20,10 @@ export interface NewAgentAction {
   sent_at?: string;
 }
 
-export interface AgentAction extends NewAgentAction, SavedObjectAttributes {
+export type AgentAction = NewAgentAction & {
   id: string;
   created_at: string;
-}
+} & SavedObjectAttributes;
 
 export interface AgentEvent {
   type: 'STATE' | 'ERROR' | 'ACTION_RESULT' | 'ACTION';

diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.test.ts
@@ -51,7 +51,7 @@ describe('test actions handlers', () => {
   });
 
   it('should succeed on valid new agent action', async () => {
-    const mockRequest = httpServerMock.createKibanaRequest(({
+    const postNewAgentActionRequest: PostNewAgentActionRequest = {
       body: {
         action: {
           type: 'CONFIG_CHANGE',
@@ -62,7 +62,9 @@ describe('test actions handlers', () => {
       params: {
         agentId: 'id',
       },
-    } as unknown) as PostNewAgentActionRequest);
+    };
+
+    const mockRequest = httpServerMock.createKibanaRequest(postNewAgentActionRequest);
 
     const agentAction = ({
       type: 'CONFIG_CHANGE',