@elastic/synthetics 1.0.0-beta.33 → 1.0.0-beta.34

package/src/push/index.ts

@@ -23,8 +23,6 @@
  *
  */
 
-import { join } from 'path';
-import { existsSync } from 'fs';
 import { readFile, writeFile } from 'fs/promises';
 import { prompt } from 'enquirer';
 import { bold, yellow } from 'kleur/colors';
@@ -36,20 +34,19 @@ import {
   formatStaleMonitors,
 } from './request';
 import { buildMonitorSchema, createMonitors, MonitorSchema } from './monitor';
-import { ProjectSettings } from '../generator';
 import { Monitor } from '../dsl/monitor';
 import {
   progress,
   apiProgress,
   write,
   error,
-  SYNTHETICS_PATH,
   aborted,
   indent,
   safeNDJSONParse,
   done,
 } from '../helpers';
-import type { PushOptions } from '../common_types';
+import type { PushOptions, ProjectSettings } from '../common_types';
+import { findSyntheticsConfig, readConfig } from '../config';
 
 export async function push(monitors: Monitor[], options: PushOptions) {
   if (monitors.length === 0) {
@@ -148,34 +145,39 @@ export function formatDuplicateError(monitors: Set<Monitor>) {
   return outer;
 }
 
-const PROJECT_SETTINGS_PATH = join(SYNTHETICS_PATH, 'project.json');
 const INSTALLATION_HELP = `Run 'npx @elastic/synthetics init' to create project with default settings.`;
 
 export async function loadSettings() {
-  if (!existsSync(PROJECT_SETTINGS_PATH)) {
-    throw error(`Aborted. Synthetics project not set up.
+  try {
+    const config = await readConfig('asd');
+    // Missing config file, fake throw to capture as missing file
+    if (Object.keys(config).length === 0) {
+      throw '';
+    }
+    return config.project || ({} as ProjectSettings);
+  } catch (e) {
+    throw error(`Aborted (missing synthetics config file), Project not set up corrrectly.
 
 ${INSTALLATION_HELP}`);
   }
-
-  const contents = await readFile(PROJECT_SETTINGS_PATH, 'utf-8');
-  return JSON.parse(contents) as ProjectSettings;
 }
 
 export function validateSettings(opts: PushOptions) {
   const INVALID = 'Aborted. Invalid synthetics project settings.';
 
   let reason = '';
-  if (!opts.project) {
-    reason = 'Set project id via CLI as `--project <id>`';
+  if (!opts.id) {
+    reason = `Set project id via
+  - CLI '--id <id>'
+  - Config file 'project.id' field`;
   } else if (!opts.locations && !opts.privateLocations) {
     reason = `Set default location for all monitors via
-  - CLI as '--locations <values...> or --privateLocations <values...>'
-  - Synthetics config file 'monitors.locations' | 'monitors.privateLocations' field`;
+  - CLI '--locations <values...> or --privateLocations <values...>'
+  - Config file 'monitors.locations' | 'monitors.privateLocations' field`;
   } else if (!opts.schedule) {
     reason = `Set default schedule in minutes for all monitors via
-  - CLI as '--schedule <mins>'
-  - Synthetics config file 'monitors.schedule' field`;
+  - CLI '--schedule <mins>'
+  - Config file 'monitors.schedule' field`;
   }
 
   if (!reason) return;
@@ -187,24 +189,27 @@ ${reason}
 ${INSTALLATION_HELP}`);
 }
 
-async function overrideSettings(project: string) {
-  const settings = JSON.parse(await readFile(PROJECT_SETTINGS_PATH, 'utf-8'));
-  settings.project = project;
-
-  await writeFile(
-    PROJECT_SETTINGS_PATH,
-    JSON.stringify(settings, null, 2),
-    'utf-8'
+async function overrideSettings(oldValue: string, newValue: string) {
+  const cwd = process.cwd();
+  const configPath = await findSyntheticsConfig(cwd, cwd);
+  if (!configPath) {
+    throw aborted(`Unable to find synthetics config file: ${configPath}`);
+  }
+  const config = await readFile(configPath, 'utf-8');
+  const updatedConfig = config.replace(
+    `id: '${oldValue}'`,
+    `id: '${newValue}'`
   );
+  await writeFile(configPath, updatedConfig, 'utf-8');
 }
 
 export async function catchIncorrectSettings(
   settings: ProjectSettings,
   options: PushOptions
 ) {
-  let override = !settings.project;
-  if (settings.project && settings.project !== options.project) {
-    if (typeof process.env.TEST_OVERRIDE != null) {
+  let override = !settings.id;
+  if (settings.id && settings.id !== options.id) {
+    if (process.env.TEST_OVERRIDE != null) {
       override = Boolean(process.env.TEST_OVERRIDE);
     } else {
       // Add an extra line to make it easier to read the prompt
@@ -212,7 +217,7 @@ export async function catchIncorrectSettings(
       ({ override } = await prompt<{ override: boolean }>({
         type: 'confirm',
         name: 'override',
-        message: `Monitors were pushed under the '${settings.project}' project. Are you sure you want to push them under the new '${options.project}' (note that this will duplicate the monitors, the old ones being orphaned)`,
+        message: `Monitors were pushed under the '${settings.id}' project. Are you sure you want to push them under the new '${options.id}' (note that this will duplicate the monitors, the old ones being orphaned)`,
         initial: false,
       }));
     }
@@ -221,6 +226,6 @@ export async function catchIncorrectSettings(
     }
   }
   if (override) {
-    await overrideSettings(options.project);
+    await overrideSettings(settings.id, options.id);
   }
 }

package/src/push/monitor.ts

@@ -81,7 +81,7 @@ export async function createMonitors(
   keepStale: boolean
 ) {
   const schema: APISchema = {
-    project: options.project,
+    project: options.id,
     keep_stale: keepStale,
     monitors,
   };

package/src/push/plugin.ts

@@ -23,14 +23,17 @@
  *
  */
 
-import path from 'path';
+import { isAbsolute, dirname, extname, join } from 'path';
 import fs from 'fs/promises';
 import * as esbuild from 'esbuild';
 
+const SOURCE_DIR = join(__dirname, '..', '..');
+const SOURCE_NODE_MODULES = join(SOURCE_DIR, 'node_modules');
+
 export function commonOptions(): esbuild.BuildOptions {
   return {
     bundle: true,
-    external: ['node_modules', '@elastic/synthetics'],
+    external: ['@elastic/synthetics'],
     minify: false,
     platform: 'node',
     logLevel: 'silent',
@@ -55,27 +58,49 @@ export function MultiAssetPlugin(callback: PluginCallback): esbuild.Plugin {
     // Note that we use `isAbsolute` to handle UNC/windows style paths like C:\path\to\thing
     // This is not necessary for relative directories since `.\file` is not supported as an import
     // nor is `~/path/to/file`.
-    if (path.isAbsolute(str) || str.startsWith('./') || str.startsWith('../')) {
+    if (isAbsolute(str) || str.startsWith('./') || str.startsWith('../')) {
       return true;
     }
     return false;
   };
 
+  // If we're importing the @elastic/synthetics package
+  // directly from source instead of using the fully
+  // qualified name, we must skip it too. That's just
+  // so it doesn't get bundled on tests or when we locally
+  // refer to the package itself.
+  const isLocalSynthetics = (entryPath: string) => {
+    return entryPath.startsWith(SOURCE_DIR);
+  };
+
+  // When importing the local synthetics module directly
+  // it may import its own local dependencies, so we must
+  // make sure those will be resolved using Node's resolution
+  // algorithm, as they're still "node_modules" that we must bundle
+  const isLocalSyntheticsModule = (str: string) => {
+    return str.startsWith(SOURCE_NODE_MODULES);
+  };
+
   return {
     name: 'esbuild-multiasset-plugin',
     setup(build) {
       build.onResolve({ filter: /.*?/ }, async args => {
         // External and other packages need be marked external to
         // be removed from the bundle
-        if (
-          build.initialOptions.external?.includes(args.path) ||
-          !isBare(args.path)
-        ) {
+        if (build.initialOptions.external?.includes(args.path)) {
           return {
             external: true,
           };
         }
 
+        if (
+          !isBare(args.path) ||
+          args.importer.includes('/node_modules/') ||
+          isLocalSyntheticsModule(args.importer)
+        ) {
+          return;
+        }
+
         if (args.kind === 'entry-point') {
           return {
             path: args.path,
@@ -86,8 +111,12 @@ export function MultiAssetPlugin(callback: PluginCallback): esbuild.Plugin {
         // If the modules are resolved locally, then
         // use the imported path to get full path
         const entryPath =
-          path.join(path.dirname(args.importer), args.path) +
-          path.extname(args.importer);
+          join(dirname(args.importer), args.path) + extname(args.importer);
+
+        if (isLocalSynthetics(entryPath)) {
+          return { external: true };
+        }
+
         // Spin off another build to copy over the imported modules without bundling
         const result = await esbuild.build({
           ...commonOptions(),

package/templates/synthetics.config.ts

@@ -16,6 +16,14 @@ export default env => {
       locations: ['{{locations}}'],
       privateLocations: ['{{privateLocations}}'],
     },
+    /**
+     * Project monitors settings
+     */
+    project: {
+      id: '{{id}}',
+      url: '{{url}}',
+      space: '{{space}}',
+    },
   };
   if (env !== 'development') {
     /**