@datadog/datadog-ci 0.17.9 → 0.17.13

package/dist/commands/lambda/uninstrument.js

@@ -14,51 +14,130 @@ const aws_sdk_1 = require("aws-sdk");
 const chalk_1 = require("chalk");
 const clipanion_1 = require("clipanion");
 const utils_1 = require("../../helpers/utils");
+const constants_1 = require("./constants");
 const commons_1 = require("./functions/commons");
 const uninstrument_1 = require("./functions/uninstrument");
+const prompt_1 = require("./prompt");
 class UninstrumentCommand extends clipanion_1.Command {
     constructor() {
         super(...arguments);
         this.config = {
             functions: [],
-            region: process.env.AWS_DEFAULT_REGION,
+            region: process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR],
         };
         this.dryRun = false;
         this.functions = [];
+        this.interactive = false;
     }
     execute() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const lambdaConfig = { lambda: this.config };
             this.config = (yield utils_1.parseConfigFile(lambdaConfig, this.configPath)).lambda;
-            const hasSpecifiedFuntions = this.functions.length !== 0 || this.config.functions.length !== 0;
-            if (!hasSpecifiedFuntions) {
-                this.context.stdout.write('No functions specified for un-instrumentation.\n');
-                return 1;
+            let hasSpecifiedFunctions = this.functions.length !== 0 || this.config.functions.length !== 0;
+            if (this.interactive) {
+                try {
+                    if (commons_1.isMissingAWSCredentials()) {
+                        this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!\n`);
+                        yield prompt_1.requestAWSCredentials();
+                    }
+                }
+                catch (e) {
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} ${e}\n`);
+                    return 1;
+                }
+                const region = (_b = (_a = this.region) !== null && _a !== void 0 ? _a : this.config.region) !== null && _b !== void 0 ? _b : process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR];
+                this.region = region;
+                if (!hasSpecifiedFunctions) {
+                    try {
+                        const lambda = new aws_sdk_1.Lambda({ region });
+                        this.context.stdout.write('Fetching Lambda functions, this might take a while.\n');
+                        const functionNames = (_c = (yield commons_1.getAllLambdaFunctionConfigs(lambda)).map((config) => config.FunctionName).sort()) !== null && _c !== void 0 ? _c : [];
+                        if (functionNames.length === 0) {
+                            this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified region.\n`);
+                            return 1;
+                        }
+                        const functions = yield prompt_1.requestFunctionSelection(functionNames);
+                        this.functions = functions;
+                    }
+                    catch (err) {
+                        this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. ${err}\n`);
+                        return 1;
+                    }
+                }
             }
-            const functionGroups = commons_1.collectFunctionsByRegion(this.functions.length !== 0 ? this.functions : this.config.functions, this.region || this.config.region);
-            if (functionGroups === undefined) {
+            hasSpecifiedFunctions = this.functions.length !== 0 || this.config.functions.length !== 0;
+            const hasSpecifiedRegExPattern = this.regExPattern !== undefined && this.regExPattern !== '';
+            if (!hasSpecifiedFunctions && !hasSpecifiedRegExPattern) {
+                this.context.stdout.write(`${chalk_1.red('[Error]')} No functions specified for un-instrumentation.\n`);
                 return 1;
             }
             const configGroups = [];
             // Fetch lambda function configurations that are
             // available to be un-instrumented.
-            for (const [region, functionList] of Object.entries(functionGroups)) {
-                const lambda = new aws_sdk_1.Lambda({ region });
-                const cloudWatchLogs = new aws_sdk_1.CloudWatchLogs({ region });
+            if (hasSpecifiedRegExPattern) {
+                if (hasSpecifiedFunctions) {
+                    const usedCommand = this.functions.length !== 0 ? '"--functions"' : 'Functions in config file';
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} ${usedCommand} and "--functions-regex" should not be used at the same time.\n`);
+                    return 1;
+                }
+                if (this.regExPattern.match(':')) {
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} "--functions-regex" isn't meant to be used with ARNs.\n`);
+                    return 1;
+                }
+                const region = this.region || this.config.region;
+                if (!region) {
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} No default region specified. Use \`-r\`, \`--region\`.`);
+                    return 1;
+                }
                 try {
-                    const configs = yield uninstrument_1.getFunctionConfigs(lambda, cloudWatchLogs, functionList, this.forwarder);
+                    const cloudWatchLogs = new aws_sdk_1.CloudWatchLogs({ region });
+                    const lambda = new aws_sdk_1.Lambda({ region });
+                    this.context.stdout.write('Fetching Lambda functions, this might take a while.\n');
+                    const configs = yield uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambda, cloudWatchLogs, this.regExPattern, this.forwarder);
                     configGroups.push({ configs, lambda, cloudWatchLogs });
                 }
                 catch (err) {
-                    this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't fetch lambda functions. ${err}\n`);
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. ${err}\n`);
+                    return 1;
+                }
+            }
+            else {
+                let functionGroups;
+                try {
+                    functionGroups = commons_1.collectFunctionsByRegion(this.functions.length !== 0 ? this.functions : this.config.functions, this.region || this.config.region);
+                }
+                catch (err) {
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't group functions. ${err}`);
                     return 1;
                 }
+                for (const [region, functionARNs] of Object.entries(functionGroups)) {
+                    const lambda = new aws_sdk_1.Lambda({ region });
+                    const cloudWatchLogs = new aws_sdk_1.CloudWatchLogs({ region });
+                    try {
+                        const configs = yield uninstrument_1.getUninstrumentedFunctionConfigs(lambda, cloudWatchLogs, functionARNs, this.forwarder);
+                        configGroups.push({ configs, lambda, cloudWatchLogs });
+                    }
+                    catch (err) {
+                        this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. ${err}\n`);
+                        return 1;
+                    }
+                }
             }
             const configList = configGroups.map((group) => group.configs).reduce((a, b) => a.concat(b));
             this.printPlannedActions(configList);
             if (this.dryRun || configList.length === 0) {
                 return 0;
             }
+            const willUpdate = commons_1.willUpdateFunctionConfigs(configList);
+            if (this.interactive && willUpdate) {
+                this.context.stdout.write(`${chalk_1.yellow('[!]')} Confirmation needed.\n`);
+                const isConfirmed = yield prompt_1.requestChangesConfirmation('Do you want to apply the changes?');
+                if (!isConfirmed) {
+                    return 0;
+                }
+                this.context.stdout.write(`${chalk_1.yellow('[!]')} Uninstrumenting functions.\n`);
+            }
             // Un-instrument functions.
             const promises = Object.values(configGroups).map((group) => {
                 commons_1.updateLambdaFunctionConfigs(group.lambda, group.cloudWatchLogs, group.configs);
@@ -74,22 +153,17 @@ class UninstrumentCommand extends clipanion_1.Command {
         });
     }
     printPlannedActions(configs) {
-        var _a;
         const prefix = this.dryRun ? chalk_1.bold(chalk_1.cyan('[Dry Run] ')) : '';
-        let anyUpdates = false;
-        for (const config of configs) {
-            if (config.updateRequest !== undefined ||
-                ((_a = config.logGroupConfiguration) === null || _a === void 0 ? void 0 : _a.deleteSubscriptionFilterRequest) !== undefined ||
-                (config === null || config === void 0 ? void 0 : config.tagConfiguration) !== undefined) {
-                anyUpdates = true;
-                break;
-            }
-        }
-        if (!anyUpdates) {
+        const willUpdate = commons_1.willUpdateFunctionConfigs(configs);
+        if (!willUpdate) {
             this.context.stdout.write(`${prefix}No updates will be applied\n`);
             return;
         }
-        this.context.stdout.write(`${prefix}Will apply the following updates:\n`);
+        this.context.stdout.write(`\n${chalk_1.bold(chalk_1.yellow('[!]'))} Functions to be updated:\n`);
+        for (const config of configs) {
+            this.context.stdout.write(`\t- ${chalk_1.bold(config.functionARN)}\n`);
+        }
+        this.context.stdout.write(`\n${prefix}Will apply the following updates:\n`);
         for (const config of configs) {
             if (config.updateRequest) {
                 this.context.stdout.write(`UpdateFunctionConfiguration -> ${config.functionARN}\n${JSON.stringify(config.updateRequest, undefined, 2)}\n`);
@@ -111,17 +185,20 @@ UninstrumentCommand.addOption('region', clipanion_1.Command.String('-r,--region'
 UninstrumentCommand.addOption('configPath', clipanion_1.Command.String('--config'));
 UninstrumentCommand.addOption('dryRun', clipanion_1.Command.Boolean('-d,--dry'));
 UninstrumentCommand.addOption('forwarder', clipanion_1.Command.String('--forwarder'));
+UninstrumentCommand.addOption('regExPattern', clipanion_1.Command.String('--functions-regex,--functionsRegex'));
+UninstrumentCommand.addOption('interactive', clipanion_1.Command.Boolean('-i,--interactive'));
 /**
  * Commands that are not really in use, but to
  * make uninstrumentation easier for the user.
  */
-UninstrumentCommand.addOption('extensionVersion', clipanion_1.Command.String('-e,--extensionVersion', { hidden: true }));
-UninstrumentCommand.addOption('layerVersion', clipanion_1.Command.String('-v,--layerVersion', { hidden: true }));
+UninstrumentCommand.addOption('extensionVersion', clipanion_1.Command.String('-e,--extension-version,--extensionVersion', { hidden: true }));
+UninstrumentCommand.addOption('layerVersion', clipanion_1.Command.String('-v,--layer-version,--layerVersion', { hidden: true }));
 UninstrumentCommand.addOption('tracing', clipanion_1.Command.String('--tracing', { hidden: true }));
-UninstrumentCommand.addOption('mergeXrayTraces', clipanion_1.Command.String('--mergeXrayTraces', { hidden: true }));
-UninstrumentCommand.addOption('flushMetricsToLogs', clipanion_1.Command.String('--flushMetricsToLogs', { hidden: true }));
-UninstrumentCommand.addOption('logLevel', clipanion_1.Command.String('--logLevel', { hidden: true }));
+UninstrumentCommand.addOption('mergeXrayTraces', clipanion_1.Command.String('--merge-xray-traces,--mergeXrayTraces', { hidden: true }));
+UninstrumentCommand.addOption('flushMetricsToLogs', clipanion_1.Command.String('--flush-metrics-to-logs,--flushMetricsToLogs', { hidden: true }));
+UninstrumentCommand.addOption('logLevel', clipanion_1.Command.String('--log-level,--logLevel', { hidden: true }));
 UninstrumentCommand.addOption('service', clipanion_1.Command.String('--service', { hidden: true }));
 UninstrumentCommand.addOption('environment', clipanion_1.Command.String('--env', { hidden: true }));
 UninstrumentCommand.addOption('version', clipanion_1.Command.String('--version', { hidden: true }));
-UninstrumentCommand.addOption('extraTags', clipanion_1.Command.String('--extra-tags', { hidden: true }));
+UninstrumentCommand.addOption('extraTags', clipanion_1.Command.String('--extra-tags,--extraTags', { hidden: true }));
+UninstrumentCommand.addOption('captureLambdaPayload', clipanion_1.Command.String('--capture-lambda-payload,--captureLambdaPayload', { hidden: true }));

package/dist/commands/sourcemaps/cli.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/sourcemaps/upload.d.ts

@@ -1,6 +1,6 @@
 import { Command } from 'clipanion';
 export declare class UploadCommand extends Command {
-    static usage: import("clipanion/lib/advanced").Usage;
+    static usage: import("clipanion").Usage;
     private basePath?;
     private cliVersion;
     private config;

package/dist/commands/synthetics/__tests__/cli.test.js

@@ -28,12 +28,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const advanced_1 = require("clipanion/lib/advanced");
 const ciUtils = __importStar(require("../../../helpers/utils"));
-const cli_1 = require("../cli");
+const command_1 = require("../command");
 const interfaces_1 = require("../interfaces");
 const runTests = __importStar(require("../run-test"));
 const utils = __importStar(require("../utils"));
 const fixtures_1 = require("./fixtures");
+test('all option flags are supported', () => __awaiter(void 0, void 0, void 0, function* () {
+    const options = [
+        'apiKey',
+        'appKey',
+        'failOnCriticalErrors',
+        'config',
+        'datadogSite',
+        'files',
+        'failOnTimeout',
+        'public-id',
+        'search',
+        'subdomain',
+        'tunnel',
+        'jUnitReport',
+        'runName',
+    ];
+    const cli = new advanced_1.Cli();
+    cli.register(command_1.RunTestCommand);
+    const usage = cli.usage(command_1.RunTestCommand);
+    options.forEach((option) => expect(usage).toContain(`--${option}`));
+}));
 describe('run-test', () => {
     beforeEach(() => {
         jest.restoreAllMocks();
@@ -46,12 +68,12 @@ describe('run-test', () => {
         });
         test('should default to datadog us', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env = {};
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             expect(command['getAppBaseURL']()).toBe('https://app.datadoghq.com/');
         }));
         test('subdomain should be overridable', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env = { DATADOG_SUBDOMAIN: 'custom' };
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             yield command['resolveConfig']();
             expect(command['getAppBaseURL']()).toBe('https://custom.datadoghq.com/');
         }));
@@ -60,7 +82,7 @@ describe('run-test', () => {
                 DATADOG_SITE: 'datadoghq.eu',
                 DATADOG_SUBDOMAIN: 'custom',
             };
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             yield command['resolveConfig']();
             expect(command['getAppBaseURL']()).toBe('https://custom.datadoghq.eu/');
         }));
@@ -83,7 +105,7 @@ describe('run-test', () => {
             test5: [{ result: { passed: false } }],
         };
         test('should sort tests with success, non_blocking failures then failures', () => __awaiter(void 0, void 0, void 0, function* () {
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             tests.sort(command['sortTestsByOutcome'](results));
             expect(tests).toStrictEqual([test3, test1, test2, test5, test4]);
         }));
@@ -102,9 +124,9 @@ describe('run-test', () => {
                 DATADOG_SUBDOMAIN: 'custom',
             };
             process.env = overrideEnv;
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, cli_1.DEFAULT_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, datadogSite: overrideEnv.DATADOG_SITE, subdomain: overrideEnv.DATADOG_SUBDOMAIN }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, datadogSite: overrideEnv.DATADOG_SITE, subdomain: overrideEnv.DATADOG_SUBDOMAIN }));
         }));
         test('override from config file', () => __awaiter(void 0, void 0, void 0, function* () {
             const overrideConfigFile = {
@@ -122,9 +144,10 @@ describe('run-test', () => {
                 publicIds: ['ran-dom-id'],
                 subdomain: 'ppa',
                 tunnel: true,
+                variableStrings: [],
             };
             jest.spyOn(ciUtils, 'getConfig').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return overrideConfigFile; }));
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             yield command['resolveConfig']();
             expect(command['config']).toEqual(overrideConfigFile);
         }));
@@ -142,7 +165,7 @@ describe('run-test', () => {
                 testSearchQuery: 'a-search-query',
                 tunnel: true,
             };
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             command['apiKey'] = overrideCLI.apiKey;
             command['appKey'] = overrideCLI.appKey;
             command['configPath'] = overrideCLI.configPath;
@@ -155,7 +178,7 @@ describe('run-test', () => {
             command['tunnel'] = overrideCLI.tunnel;
             command['testSearchQuery'] = overrideCLI.testSearchQuery;
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, cli_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'fake_api_key', appKey: 'fake_app_key', configPath: 'fake-datadog-ci.json', datadogSite: 'datadoghq.eu', failOnCriticalErrors: true, failOnTimeout: false, files: ['new-file'], publicIds: ['ran-dom-id'], subdomain: 'new-sub-domain', testSearchQuery: 'a-search-query', tunnel: true }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'fake_api_key', appKey: 'fake_app_key', configPath: 'fake-datadog-ci.json', datadogSite: 'datadoghq.eu', failOnCriticalErrors: true, failOnTimeout: false, files: ['new-file'], publicIds: ['ran-dom-id'], subdomain: 'new-sub-domain', testSearchQuery: 'a-search-query', tunnel: true }));
         }));
         test('override from config file < ENV < CLI', () => __awaiter(void 0, void 0, void 0, function* () {
             jest.spyOn(ciUtils, 'getConfig').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -169,10 +192,10 @@ describe('run-test', () => {
                 DATADOG_API_KEY: 'api_key_env',
                 DATADOG_APP_KEY: 'app_key_env',
             };
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             command['apiKey'] = 'api_key_cli';
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, cli_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'datadog.config.file' }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'datadog.config.file' }));
         }));
         test('override locations with ENV variable', () => __awaiter(void 0, void 0, void 0, function* () {
             const conf = {
@@ -193,7 +216,7 @@ describe('run-test', () => {
                 triggerTests,
             };
             const write = jest.fn();
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             command.context = { stdout: { write } };
             command['config'].global = { locations: ['aws:us-east-2'] };
             jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);

package/dist/commands/synthetics/__tests__/fixtures.js

@@ -54,6 +54,7 @@ exports.ciConfig = {
     publicIds: [],
     subdomain: 'app',
     tunnel: false,
+    variableStrings: [],
 };
 const getApiTest = (publicId) => ({
     config: {

package/dist/commands/synthetics/__tests__/run-test.test.js

@@ -32,6 +32,7 @@ const ciUtils = __importStar(require("../../../helpers/utils"));
 const errors_1 = require("../errors");
 const interfaces_1 = require("../interfaces");
 const runTests = __importStar(require("../run-test"));
+const tunnel_1 = require("../tunnel");
 const utils = __importStar(require("../utils"));
 const fixtures_1 = require("./fixtures");
 describe('run-test', () => {
@@ -95,6 +96,39 @@ describe('run-test', () => {
             ]), expect.anything());
             expect(apiHelper.getPresignedURL).not.toHaveBeenCalled();
         }));
+        test('open and close tunnel for successful runs', () => __awaiter(void 0, void 0, void 0, function* () {
+            const location = {
+                display_name: 'us1',
+                id: 1,
+                is_active: true,
+                name: 'us1',
+                region: 'us1',
+            };
+            jest.spyOn(utils, 'wait').mockImplementation(() => new Promise((res) => setTimeout(res, 10)));
+            const startTunnelSpy = jest
+                .spyOn(tunnel_1.Tunnel.prototype, 'start')
+                .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return ({ host: 'host', id: 'id', privateKey: 'key' }); }));
+            const stopTunnelSpy = jest.spyOn(tunnel_1.Tunnel.prototype, 'stop');
+            jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(Promise.resolve({
+                overriddenTestsToTrigger: [],
+                summary: utils.createSummary(),
+                tests: [{ options: { ci: { executionRule: interfaces_1.ExecutionRule.BLOCKING } }, public_id: '123-456-789' }],
+            }));
+            jest.spyOn(utils, 'runTests').mockReturnValue(Promise.resolve({
+                locations: [location],
+                results: [{ device: 'chrome_laptop.large', location: 1, public_id: '123-456-789', result_id: '1' }],
+                triggered_check_ids: [],
+            }));
+            const apiHelper = {
+                getPresignedURL: () => ({ url: 'url' }),
+                pollResults: () => fixtures_1.mockPollResultResponse,
+                triggerTests: () => fixtures_1.mockTestTriggerResponse,
+            };
+            jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+            yield runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { failOnCriticalErrors: true, publicIds: ['123-456-789'], tunnel: true }));
+            expect(startTunnelSpy).toHaveBeenCalledTimes(1);
+            expect(stopTunnelSpy).toHaveBeenCalledTimes(1);
+        }));
         test('getTestsList throws', () => __awaiter(void 0, void 0, void 0, function* () {
             const serverError = new Error('Server Error');
             serverError.response = { data: { errors: ['Bad Gateway'] }, status: 502 };
@@ -137,6 +171,10 @@ describe('run-test', () => {
             yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { publicIds: ['public-id-1', 'public-id-2'], tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError('UNAVAILABLE_TUNNEL_CONFIG'));
         }));
         test('runTests throws', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest
+                .spyOn(tunnel_1.Tunnel.prototype, 'start')
+                .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return ({ host: 'host', id: 'id', privateKey: 'key' }); }));
+            const stopTunnelSpy = jest.spyOn(tunnel_1.Tunnel.prototype, 'stop');
             jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(Promise.resolve({
                 overriddenTestsToTrigger: [],
                 summary: utils.createSummary(),
@@ -146,12 +184,14 @@ describe('run-test', () => {
             serverError.response = { data: { errors: ['Bad Gateway'] }, status: 502 };
             serverError.config = { baseURL: 'baseURL', url: 'url' };
             const apiHelper = {
+                getPresignedURL: () => ({ url: 'url' }),
                 triggerTests: jest.fn(() => {
                     throw serverError;
                 }),
             };
             jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
-            yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { publicIds: ['public-id-1', 'public-id-2'] }))).rejects.toMatchError(new errors_1.CriticalError('TRIGGER_TESTS_FAILED'));
+            yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { publicIds: ['public-id-1', 'public-id-2'], tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError('TRIGGER_TESTS_FAILED'));
+            expect(stopTunnelSpy).toHaveBeenCalledTimes(1);
         }));
         test('waitForResults throws', () => __awaiter(void 0, void 0, void 0, function* () {
             const location = {
@@ -161,6 +201,10 @@ describe('run-test', () => {
                 name: 'us1',
                 region: 'us1',
             };
+            jest
+                .spyOn(tunnel_1.Tunnel.prototype, 'start')
+                .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return ({ host: 'host', id: 'id', privateKey: 'key' }); }));
+            const stopTunnelSpy = jest.spyOn(tunnel_1.Tunnel.prototype, 'stop');
             jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(Promise.resolve({
                 overriddenTestsToTrigger: [],
                 summary: utils.createSummary(),
@@ -175,12 +219,14 @@ describe('run-test', () => {
             serverError.response = { data: { errors: ['Bad Gateway'] }, status: 502 };
             serverError.config = { baseURL: 'baseURL', url: 'url' };
             const apiHelper = {
+                getPresignedURL: () => ({ url: 'url' }),
                 pollResults: jest.fn(() => {
                     throw serverError;
                 }),
             };
             jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
-            yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { failOnCriticalErrors: true, publicIds: ['public-id-1', 'public-id-2'] }))).rejects.toMatchError(new errors_1.CriticalError('POLL_RESULTS_FAILED'));
+            yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { failOnCriticalErrors: true, publicIds: ['public-id-1', 'public-id-2'], tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError('POLL_RESULTS_FAILED'));
+            expect(stopTunnelSpy).toHaveBeenCalledTimes(1);
         }));
     });
     describe('getDatadogHost', () => {

package/dist/commands/synthetics/__tests__/utils.test.js

@@ -367,10 +367,6 @@ describe('utils', () => {
         expect(utils.hasResultPassed(result, false, true)).toBeTruthy();
         expect(utils.hasResultPassed(result, true, true)).toBeFalsy();
     });
-    test('removeUndefinedValues', () => {
-        // tslint:disable-next-line: no-null-keyword
-        expect(utils.removeUndefinedValues({ a: 'b', c: 'd', e: undefined, g: null })).toEqual({ a: 'b', c: 'd', g: null });
-    });
     test('hasTestSucceeded', () => {
         const testConfiguration = fixtures_1.getApiTest('abc-def-ghi');
         const passingResult = fixtures_1.getBrowserResult();
@@ -629,4 +625,15 @@ describe('utils', () => {
             expect(counter).toBe(3);
         }));
     });
+    test('parseVariablesFromCli', () => {
+        const mockLogFunction = (message) => undefined;
+        expect(utils.parseVariablesFromCli(['TEST=42'], mockLogFunction)).toEqual({ TEST: '42' });
+        expect(utils.parseVariablesFromCli(['TEST=42 with some spaces'], mockLogFunction)).toEqual({
+            TEST: '42 with some spaces',
+        });
+        expect(utils.parseVariablesFromCli(['TEST=42=43=44'], mockLogFunction)).toEqual({ TEST: '42=43=44' });
+        expect(utils.parseVariablesFromCli(['TEST='], mockLogFunction)).toEqual({ TEST: '' });
+        expect(utils.parseVariablesFromCli([''], mockLogFunction)).toBeUndefined();
+        expect(utils.parseVariablesFromCli(undefined, mockLogFunction)).toBeUndefined();
+    });
 });

package/dist/commands/synthetics/__tests__/websocket.test.js

@@ -30,7 +30,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ciUtils = __importStar(require("../../../helpers/utils"));
-const cli_1 = require("../cli");
+const command_1 = require("../command");
 const interfaces_1 = require("../interfaces");
 const runTests = __importStar(require("../run-test"));
 const fixtures_1 = require("./fixtures");
@@ -62,7 +62,7 @@ describe('Proxy configuration', () => {
                     tunnel: true,
                 });
             }));
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             command.context = { stdout: { write: jest.fn() } };
             jest.spyOn(runTests, 'getDatadogHost').mockImplementation(() => 'http://datadoghq.com/');
             yield command.execute();
@@ -95,7 +95,7 @@ describe('Proxy configuration', () => {
                     tunnel: true,
                 });
             }));
-            const command = new cli_1.RunTestCommand();
+            const command = new command_1.RunTestCommand();
             command.context = { stdout: { write: jest.fn() } };
             jest.spyOn(runTests, 'getDatadogHost').mockImplementation(() => 'http://datadoghq.com/');
             yield command.execute();

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

@@ -1,26 +1 @@
-import { Command } from 'clipanion';
-import { CommandConfig } from './interfaces';
-export declare const DEFAULT_COMMAND_CONFIG: CommandConfig;
-export declare class RunTestCommand extends Command {
-    jUnitReport?: string;
-    runName?: string;
-    private apiKey?;
-    private appKey?;
-    private config;
-    private configPath?;
-    private datadogSite?;
-    private failOnCriticalErrors?;
-    private failOnTimeout?;
-    private files?;
-    private publicIds?;
-    private reporter?;
-    private subdomain?;
-    private testSearchQuery?;
-    private tunnel?;
-    execute(): Promise<1 | 0>;
-    private getAppBaseURL;
-    private renderResults;
-    private reportCiError;
-    private resolveConfig;
-    private sortTestsByOutcome;
-}
+export {};