From 802dfa01fba0d4cbd2ec14a0114432a8b45021a3 Mon Sep 17 00:00:00 2001
From: Ying Mao <ying.mao@elastic.co>
Date: Wed, 19 Oct 2022 11:44:42 -0400
Subject: [PATCH] Cleanup

---
 .../actions/server/create_execute_function.ts        | 12 ++++--------
 .../server/create_unsecured_execute_function.ts      | 10 ++++------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/actions/server/create_execute_function.ts b/x-pack/plugins/actions/server/create_execute_function.ts
index 30923134235fe..19447bf8e79e5 100644
--- a/x-pack/plugins/actions/server/create_execute_function.ts
+++ b/x-pack/plugins/actions/server/create_execute_function.ts
@@ -16,7 +16,6 @@ import {
 import { ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE } from './constants/saved_objects';
 import { ExecuteOptions as ActionExecutorOptions } from './lib/action_executor';
 import { extractSavedObjectReferences, isSavedObjectExecutionSource } from './lib';
-import { RelatedSavedObjects } from './lib/related_saved_objects';
 
 interface CreateExecuteFunctionOptions {
   taskManager: TaskManagerStartContract;
@@ -25,21 +24,18 @@ interface CreateExecuteFunctionOptions {
   preconfiguredActions: PreConfiguredAction[];
 }
 
-export interface ExecuteOptions extends Pick<ActionExecutorOptions, 'params' | 'source'> {
+export interface ExecuteOptions
+  extends Pick<ActionExecutorOptions, 'params' | 'source' | 'relatedSavedObjects' | 'consumer'> {
   id: string;
   spaceId: string;
   apiKey: string | null;
   executionId: string;
-  consumer?: string;
-  relatedSavedObjects?: RelatedSavedObjects;
 }
 
-interface ActionTaskParams extends Pick<ActionExecutorOptions, 'params'> {
-  actionId: string;
+interface ActionTaskParams
+  extends Pick<ActionExecutorOptions, 'actionId' | 'params' | 'consumer' | 'relatedSavedObjects'> {
   apiKey: string | null;
   executionId: string;
-  consumer?: string;
-  relatedSavedObjects?: RelatedSavedObjects;
 }
 
 export interface GetConnectorsResult {
diff --git a/x-pack/plugins/actions/server/create_unsecured_execute_function.ts b/x-pack/plugins/actions/server/create_unsecured_execute_function.ts
index 231a298de3db2..4670601ecff83 100644
--- a/x-pack/plugins/actions/server/create_unsecured_execute_function.ts
+++ b/x-pack/plugins/actions/server/create_unsecured_execute_function.ts
@@ -14,7 +14,6 @@ import {
 import { ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE } from './constants/saved_objects';
 import { ExecuteOptions as ActionExecutorOptions } from './lib/action_executor';
 import { extractSavedObjectReferences, isSavedObjectExecutionSource } from './lib';
-import { RelatedSavedObjects } from './lib/related_saved_objects';
 
 // This allowlist should only contain connector types that don't require API keys for
 // execution.
@@ -25,15 +24,14 @@ interface CreateBulkUnsecuredExecuteFunctionOptions {
   preconfiguredConnectors: PreconfiguredConnector[];
 }
 
-export interface ExecuteOptions extends Pick<ActionExecutorOptions, 'params' | 'source'> {
+export interface ExecuteOptions
+  extends Pick<ActionExecutorOptions, 'params' | 'source' | 'relatedSavedObjects'> {
   id: string;
-  relatedSavedObjects?: RelatedSavedObjects;
 }
 
-interface ActionTaskParams extends Pick<ActionExecutorOptions, 'params'> {
-  actionId: string;
+interface ActionTaskParams
+  extends Pick<ActionExecutorOptions, 'actionId' | 'params' | 'relatedSavedObjects'> {
   apiKey: string | null;
-  relatedSavedObjects?: RelatedSavedObjects;
 }
 
 export type BulkUnsecuredExecutionEnqueuer<T> = (