adjust tests

elastic · Oct 28, 2022 · 53c1d9e · 53c1d9e
1 parent ea01bb8
commit 53c1d9e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/...ynthetics/components/monitors_page/management/monitor_list_table/monitor_details_link.tsx b/...ynthetics/components/monitors_page/management/monitor_list_table/monitor_details_link.tsx
@@ -31,7 +31,10 @@ export const MonitorDetailsLink = ({
   const locationId =
     lastSelectedLocationId && monitorHasLocation ? lastSelectedLocationId : firstMonitorLocationId;
 
-  const monitorDetailLinkUrl = useMonitorDetailLocator({ monitorId: monitor.id, locationId });
+  const monitorDetailLinkUrl = useMonitorDetailLocator({
+    monitorId: monitor[ConfigKey.CONFIG_ID],
+    locationId,
+  });
 
   return (
     <>

diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/add_monitor.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/add_monitor.ts
@@ -126,8 +126,6 @@ export const createNewSavedObjectMonitor = async ({
     syntheticsMonitorType,
     formatSecrets({
       ...normalizedMonitor,
-      [ConfigKey.HEARTBEAT_ID]: normalizedMonitor[ConfigKey.CUSTOM_HEARTBEAT_ID] || id,
-      [ConfigKey.CONFIG_ID]: id,
       revision: 1,
     }),
     id
@@ -167,6 +165,8 @@ export const syncNewMonitor = async ({
   let monitorSavedObject: SavedObject<EncryptedSyntheticsMonitor> | null = null;
   const monitorWithNamespace = {
     ...normalizedMonitor,
+    [ConfigKey.HEARTBEAT_ID]: normalizedMonitor[ConfigKey.CUSTOM_HEARTBEAT_ID] || newMonitorId,
+    [ConfigKey.CONFIG_ID]: newMonitorId,
     [ConfigKey.NAMESPACE]: preserveNamespace
       ? normalizedMonitor[ConfigKey.NAMESPACE]
       : getMonitorNamespace(server, request, normalizedMonitor[ConfigKey.NAMESPACE]),

diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.test.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.test.ts
@@ -16,7 +16,6 @@ import {
 import { UptimeServerSetup } from '../../legacy_uptime/lib/adapters';
 import { SyntheticsService } from '../../synthetics_service/synthetics_service';
 import { SyntheticsMonitorClient } from '../../synthetics_service/synthetics_monitor/synthetics_monitor_client';
-import { formatSecrets } from '../../synthetics_service/utils';
 
 jest.mock('../telemetry/monitor_upgrade_sender', () => ({
   sendTelemetryEvents: jest.fn(),
@@ -94,7 +93,6 @@ describe('syncEditedMonitor', () => {
   it('includes the isEdit flag', async () => {
     await syncEditedMonitor({
       normalizedMonitor: editedMonitor,
-      monitorWithRevision: formatSecrets(editedMonitor),
       previousMonitor,
       decryptedPreviousMonitor:
         previousMonitor as unknown as SavedObject<SyntheticsMonitorWithSecrets>,

diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.ts
@@ -90,7 +90,6 @@ export const editSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => (
         ...validationResult.decodedMonitor,
         revision: (previousMonitor.attributes[ConfigKey.REVISION] || 0) + 1,
       };
-      const formattedMonitor = formatSecrets(monitorWithRevision);
 
       const { errors, editedMonitor: editedMonitorSavedObject } = await syncEditedMonitor({
         server,
@@ -99,8 +98,7 @@ export const editSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => (
         syntheticsMonitorClient,
         savedObjectsClient,
         request,
-        normalizedMonitor: validationResult.decodedMonitor,
-        monitorWithRevision: formattedMonitor,
+        normalizedMonitor: monitorWithRevision,
         spaceId,
       });
 
@@ -125,7 +123,6 @@ export const editSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => (
 
 export const syncEditedMonitor = async ({
   normalizedMonitor,
-  monitorWithRevision,
   previousMonitor,
   decryptedPreviousMonitor,
   server,
@@ -135,7 +132,6 @@ export const syncEditedMonitor = async ({
   spaceId,
 }: {
   normalizedMonitor: SyntheticsMonitor;
-  monitorWithRevision: SyntheticsMonitorWithSecrets;
   previousMonitor: SavedObject<EncryptedSyntheticsMonitor>;
   decryptedPreviousMonitor: SavedObject<SyntheticsMonitorWithSecrets>;
   server: UptimeServerSetup;
@@ -145,16 +141,24 @@ export const syncEditedMonitor = async ({
   spaceId: string;
 }) => {
   try {
+    const monitorWithId = {
+      ...normalizedMonitor,
+      [ConfigKey.HEARTBEAT_ID]:
+        normalizedMonitor[ConfigKey.CUSTOM_HEARTBEAT_ID] || previousMonitor.id,
+      [ConfigKey.CONFIG_ID]: previousMonitor.id,
+    };
+    const formattedMonitor = formatSecrets(monitorWithId);
+
     const editedSOPromise = savedObjectsClient.update<MonitorFields>(
       syntheticsMonitorType,
       previousMonitor.id,
-      monitorWithRevision
+      formattedMonitor
     );
 
     const allPrivateLocations = await getSyntheticsPrivateLocations(savedObjectsClient);
 
     const editSyncPromise = syntheticsMonitorClient.editMonitors(
-      [{ monitor: normalizedMonitor as MonitorFields, id: previousMonitor.id, previousMonitor }],
+      [{ monitor: monitorWithId as MonitorFields, id: previousMonitor.id, previousMonitor }],
       request,
       savedObjectsClient,
       allPrivateLocations,

diff --git a/x-pack/test/api_integration/apis/uptime/rest/add_monitor_private_location.ts b/x-pack/test/api_integration/apis/uptime/rest/add_monitor_private_location.ts
@@ -148,7 +148,15 @@ export default function ({ getService }: FtrProviderContext) {
         .send(httpMonitorJson);
 
       expect(apiResponse.body.attributes).eql(
-        omit({ ...httpMonitorJson, revision: 2 }, secretKeys)
+        omit(
+          {
+            ...httpMonitorJson,
+            [ConfigKey.HEARTBEAT_ID]: apiResponse.body.id,
+            [ConfigKey.CONFIG_ID]: apiResponse.body.id,
+            revision: 2,
+          },
+          secretKeys
+        )
       );
     });