clean up return types for testing

elastic · Feb 7, 2022 · e3774de · e3774de
1 parent 8932ebd
commit e3774de
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/logger.ts b/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
@@ -106,45 +106,49 @@ export function reportingEventLoggerFactory(logger: LevelLogger) {
       const message = `queued report ${this.report._id}`;
       const event = deepMerge(
         {
+          message,
           kibana: { reporting: { actionType: ActionType.SCHEDULE_TASK } },
         } as Partial<ScheduledTask>,
         this.eventObj
       );
 
       genericLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
 
     logExecutionStart(): StartedExecution {
       const message = `starting ${this.report.jobtype} execution`;
       this.completionLogger.startTiming();
       const event = deepMerge(
         {
+          message,
           kibana: { reporting: { actionType: ActionType.EXECUTE_START } },
         } as Partial<StartedExecution>,
         this.eventObj
       );
 
       genericLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
 
     logExecutionComplete({ byteSize }: ExecutionCompleteMetrics): CompletedExecution {
       const message = `completed ${this.report.jobtype} execution`;
       this.completionLogger.stopTiming();
       const event = deepMerge(
         {
+          message,
           kibana: { reporting: { actionType: ActionType.EXECUTE_COMPLETE, byteSize } },
         } as Partial<CompletedExecution>,
         this.eventObj
       );
       this.completionLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
 
     logError(error: ErrorAction): ExecuteError {
       const message = `an error occurred`;
       const logErrorMessage = {
+        message,
         kibana: { reporting: { actionType: ActionType.EXECUTE_ERROR } },
         error: {
           message: error.message,
@@ -155,59 +159,63 @@ export function reportingEventLoggerFactory(logger: LevelLogger) {
       } as Partial<ExecuteError>;
       const event = deepMerge(logErrorMessage, this.eventObj);
       genericLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
 
     logClaimTask(): ClaimedTask {
       const message = `claimed report ${this.report._id}`;
       const event = deepMerge(
         {
+          message,
           kibana: { reporting: { actionType: ActionType.CLAIM_TASK } },
         } as Partial<ClaimedTask>,
         this.eventObj
       );
 
       genericLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
 
     logReportFailure(): FailedReport {
       const message = `report ${this.report._id} has failed`;
       const event = deepMerge(
         {
+          message,
           kibana: { reporting: { actionType: ActionType.FAIL_REPORT } },
         } as Partial<FailedReport>,
         this.eventObj
       );
 
       genericLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
 
     logReportSaved(): SavedReport {
       const message = `saved report ${this.report._id}`;
       const event = deepMerge(
         {
+          message,
           kibana: { reporting: { actionType: ActionType.SAVE_REPORT } },
         } as Partial<SavedReport>,
         this.eventObj
       );
 
       genericLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
 
     logRetry(): ScheduledRetry {
       const message = `scheduled retry for report ${this.report._id}`;
       const event = deepMerge(
         {
+          message,
           kibana: { reporting: { actionType: ActionType.RETRY } },
         } as Partial<ScheduledRetry>,
         this.eventObj
       );
 
       genericLogger.logEvent(message, event);
-      return { ...event, message };
+      return event;
     }
   };
 }

diff --git a/x-pack/plugins/reporting/tsconfig.json b/x-pack/plugins/reporting/tsconfig.json
@@ -20,7 +20,6 @@
     { "path": "../../../src/plugins/ui_actions/tsconfig.json" },
     { "path": "../../../src/plugins/usage_collection/tsconfig.json" },
     { "path": "../../../src/plugins/field_formats/tsconfig.json" },
-    { "path": "../event_log/tsconfig.json" },
     { "path": "../features/tsconfig.json" },
     { "path": "../licensing/tsconfig.json" },
     { "path": "../screenshotting/tsconfig.json" },