@datadog/datadog-ci 3.1.0 → 3.3.0

package/dist/commands/synthetics/build-and-test.js

@@ -0,0 +1,102 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spawnBuildPluginDevServer = exports.UnconfiguredBuildPluginError = exports.DEFAULT_BUILD_PLUGIN_PORT = void 0;
+const child_process_1 = require("child_process");
+const events_1 = require("events");
+const axios_1 = __importDefault(require("axios"));
+const internal_1 = require("./utils/internal");
+exports.DEFAULT_BUILD_PLUGIN_PORT = 4000;
+exports.UnconfiguredBuildPluginError = new Error(`
+We couldn't detect the Datadog Build plugins within your build. Did you add it?
+If not, you can learn more about it here: https://github.com/DataDog/build-plugins#readme
+`);
+const watchBuildPluginServerReadiness = (buildPluginServerUrl, abortSignal) => __awaiter(void 0, void 0, void 0, function* () {
+    return (0, internal_1.poll)(() => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const response = yield axios_1.default.get(buildPluginServerUrl, { signal: abortSignal });
+            const { status, publicPrefix = '' } = response.data;
+            if (status === 'success') {
+                return {
+                    readiness: 'buildCommandReady',
+                    publicPrefix,
+                };
+            }
+        }
+        catch (error) {
+            // If we got an http error with a response, return buildCommandErrored
+            if (axios_1.default.isAxiosError(error) && error.code !== 'ECONNREFUSED' && error.response) {
+                return {
+                    readiness: 'buildCommandErrored',
+                    error: new Error(`Dev server returned error: ${error.response.status} ${error.response.statusText}`),
+                };
+            }
+            // Otherwise ignore errors and continue polling in case the dev server is still starting
+        }
+    }), abortSignal);
+});
+const watchBuildCommandExit = (buildCommand) => __awaiter(void 0, void 0, void 0, function* () {
+    yield (0, events_1.once)(buildCommand, 'close');
+    return {
+        readiness: 'buildCommandExited',
+    };
+});
+const spawnBuildPluginDevServer = (buildCommand, reporter) => __awaiter(void 0, void 0, void 0, function* () {
+    const buildPluginPort = exports.DEFAULT_BUILD_PLUGIN_PORT;
+    // Spawn the build command process with the BUILD_PLUGINS_S8S_PORT environment variable.
+    const buildCommandProcess = (0, child_process_1.spawn)(buildCommand, [], {
+        env: { BUILD_PLUGINS_S8S_PORT: String(buildPluginPort) },
+        shell: true,
+    });
+    // Wait for the build command to either exit, or provide a dev server serving the built assets.
+    const controller = new AbortController(); // used to abort the watcher and its http requests
+    const buildCommandExited = watchBuildCommandExit(buildCommandProcess);
+    const buildCommandReady = watchBuildPluginServerReadiness('http://localhost:' + String(buildPluginPort) + '/_datadog-ci_/build-status', controller.signal);
+    const buildCommandReturnValue = yield Promise.race([
+        buildCommandReady,
+        buildCommandExited,
+    ]);
+    controller.abort();
+    if (buildCommandReturnValue === undefined) {
+        yield killBuildCommand(buildCommandProcess, buildCommandExited);
+        throw new Error('Unexpected state: buildCommandReturnValue is undefined');
+    }
+    if (buildCommandReturnValue.readiness === 'buildCommandExited') {
+        reporter.error(exports.UnconfiguredBuildPluginError.message);
+        yield killBuildCommand(buildCommandProcess, buildCommandExited);
+        throw exports.UnconfiguredBuildPluginError;
+    }
+    if (buildCommandReturnValue.readiness === 'buildCommandErrored') {
+        reporter.error(buildCommandReturnValue.error.message);
+        yield killBuildCommand(buildCommandProcess, buildCommandExited);
+        throw buildCommandReturnValue.error;
+    }
+    const { publicPrefix = '' } = buildCommandReturnValue;
+    // Once the build server is ready, return its URL with the advertised public prefix to run the tests against it.
+    return {
+        devServerUrl: 'http://localhost:' + String(buildPluginPort),
+        publicPrefix,
+        stop: () => __awaiter(void 0, void 0, void 0, function* () { return killBuildCommand(buildCommandProcess, buildCommandExited); }),
+    };
+});
+exports.spawnBuildPluginDevServer = spawnBuildPluginDevServer;
+const killBuildCommand = (buildCommandProcess, buildCommandExited) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    buildCommandProcess.kill();
+    (_a = buildCommandProcess.stdin) === null || _a === void 0 ? void 0 : _a.destroy();
+    (_b = buildCommandProcess.stdout) === null || _b === void 0 ? void 0 : _b.destroy();
+    (_c = buildCommandProcess.stderr) === null || _c === void 0 ? void 0 : _c.destroy();
+    yield buildCommandExited;
+});
+//# sourceMappingURL=build-and-test.js.map

package/dist/commands/synthetics/build-and-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-and-test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/build-and-test.ts"],"names":[],"mappings":"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"}

package/dist/commands/synthetics/deploy-tests-command.d.ts

@@ -1,22 +1,14 @@
-import { Command } from 'clipanion';
+import { BaseCommand, RecursivePartial } from './base-command';
 import { DeployTestsCommandConfig } from './interfaces';
-export declare const DEFAULT_DEPLOY_TESTS_COMMAND_CONFIG: DeployTestsCommandConfig;
-export declare class DeployTestsCommand extends Command {
+export declare class DeployTestsCommand extends BaseCommand {
     static paths: string[][];
     static usage: import("clipanion").Usage;
-    configPath: string | undefined;
-    private apiKey;
-    private appKey;
-    private datadogSite;
+    protected subdomain: string | undefined;
+    protected config: DeployTestsCommandConfig;
     private files;
     private publicIds;
-    private subdomain;
-    private reporter;
-    private config;
-    private logger;
-    private fips;
-    private fipsIgnoreError;
-    private fipsConfig;
-    execute(): Promise<1 | undefined>;
-    private resolveConfig;
+    static getDefaultConfig(): DeployTestsCommandConfig;
+    execute(): Promise<0 | 1>;
+    protected resolveConfigFromEnv(): RecursivePartial<DeployTestsCommandConfig>;
+    protected resolveConfigFromCli(): RecursivePartial<DeployTestsCommandConfig>;
 }

package/dist/commands/synthetics/deploy-tests-command.js

@@ -12,72 +12,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeployTestsCommand = exports.DEFAULT_DEPLOY_TESTS_COMMAND_CONFIG = void 0;
+exports.DeployTestsCommand = void 0;
 const clipanion_1 = require("clipanion");
-const deep_extend_1 = __importDefault(require("deep-extend"));
 const terminal_link_1 = __importDefault(require("terminal-link"));
-const constants_1 = require("../../constants");
-const env_1 = require("../../helpers/env");
-const fips_1 = require("../../helpers/fips");
-const logger_1 = require("../../helpers/logger");
-const utils_1 = require("../../helpers/utils");
+const base_command_1 = require("./base-command");
 const deploy_tests_lib_1 = require("./deploy-tests-lib");
-const errors_1 = require("./errors");
-const default_1 = require("./reporters/default");
-const public_1 = require("./utils/public");
-exports.DEFAULT_DEPLOY_TESTS_COMMAND_CONFIG = {
-    apiKey: '',
-    appKey: '',
-    configPath: 'datadog-ci.json',
-    datadogSite: 'datadoghq.com',
-    files: [],
-    proxy: { protocol: 'http' },
-    publicIds: [],
-    subdomain: 'app',
-};
 const configurationLink = 'https://docs.datadoghq.com/continuous_testing/cicd_integrations/configuration';
-const $1 = (text) => (0, terminal_link_1.default)(text, `${configurationLink}#global-configuration-file-options`);
 const $2 = (text) => (0, terminal_link_1.default)(text, `${configurationLink}#test-files`);
-class DeployTestsCommand extends clipanion_1.Command {
+class DeployTestsCommand extends base_command_1.BaseCommand {
     constructor() {
-        var _a, _b;
         super(...arguments);
-        this.configPath = clipanion_1.Option.String('--config', { description: `Pass a path to a ${$1('global configuration file')}.` });
-        this.apiKey = clipanion_1.Option.String('--apiKey', { description: 'The API key used to query the Datadog API.' });
-        this.appKey = clipanion_1.Option.String('--appKey', { description: 'The application key used to query the Datadog API.' });
-        this.datadogSite = clipanion_1.Option.String('--datadogSite', { description: 'The Datadog instance to which request is sent.' });
+        this.subdomain = clipanion_1.Option.String('--subdomain', {
+            description: 'The name of the custom subdomain set to access your Datadog application. If the URL used to access Datadog is `myorg.datadoghq.com`, the `subdomain` value needs to be set to `myorg`.',
+        });
+        this.config = DeployTestsCommand.getDefaultConfig();
         this.files = clipanion_1.Option.Array('-f,--files', {
             description: `Glob pattern to detect Synthetic test ${$2('configuration files')}}.`,
         });
         this.publicIds = clipanion_1.Option.Array('-p,--public-id', { description: 'Specify a test to run.' });
-        this.subdomain = clipanion_1.Option.String('--subdomain', {
-            description: 'The name of the custom subdomain set to access your Datadog application. If the URL used to access Datadog is `myorg.datadoghq.com`, the `subdomain` value needs to be set to `myorg`.',
-        });
-        this.config = JSON.parse(JSON.stringify(exports.DEFAULT_DEPLOY_TESTS_COMMAND_CONFIG)); // Deep copy to avoid mutation
-        this.logger = new logger_1.Logger((s) => {
-            this.context.stdout.write(s);
-        }, logger_1.LogLevel.INFO);
-        this.fips = clipanion_1.Option.Boolean('--fips', false);
-        this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
-        this.fipsConfig = {
-            fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
-            fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
-        };
+    }
+    static getDefaultConfig() {
+        return Object.assign(Object.assign({}, super.getDefaultConfig()), { files: [], publicIds: [], subdomain: 'app' });
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
-            const reporters = [new default_1.DefaultReporter(this)];
-            this.reporter = (0, public_1.getReporter)(reporters);
-            try {
-                yield this.resolveConfig();
-            }
-            catch (error) {
-                if (error instanceof errors_1.CiError) {
-                    (0, public_1.reportCiError)(error, this.reporter);
-                }
-                return 1;
-            }
+            // populate the config
+            yield this.setup();
             try {
                 yield (0, deploy_tests_lib_1.deployTests)(this.reporter, this.config);
             }
@@ -85,47 +45,15 @@ class DeployTestsCommand extends clipanion_1.Command {
                 this.logger.error(`Error: ${error.message}`);
                 return 1;
             }
+            return 0;
         });
     }
-    resolveConfig() {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            // Defaults < file < ENV < CLI
-            // Override with config file variables (e.g. datadog-ci.json)
-            try {
-                // Override Config Path with ENV variables
-                const overrideConfigPath = (_b = (_a = this.configPath) !== null && _a !== void 0 ? _a : process.env.DATADOG_SYNTHETICS_CONFIG_PATH) !== null && _b !== void 0 ? _b : 'datadog-ci.json';
-                this.config = yield (0, utils_1.resolveConfigFromFile)(this.config, {
-                    configPath: overrideConfigPath,
-                    defaultConfigPaths: [this.config.configPath],
-                });
-            }
-            catch (error) {
-                if (this.configPath) {
-                    throw error;
-                }
-            }
-            // Override with ENV variables
-            this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
-                apiKey: process.env.DATADOG_API_KEY,
-                appKey: process.env.DATADOG_APP_KEY,
-                configPath: process.env.DATADOG_SYNTHETICS_CONFIG_PATH,
-                datadogSite: process.env.DATADOG_SITE,
-                files: (_c = process.env.DATADOG_SYNTHETICS_FILES) === null || _c === void 0 ? void 0 : _c.split(';'),
-                publicIds: (_d = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _d === void 0 ? void 0 : _d.split(';'),
-                subdomain: process.env.DATADOG_SUBDOMAIN,
-            }));
-            // Override with CLI parameters
-            this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
-                apiKey: this.apiKey,
-                appKey: this.appKey,
-                configPath: this.configPath,
-                datadogSite: this.datadogSite,
-                files: this.files,
-                publicIds: this.publicIds,
-                subdomain: this.subdomain,
-            }));
-        });
+    resolveConfigFromEnv() {
+        var _a, _b;
+        return Object.assign(Object.assign({}, super.resolveConfigFromEnv()), { files: (_a = process.env.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), subdomain: process.env.DATADOG_SUBDOMAIN });
+    }
+    resolveConfigFromCli() {
+        return Object.assign(Object.assign({}, super.resolveConfigFromCli()), { files: this.files, publicIds: this.publicIds, subdomain: this.subdomain });
     }
 }
 exports.DeployTestsCommand = DeployTestsCommand;

package/dist/commands/synthetics/deploy-tests-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,kEAAwC;AAExC,iDAA4D;AAC5D,yDAA8C;AAG9C,MAAM,iBAAiB,GAAG,+EAA+E,CAAA;AAEzG,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,IAAI,EAAE,GAAG,iBAAiB,aAAa,CAAC,CAAA;AAElF,MAAa,kBAAmB,SAAQ,0BAAW;IAAnD;;QAqBY,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YACjD,WAAW,EACT,wLAAwL;SAC3L,CAAC,CAAA;QAEQ,WAAM,GAA6B,kBAAkB,CAAC,gBAAgB,EAAE,CAAA;QAE1E,UAAK,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,EAAE;YACzC,WAAW,EAAE,yCAAyC,EAAE,CAAC,qBAAqB,CAAC,IAAI;SACpF,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAC,WAAW,EAAE,wBAAwB,EAAC,CAAC,CAAA;IA2C7F,CAAC;IAzCQ,MAAM,CAAC,gBAAgB;QAC5B,uCACK,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,EAAE,EACT,SAAS,EAAE,EAAE,EACb,SAAS,EAAE,KAAK,IACjB;IACH,CAAC;IAEY,OAAO;;YAClB,sBAAsB;YACtB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAElB,IAAI;gBACF,MAAM,IAAA,8BAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;aAC9C;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAE5C,OAAO,CAAC,CAAA;aACT;YAED,OAAO,CAAC,CAAA;QACV,CAAC;KAAA;IAES,oBAAoB;;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,wBAAwB,0CAAE,KAAK,CAAC,GAAG,CAAC,EACvD,SAAS,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,6BAA6B,0CAAE,KAAK,CAAC,GAAG,CAAC,EAChE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IACzC;IACH,CAAC;IAES,oBAAoB;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,SAAS,EAAE,IAAI,CAAC,SAAS,EACzB,SAAS,EAAE,IAAI,CAAC,SAAS,IAC1B;IACH,CAAC;;AAzEH,gDA0EC;AAzEe,wBAAK,GAAG,CAAC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,AAAnC,CAAmC;AAExC,wBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,oEAAoE;IACjF,OAAO,EAAE;;KAER;IACD,QAAQ,EAAE;QACR;YACE,yDAAyD;YACzD,oFAAoF;SACrF;QACD;YACE,mCAAmC;YACnC,gHAAgH;SACjH;KACF;CACF,CAAC,AAhBiB,CAgBjB"}

package/dist/commands/synthetics/import-tests-command.d.ts

@@ -1,22 +1,14 @@
-import { Command } from 'clipanion';
+import { BaseCommand, RecursivePartial } from './base-command';
 import { ImportTestsCommandConfig } from './interfaces';
-export declare const DEFAULT_IMPORT_TESTS_COMMAND_CONFIG: ImportTestsCommandConfig;
-export declare class ImportTestsCommand extends Command {
+export declare class ImportTestsCommand extends BaseCommand {
     static paths: string[][];
     static usage: import("clipanion").Usage;
-    private apiKey;
-    private appKey;
-    private configPath;
-    private datadogSite;
+    protected config: ImportTestsCommandConfig;
     private files;
     private publicIds;
     private testSearchQuery;
-    private reporter;
-    private config;
-    private logger;
-    private fips;
-    private fipsIgnoreError;
-    private fipsConfig;
+    static getDefaultConfig(): ImportTestsCommandConfig;
     execute(): Promise<1 | undefined>;
-    private resolveConfig;
+    protected resolveConfigFromEnv(): RecursivePartial<ImportTestsCommandConfig>;
+    protected resolveConfigFromCli(): RecursivePartial<ImportTestsCommandConfig>;
 }

package/dist/commands/synthetics/import-tests-command.js

@@ -12,39 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportTestsCommand = exports.DEFAULT_IMPORT_TESTS_COMMAND_CONFIG = void 0;
+exports.ImportTestsCommand = void 0;
 const clipanion_1 = require("clipanion");
-const deep_extend_1 = __importDefault(require("deep-extend"));
 const terminal_link_1 = __importDefault(require("terminal-link"));
-const constants_1 = require("../../constants");
-const env_1 = require("../../helpers/env");
-const fips_1 = require("../../helpers/fips");
-const logger_1 = require("../../helpers/logger");
-const utils_1 = require("../../helpers/utils");
+const base_command_1 = require("./base-command");
 const import_tests_lib_1 = require("./import-tests-lib");
-const default_1 = require("./reporters/default");
-const public_1 = require("./utils/public");
-exports.DEFAULT_IMPORT_TESTS_COMMAND_CONFIG = {
-    apiKey: '',
-    appKey: '',
-    configPath: 'datadog-ci.json',
-    datadogSite: 'datadoghq.com',
-    files: [],
-    proxy: { protocol: 'http' },
-    publicIds: [],
-    testSearchQuery: '',
-};
 const configurationLink = 'https://docs.datadoghq.com/continuous_testing/cicd_integrations/configuration';
-const $1 = (text) => (0, terminal_link_1.default)(text, `${configurationLink}#global-configuration-file-options`);
 const $2 = (text) => (0, terminal_link_1.default)(text, `${configurationLink}#test-files`);
-class ImportTestsCommand extends clipanion_1.Command {
+class ImportTestsCommand extends base_command_1.BaseCommand {
     constructor() {
-        var _a, _b;
         super(...arguments);
-        this.apiKey = clipanion_1.Option.String('--apiKey', { description: 'The API key used to query the Datadog API.' });
-        this.appKey = clipanion_1.Option.String('--appKey', { description: 'The application key used to query the Datadog API.' });
-        this.configPath = clipanion_1.Option.String('--config', { description: `Pass a path to a ${$1('global configuration file')}.` });
-        this.datadogSite = clipanion_1.Option.String('--datadogSite', { description: 'The Datadog instance to which request is sent.' });
+        this.config = ImportTestsCommand.getDefaultConfig();
         this.files = clipanion_1.Option.Array('-f,--files', {
             description: `Glob pattern to detect Synthetic test files ${$2('configuration files')}} and write to this file.`,
         });
@@ -52,29 +30,14 @@ class ImportTestsCommand extends clipanion_1.Command {
         this.testSearchQuery = clipanion_1.Option.String('-s,--search', {
             description: 'Pass a query to select which Synthetic tests to run.',
         });
-        this.config = JSON.parse(JSON.stringify(exports.DEFAULT_IMPORT_TESTS_COMMAND_CONFIG)); // Deep copy to avoid mutation
-        this.logger = new logger_1.Logger((s) => {
-            this.context.stdout.write(s);
-        }, logger_1.LogLevel.INFO);
-        this.fips = clipanion_1.Option.Boolean('--fips', false);
-        this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
-        this.fipsConfig = {
-            fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
-            fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
-        };
+    }
+    static getDefaultConfig() {
+        return Object.assign(Object.assign({}, super.getDefaultConfig()), { files: [], publicIds: [], testSearchQuery: '' });
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
-            const reporters = [new default_1.DefaultReporter(this)];
-            this.reporter = (0, public_1.getReporter)(reporters);
-            (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
-            try {
-                yield this.resolveConfig();
-            }
-            catch (error) {
-                this.logger.error(`Error: invalid config`);
-                return 1;
-            }
+            // populate the config
+            yield this.setup();
             try {
                 yield (0, import_tests_lib_1.importTests)(this.reporter, this.config);
             }
@@ -84,43 +47,12 @@ class ImportTestsCommand extends clipanion_1.Command {
             }
         });
     }
-    resolveConfig() {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            // Defaults < file < ENV < CLI
-            try {
-                // Override Config Path with ENV variables
-                const overrideConfigPath = (_b = (_a = this.configPath) !== null && _a !== void 0 ? _a : process.env.DATADOG_SYNTHETICS_CONFIG_PATH) !== null && _b !== void 0 ? _b : 'datadog-ci.json';
-                this.config = yield (0, utils_1.resolveConfigFromFile)(this.config, {
-                    configPath: overrideConfigPath,
-                    defaultConfigPaths: [this.config.configPath],
-                });
-            }
-            catch (error) {
-                if (this.configPath) {
-                    throw error;
-                }
-            }
-            this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
-                apiKey: process.env.DATADOG_API_KEY,
-                appKey: process.env.DATADOG_APP_KEY,
-                configPath: process.env.DATADOG_SYNTHETICS_CONFIG_PATH,
-                datadogSite: process.env.DATADOG_SITE,
-                files: (_c = process.env.DATADOG_SYNTHETICS_FILES) === null || _c === void 0 ? void 0 : _c.split(';'),
-                publicIds: (_d = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _d === void 0 ? void 0 : _d.split(';'),
-                testSearchQuery: process.env.DATADOG_SYNTHETICS_TEST_SEARCH_QUERY,
-            }));
-            // Override with CLI parameters
-            this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
-                apiKey: this.apiKey,
-                appKey: this.appKey,
-                configPath: this.configPath,
-                datadogSite: this.datadogSite,
-                files: this.files,
-                publicIds: this.publicIds,
-                testSearchQuery: this.testSearchQuery,
-            }));
-        });
+    resolveConfigFromEnv() {
+        var _a, _b;
+        return Object.assign(Object.assign({}, super.resolveConfigFromEnv()), { files: (_a = process.env.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), testSearchQuery: process.env.DATADOG_SYNTHETICS_TEST_SEARCH_QUERY });
+    }
+    resolveConfigFromCli() {
+        return Object.assign(Object.assign({}, super.resolveConfigFromCli()), { files: this.files, publicIds: this.publicIds, testSearchQuery: this.testSearchQuery });
     }
 }
 exports.ImportTestsCommand = ImportTestsCommand;

package/dist/commands/synthetics/import-tests-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/import-tests-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/import-tests-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,kEAAwC;AAExC,iDAA4D;AAC5D,yDAA8C;AAG9C,MAAM,iBAAiB,GAAG,+EAA+E,CAAA;AAEzG,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,IAAI,EAAE,GAAG,iBAAiB,aAAa,CAAC,CAAA;AAElF,MAAa,kBAAmB,SAAQ,0BAAW;IAAnD;;QAkBY,WAAM,GAA6B,kBAAkB,CAAC,gBAAgB,EAAE,CAAA;QAE1E,UAAK,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,EAAE;YACzC,WAAW,EAAE,+CAA+C,EAAE,CAAC,qBAAqB,CAAC,2BAA2B;SACjH,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAC,WAAW,EAAE,2BAA2B,EAAC,CAAC,CAAA;QACtF,oBAAe,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YACrD,WAAW,EAAE,sDAAsD;SACpE,CAAC,CAAA;IAyCJ,CAAC;IAvCQ,MAAM,CAAC,gBAAgB;QAC5B,uCACK,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,EAAE,EACT,SAAS,EAAE,EAAE,EACb,eAAe,EAAE,EAAE,IACpB;IACH,CAAC;IAEY,OAAO;;YAClB,sBAAsB;YACtB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAElB,IAAI;gBACF,MAAM,IAAA,8BAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;aAC9C;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAE5C,OAAO,CAAC,CAAA;aACT;QACH,CAAC;KAAA;IAES,oBAAoB;;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,wBAAwB,0CAAE,KAAK,CAAC,GAAG,CAAC,EACvD,SAAS,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,6BAA6B,0CAAE,KAAK,CAAC,GAAG,CAAC,EAChE,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,oCAAoC,IAClE;IACH,CAAC;IAES,oBAAoB;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,SAAS,EAAE,IAAI,CAAC,SAAS,EACzB,eAAe,EAAE,IAAI,CAAC,eAAe,IACtC;IACH,CAAC;;AAlEH,gDAmEC;AAlEe,wBAAK,GAAG,CAAC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,AAAnC,CAAmC;AAExC,wBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,6FAA6F;IAC1G,OAAO,EAAE;;KAER;IACD,QAAQ,EAAE;QACR;YACE,0CAA0C;YAC1C,oFAAoF;SACrF;QACD,CAAC,mCAAmC,EAAE,iEAAiE,CAAC;KACzG;CACF,CAAC,AAbiB,CAajB"}

package/dist/commands/synthetics/index.d.ts

@@ -3,5 +3,5 @@ export * from './interfaces';
 export { DefaultReporter } from './reporters/default';
 export { JUnitReporter } from './reporters/junit';
 export { executeTests, execute } from './run-tests-lib';
-export { DEFAULT_COMMAND_CONFIG } from './run-tests-command';
 export * as utils from './utils/public';
+export declare const DEFAULT_COMMAND_CONFIG: import("./interfaces").RunTestsCommandConfig;

package/dist/commands/synthetics/index.js

@@ -26,7 +26,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.utils = exports.DEFAULT_COMMAND_CONFIG = exports.execute = exports.executeTests = exports.JUnitReporter = exports.DefaultReporter = exports.CriticalError = exports.CiError = void 0;
+exports.DEFAULT_COMMAND_CONFIG = exports.utils = exports.execute = exports.executeTests = exports.JUnitReporter = exports.DefaultReporter = exports.CriticalError = exports.CiError = void 0;
+const run_tests_lib_1 = require("./run-tests-lib");
 var errors_1 = require("./errors");
 Object.defineProperty(exports, "CiError", { enumerable: true, get: function () { return errors_1.CiError; } });
 Object.defineProperty(exports, "CriticalError", { enumerable: true, get: function () { return errors_1.CriticalError; } });
@@ -35,10 +36,9 @@ var default_1 = require("./reporters/default");
 Object.defineProperty(exports, "DefaultReporter", { enumerable: true, get: function () { return default_1.DefaultReporter; } });
 var junit_1 = require("./reporters/junit");
 Object.defineProperty(exports, "JUnitReporter", { enumerable: true, get: function () { return junit_1.JUnitReporter; } });
-var run_tests_lib_1 = require("./run-tests-lib");
-Object.defineProperty(exports, "executeTests", { enumerable: true, get: function () { return run_tests_lib_1.executeTests; } });
-Object.defineProperty(exports, "execute", { enumerable: true, get: function () { return run_tests_lib_1.execute; } });
-var run_tests_command_1 = require("./run-tests-command");
-Object.defineProperty(exports, "DEFAULT_COMMAND_CONFIG", { enumerable: true, get: function () { return run_tests_command_1.DEFAULT_COMMAND_CONFIG; } });
+var run_tests_lib_2 = require("./run-tests-lib");
+Object.defineProperty(exports, "executeTests", { enumerable: true, get: function () { return run_tests_lib_2.executeTests; } });
+Object.defineProperty(exports, "execute", { enumerable: true, get: function () { return run_tests_lib_2.execute; } });
 exports.utils = __importStar(require("./utils/public"));
+exports.DEFAULT_COMMAND_CONFIG = (0, run_tests_lib_1.getDefaultConfig)();
 //# sourceMappingURL=index.js.map

package/dist/commands/synthetics/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/synthetics/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+C;AAAvC,iGAAA,OAAO,OAAA;AAAE,uGAAA,aAAa,OAAA;AAC9B,+CAA4B;AAC5B,+CAAmD;AAA3C,0GAAA,eAAe,OAAA;AACvB,2CAA+C;AAAvC,sGAAA,aAAa,OAAA;AACrB,iDAAqD;AAA7C,6GAAA,YAAY,OAAA;AAAE,wGAAA,OAAO,OAAA;AAC7B,yDAA0D;AAAlD,2HAAA,sBAAsB,OAAA;AAC9B,wDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/synthetics/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAgD;AAEhD,mCAA+C;AAAvC,iGAAA,OAAO,OAAA;AAAE,uGAAA,aAAa,OAAA;AAC9B,+CAA4B;AAC5B,+CAAmD;AAA3C,0GAAA,eAAe,OAAA;AACvB,2CAA+C;AAAvC,sGAAA,aAAa,OAAA;AACrB,iDAAqD;AAA7C,6GAAA,YAAY,OAAA;AAAE,wGAAA,OAAO,OAAA;AAC7B,wDAAuC;AAE1B,QAAA,sBAAsB,GAAG,IAAA,gCAAgB,GAAE,CAAA"}

package/dist/commands/synthetics/interfaces.d.ts

@@ -473,11 +473,14 @@ export interface APIHelperConfig {
     datadogSite: string;
     proxy: ProxyConfiguration;
 }
-export interface SyntheticsCIConfig extends APIHelperConfig {
+export interface DatadogCIConfig extends APIHelperConfig {
+    configPath: string;
+}
+export interface SyntheticsCIConfig extends DatadogCIConfig {
 }
 export interface RunTestsCommandConfig extends SyntheticsCIConfig {
     batchTimeout?: number;
-    configPath: string;
+    buildCommand?: string;
     defaultTestOverrides?: UserConfigOverride;
     failOnCriticalErrors: boolean;
     failOnMissingTests: boolean;

package/dist/commands/synthetics/multilocator.d.ts

@@ -1,3 +1,2 @@
 import { Result, ImportTestsCommandConfig, MainReporter } from './interfaces';
 export declare const updateLTDMultiLocators: (reporter: MainReporter, config: ImportTestsCommandConfig, results: Result[]) => Promise<void>;
-export declare const promptUser: (message: string) => Promise<boolean>;

package/dist/commands/synthetics/multilocator.js

@@ -8,13 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptUser = exports.updateLTDMultiLocators = void 0;
+exports.updateLTDMultiLocators = void 0;
 const promises_1 = require("fs/promises");
-const inquirer_1 = __importDefault(require("inquirer"));
+const ci_1 = require("../../helpers/ci");
+const prompt_1 = require("../../helpers/prompt");
 const local_test_definition_1 = require("./local-test-definition");
 const constants_1 = require("./reporters/constants");
 const test_1 = require("./test");
@@ -26,7 +24,10 @@ const updateLTDMultiLocators = (reporter, config, results) => __awaiter(void 0,
     if (!hasMLUpdates) {
         return reporter.log('No MultiLocator updates found. No changes will be made.\n');
     }
-    const userConfirmed = yield (0, exports.promptUser)('MultiLocator updates found. Do you want to apply them to your local test definition?');
+    if (!(0, ci_1.isInteractive)()) {
+        return reporter.log('MultiLocator updates found, but cannot apply them in non-interactive mode.\n');
+    }
+    const userConfirmed = yield (0, prompt_1.requestConfirmation)('MultiLocator updates found. Do you want to apply them to your local test definition?', false);
     if (!userConfirmed) {
         return reporter.log('\nMultiLocator updates aborted by user.\n');
     }
@@ -66,17 +67,6 @@ const getMultiLocatorsFromResults = (results) => {
     }
     return multiLocatorMap;
 };
-const promptUser = (message) => __awaiter(void 0, void 0, void 0, function* () {
-    const question = {
-        type: 'confirm',
-        name: 'confirm',
-        message,
-        default: false,
-    };
-    const { confirm } = yield inquirer_1.default.prompt([question]);
-    return confirm;
-});
-exports.promptUser = promptUser;
 const overwriteMultiLocatorsInTestConfig = (multiLocatorMap, testConfigFromFile) => {
     for (const publicId of Object.keys(multiLocatorMap)) {
         const test = (0, local_test_definition_1.findUniqueLocalTestDefinition)(testConfigFromFile, publicId);

package/dist/commands/synthetics/multilocator.js.map

@@ -1 +1 @@
-{"version":3,"file":"multilocator.js","sourceRoot":"","sources":["../../../src/commands/synthetics/multilocator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multilocator.js","sourceRoot":"","sources":["../../../src/commands/synthetics/multilocator.ts"],"names":[],"mappings":"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"}