Merge remote-tracking branch 'upstream/main' into synthetics-cli-proxy

Author: emilioalvap

.nvmrc

@@ -1 +1 @@
-18.20.3
+20.19.4

__tests__/core/runner.test.ts

@@ -767,6 +767,7 @@ describe('runner', () => {
         locations: ['united_kingdom'],
         schedule: 3,
         throttling: { download: 5, latency: 20, upload: 3 },
+        spaces: [],
       });
       expect(monitors[1].config).toMatchObject({
         throttling: { latency: 1000 },
@@ -824,6 +825,7 @@ describe('runner', () => {
         alert: { tls: { enabled: true } },
         retestOnFailure: true,
         fields: { area: 'website' },
+        spaces: [],
       });
       expect(monitors[1].config).toMatchObject({
         locations: ['us_east'],

__tests__/options.test.ts

@@ -66,7 +66,7 @@ describe('options', () => {
         ignoreHTTPSErrors: undefined,
         isMobile: true,
         userAgent:
-          'Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.6943.16 Mobile Safari/537.36',
+          'Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.7204.23 Mobile Safari/537.36',
         viewport: {
           height: 658,
           width: 320,

__tests__/push/monitor.test.ts

@@ -33,6 +33,7 @@ import {
   parseAlertConfig,
   parseFields,
   parseSchedule,
+  parseSpaces,
 } from '../../src/push/monitor';
 import { Server } from '../utils/server';
 import { createTestMonitor } from '../utils/test-config';
@@ -85,6 +86,7 @@ describe('Monitors', () => {
       locations: ['europe-west2-a', 'australia-southeast1-a'],
       privateLocations: ['germany'],
       fields: { area: 'website' },
+      spaces: ['test'],
     });
   });
 
@@ -105,8 +107,12 @@ describe('Monitors', () => {
         match: 'test',
       },
       fields: { area: 'website' },
+      spaces: ['test'],
+    });
+    monitor.update({
+      locations: ['brazil'],
+      fields: { env: 'dev' },
     });
-    monitor.update({ locations: ['brazil'], fields: { env: 'dev' } });
     const { schemas: schemas1 } = await buildMonitorSchema([monitor], true);
     expect(schemas1[0].hash).not.toEqual(schemas[0].hash);
     expect(schemas1[0].fields).toEqual({
@@ -497,6 +503,57 @@ heartbeat.monitors:
       `);
 
       const [mon] = await createLightweightMonitors(PROJECT_DIR, {
+        space: 'default',
+        auth: 'foo',
+        params: { foo: 'bar' },
+        kibanaVersion: '8.8.0',
+        locations: ['australia_east'],
+        tags: ['gtag1', 'gtag2'],
+        privateLocations: ['gbaz'],
+        schedule: 10,
+        retestOnFailure: false,
+        spaces: ['default'],
+      });
+
+      expect(mon.config).toEqual({
+        id: 'test-icmp',
+        name: 'test-icmp',
+        locations: ['australia_east'],
+        privateLocations: ['baz'],
+        type: 'icmp',
+        params: { foo: 'bar' },
+        schedule: 5,
+        tags: ['ltag1', 'ltag2'],
+        retestOnFailure: false,
+        fields: {
+          baz: 'qux',
+          foo: 'bar',
+        },
+        spaces: ['default'],
+      });
+    });
+
+    it('supports spaces in config', async () => {
+      await writeHBFile(`
+heartbeat.monitors:
+- type: icmp
+  schedule: @every 5m
+  id: "test-icmp"
+  name: "test-icmp"
+  privateLocations:
+    - baz
+  tags:
+    - ltag1
+    - ltag2
+  fields.foo: bar
+  fields.baz: qux
+  spaces:
+    - space1
+    - space2
+      `);
+
+      const [mon] = await createLightweightMonitors(PROJECT_DIR, {
+        space: 'default',
         auth: 'foo',
         params: { foo: 'bar' },
         kibanaVersion: '8.8.0',
@@ -521,6 +578,7 @@ heartbeat.monitors:
           baz: 'qux',
           foo: 'bar',
         },
+        spaces: ['default', 'space1', 'space2'],
       });
     });
   });
@@ -677,4 +735,58 @@ heartbeat.monitors:
       expect(result).toBeUndefined();
     });
   });
+
+  describe('parseSpaces', () => {
+    it('returns empty object if no spaces are defined', () => {
+      expect(parseSpaces({}, {} as any)).toEqual({});
+      expect(parseSpaces({ spaces: undefined }, {} as any)).toEqual({});
+      expect(parseSpaces({}, { spaces: undefined } as any)).toEqual({});
+    });
+
+    it('merges config and options spaces, including global space', () => {
+      const config = { spaces: ['space1'] };
+      const options = { spaces: ['space2'], space: 'global' };
+      expect(parseSpaces(config, options as any)).toEqual({
+        spaces: ['global', 'space1', 'space2'],
+      });
+    });
+
+    it('handles only config spaces', () => {
+      expect(parseSpaces({ spaces: ['foo'] }, {} as any)).toEqual({
+        spaces: ['foo'],
+      });
+    });
+
+    it('handles only options spaces', () => {
+      expect(parseSpaces({}, { spaces: ['bar'] } as any)).toEqual({
+        spaces: ['bar'],
+      });
+    });
+
+    it('handles global space only', () => {
+      expect(parseSpaces({}, { space: 'default' } as any)).toEqual({});
+    });
+
+    it('deduplicates spaces', () => {
+      const config = { spaces: ['space1', 'space2'] };
+      const options = { spaces: ['space2', 'space3'], space: 'space1' };
+      expect(parseSpaces(config, options as any)).toEqual({
+        spaces: ['space1', 'space2', 'space3'],
+      });
+    });
+
+    it('returns wildcard if present', () => {
+      expect(
+        parseSpaces({ spaces: ['*'] }, {
+          space: 'default',
+          spaces: ['foo'],
+        } as any)
+      ).toEqual({
+        spaces: ['*'],
+      });
+      expect(parseSpaces({}, { spaces: ['*'] } as any)).toEqual({
+        spaces: ['*'],
+      });
+    });
+  });
 });

__tests__/utils/jest-global-setup.ts

@@ -27,6 +27,12 @@ import { spawn } from 'child_process';
 import { wsEndpoint } from './test-config';
 
 module.exports = async () => {
+  // Unset the SYNTHETICS_API_KEY to ensure it doesn't affect tests
+  if (process.env.SYNTHETICS_API_KEY) {
+    console.log('Unsetting SYNTHETICS_API_KEY environment variable for tests');
+    delete process.env.SYNTHETICS_API_KEY;
+  }
+
   if (wsEndpoint) {
     return new Promise((resolve, reject) => {
       console.log(`\nRunning BrowserService ${wsEndpoint}`);

__tests__/utils/test-config.ts

@@ -43,6 +43,7 @@ export function createTestMonitor(filename: string, type = 'browser') {
     locations: ['united_kingdom', 'australia_east'],
     privateLocations: ['germany'],
     fields: { area: 'website' },
+    spaces: ['test'],
   });
   monitor.setSource({
     file: join(FIXTURES_DIR, filename),