From ea01bb8d0b149285a9bb9c14e581636ec471c04b Mon Sep 17 00:00:00 2001
From: Dominique Clarke <dominique.clarke@elastic.co>
Date: Fri, 28 Oct 2022 16:29:09 -0400
Subject: [PATCH] adjust tests

---
 .../bulk_cruds/add_monitor_bulk.ts             | 18 +++++++++++-------
 .../bulk_cruds/edit_monitor_bulk.ts            | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts
index 7279f636bec7ad..c35422ca95548a 100644
--- a/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts
+++ b/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts
@@ -35,8 +35,6 @@ export const createNewSavedObjectMonitorBulk = async ({
     type: syntheticsMonitorType,
     attributes: formatSecrets({
       ...monitor,
-      [ConfigKey.HEARTBEAT_ID]: monitor[ConfigKey.CUSTOM_HEARTBEAT_ID] || id,
-      [ConfigKey.CONFIG_ID]: id,
       revision: 1,
     }),
   }));
@@ -62,11 +60,17 @@ export const syncNewMonitorBulk = async ({
   spaceId: string;
 }) => {
   let newMonitors: SavedObjectsBulkResponse<EncryptedSyntheticsMonitor> | null = null;
-
-  const monitorsToCreate = normalizedMonitors.map((monitor) => ({
-    id: uuidV4(),
-    monitor: monitor as MonitorFields,
-  }));
+  const monitorsToCreate = normalizedMonitors.map((monitor) => {
+    const monitorSavedObjectId = uuidV4();
+    return {
+      id: monitorSavedObjectId,
+      monitor: {
+        ...monitor,
+        [ConfigKey.CONFIG_ID]: monitorSavedObjectId,
+        [ConfigKey.HEARTBEAT_ID]: monitor[ConfigKey.CUSTOM_HEARTBEAT_ID] || monitorSavedObjectId,
+      } as MonitorFields,
+    };
+  });
 
   try {
     const [createdMonitors, { syncErrors }] = await Promise.all([
diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/edit_monitor_bulk.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/edit_monitor_bulk.ts
index 5c28bdab9d3d13..2a0b61401e68d9 100644
--- a/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/edit_monitor_bulk.ts
+++ b/x-pack/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/edit_monitor_bulk.ts
@@ -60,7 +60,12 @@ export const syncEditedMonitorBulk = async ({
           monitorsToUpdate.map(({ previousMonitor, monitorWithRevision }) => ({
             type: syntheticsMonitorType,
             id: previousMonitor.id,
-            attributes: monitorWithRevision,
+            attributes: {
+              ...monitorWithRevision,
+              [ConfigKey.CONFIG_ID]: previousMonitor.id,
+              [ConfigKey.HEARTBEAT_ID]:
+                monitorWithRevision[ConfigKey.CUSTOM_HEARTBEAT_ID] || previousMonitor.id,
+            },
           }))
         );
         savedObjectsSuccessful = true;
@@ -74,7 +79,12 @@ export const syncEditedMonitorBulk = async ({
       try {
         const editSyncPromise = await syntheticsMonitorClient.editMonitors(
           monitorsToUpdate.map(({ normalizedMonitor, previousMonitor }) => ({
-            monitor: normalizedMonitor as MonitorFields,
+            monitor: {
+              ...(normalizedMonitor as MonitorFields),
+              [ConfigKey.CONFIG_ID]: previousMonitor.id,
+              [ConfigKey.HEARTBEAT_ID]:
+                normalizedMonitor[ConfigKey.CUSTOM_HEARTBEAT_ID] || previousMonitor.id,
+            },
             id: previousMonitor.id,
             previousMonitor,
           })),