@datadog/datadog-ci 3.1.0 → 3.3.0

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

@@ -0,0 +1,133 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 });
+const http = __importStar(require("http"));
+const axios_1 = __importDefault(require("axios"));
+const build_and_test_1 = require("../build-and-test");
+const fixtures_1 = require("./fixtures");
+const NODE_COMMAND = process.execPath;
+describe('build-and-test - spawnBuildPluginDevServer', () => {
+    beforeEach(() => {
+        jest.resetAllMocks();
+        jest.restoreAllMocks();
+    });
+    test('alert when the build-plugin is not configured', () => __awaiter(void 0, void 0, void 0, function* () {
+        // Given a build command without the build plugin configured
+        const MOCKED_BUILD_COMMAND_NOT_CONFIGURED = `${NODE_COMMAND} -e "console.log('build successful')"`;
+        // When calling spawnBuildPluginDevServer
+        const commandPromise = (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND_NOT_CONFIGURED, fixtures_1.mockReporter);
+        // Then it should throw when the command exits.
+        yield expect(commandPromise).rejects.toThrow(build_and_test_1.UnconfiguredBuildPluginError);
+    }));
+    test('wait for the dev server and return expected readiness and status even with delayed server startup', () => __awaiter(void 0, void 0, void 0, function* () {
+        // Given a dev server which listen on the port provided in the environment variable BUILD_PLUGINS_S8S_PORT.
+        // The implementation of this server is written as a function, and stringified into a single line,
+        // to be used in a node -e command.
+        const httpDevServer = () => {
+            setTimeout(() => {
+                http
+                    .createServer((_, res) => res
+                    .writeHead(200, {
+                    'Content-Type': 'application/json',
+                })
+                    .end(JSON.stringify({
+                    status: 'success',
+                    publicPrefix: 'prefix2/',
+                })))
+                    .listen(process.env.BUILD_PLUGINS_S8S_PORT);
+            }, 500);
+        };
+        const SERVER_IMPLEMENTATION = httpDevServer.toString().replace(/\n\s+/g, '');
+        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "(${SERVER_IMPLEMENTATION})()"`;
+        // When calling spawnBuildPluginDevServer
+        const start = Date.now();
+        const command = yield (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
+        const end = Date.now();
+        // Then it should send requests to the dev server until it's ready to serve,
+        // and return the devServerUrl and the path prefix.
+        expect(command.devServerUrl).toBe('http://localhost:4000');
+        expect(command.publicPrefix).toBe('prefix2/');
+        // The server should resolve the promise at maximum 1 second after the server is ready
+        expect(end - start).toBeLessThanOrEqual(500 + 1000);
+        // Stop the command at the end of the test.
+        yield command.stop();
+    }));
+    test('should wait for dev server even if the build fails', () => __awaiter(void 0, void 0, void 0, function* () {
+        // Set up axios response sequence
+        jest
+            .spyOn(axios_1.default, 'get')
+            .mockRejectedValueOnce({ code: 'ECONNREFUSED' }) // First attempt: connection refused
+            .mockResolvedValueOnce({ data: { status: 'fail' } }) // Second attempt: build failed
+            .mockResolvedValueOnce({ data: { status: 'success', publicPrefix: 'prefix3/' } }); // Third attempt: success
+        // Setup isAxiosError for ECONNREFUSED error
+        jest.spyOn(axios_1.default, 'isAxiosError').mockImplementation((error) => {
+            return error && error.code === 'ECONNREFUSED';
+        });
+        // When calling spawnBuildPluginDevServer with any command
+        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "setTimeout(() => {}, 100000)"`;
+        const command = yield (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
+        // Then it should wait until the build succeeds
+        expect(command.devServerUrl).toBe('http://localhost:4000');
+        expect(command.publicPrefix).toBe('prefix3/');
+        // Verify the axios GET was called multiple times
+        expect(axios_1.default.get).toHaveBeenCalledTimes(3);
+        // Stop the command at the end of the test.
+        yield command.stop();
+    }));
+    test('should handle non-OK status code from dev server', () => __awaiter(void 0, void 0, void 0, function* () {
+        // Set up axios error response
+        const axiosError = {
+            isAxiosError: true,
+            code: 'ERR_BAD_RESPONSE',
+            response: {
+                status: 500,
+                statusText: 'Internal Server Error',
+            },
+        };
+        jest.spyOn(axios_1.default, 'get').mockRejectedValueOnce(axiosError);
+        // Setup isAxiosError for the specific error
+        jest.spyOn(axios_1.default, 'isAxiosError').mockImplementation((error) => {
+            return error === axiosError;
+        });
+        // When calling spawnBuildPluginDevServer with any command
+        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "setTimeout(() => {}, 100000)"`;
+        const commandPromise = (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
+        // Then it should throw with the server error
+        yield expect(commandPromise).rejects.toThrow('Dev server returned error: 500 Internal Server Error');
+    }));
+});
+//# sourceMappingURL=build-and-test.test.js.map

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

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

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

@@ -49,8 +49,10 @@ const env_1 = require("../../../helpers/env");
 const ciUtils = __importStar(require("../../../helpers/utils"));
 const api = __importStar(require("../api"));
 const deploy_tests_command_1 = require("../deploy-tests-command");
+const errors_1 = require("../errors");
 const import_tests_command_1 = require("../import-tests-command");
 const interfaces_1 = require("../interfaces");
+const mobile = __importStar(require("../mobile"));
 const run_tests_command_1 = require("../run-tests-command");
 const testUtils = __importStar(require("../test"));
 const upload_application_command_1 = require("../upload-application-command");
@@ -98,6 +100,7 @@ describe('run-tests', () => {
                 DATADOG_SITE: 'datadoghq.eu',
                 DATADOG_SUBDOMAIN: 'custom',
                 DATADOG_SYNTHETICS_BATCH_TIMEOUT: '1',
+                DATADOG_SYNTHETICS_BUILD_COMMAND: 'build-command',
                 DATADOG_SYNTHETICS_CONFIG_PATH: 'path/to/config.json',
                 DATADOG_SYNTHETICS_FAIL_ON_CRITICAL_ERRORS: 'false',
                 DATADOG_SYNTHETICS_FAIL_ON_MISSING_TESTS: 'false',
@@ -135,7 +138,7 @@ describe('run-tests', () => {
             process.env = overrideEnv;
             const command = (0, fixtures_1.createCommand)(run_tests_command_1.RunTestsCommand);
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, run_tests_command_1.DEFAULT_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, batchTimeout: 1, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, defaultTestOverrides: {
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, run_tests_command_1.RunTestsCommand.getDefaultConfig()), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, batchTimeout: 1, buildCommand: overrideEnv.DATADOG_SYNTHETICS_BUILD_COMMAND, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, defaultTestOverrides: {
                     allowInsecureCertificates: (0, env_1.toBoolean)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_ALLOW_INSECURE_CERTIFICATES),
                     basicAuth: {
                         password: overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_BASIC_AUTH_PASSWORD,
@@ -190,6 +193,7 @@ describe('run-tests', () => {
                 apiKey: 'fake_api_key',
                 appKey: 'fake_app_key',
                 batchTimeout: 1,
+                buildCommand: 'build-command',
                 configPath: 'src/commands/synthetics/__tests__/config-fixtures/config-with-all-keys.json',
                 datadogSite: 'datadoghq.eu',
                 defaultTestOverrides: {
@@ -238,7 +242,7 @@ describe('run-tests', () => {
                 tunnel: true,
             };
             const command = (0, fixtures_1.createCommand)(run_tests_command_1.RunTestsCommand);
-            command.configPath = 'src/commands/synthetics/__tests__/config-fixtures/config-with-all-keys.json';
+            command['configPath'] = 'src/commands/synthetics/__tests__/config-fixtures/config-with-all-keys.json';
             yield command['resolveConfig']();
             expect(command['config']).toEqual(expectedConfig);
         }));
@@ -338,7 +342,7 @@ describe('run-tests', () => {
                 `variables.var2=${(_l = defaultTestOverrides.variables) === null || _l === void 0 ? void 0 : _l.var2}`,
             ];
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, run_tests_command_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'fake_api_key', appKey: 'fake_app_key', batchTimeout: 1, configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.eu', defaultTestOverrides: {
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, run_tests_command_1.RunTestsCommand.getDefaultConfig()), { apiKey: 'fake_api_key', appKey: 'fake_app_key', batchTimeout: 1, configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.eu', defaultTestOverrides: {
                     allowInsecureCertificates: true,
                     basicAuth: {
                         password: 'password',
@@ -390,6 +394,7 @@ describe('run-tests', () => {
             const configFile = {
                 apiKey: 'config_file_api_key',
                 appKey: 'config_file_app_key',
+                buildCommand: 'build-command',
                 datadogSite: 'us3.datadoghq.com',
                 defaultTestOverrides: {
                     allowInsecureCertificates: true,
@@ -440,6 +445,7 @@ describe('run-tests', () => {
                     DATADOG_SITE: 'us5.datadoghq.com',
                     DATADOG_SUBDOMAIN: 'subdomain_from_env',
                     DATADOG_SYNTHETICS_BATCH_TIMEOUT: '1',
+                    DATADOG_SYNTHETICS_BUILD_COMMAND: 'build-command',
                     DATADOG_SYNTHETICS_CONFIG_PATH: 'path/to/config_from_env.json',
                     DATADOG_SYNTHETICS_FAIL_ON_CRITICAL_ERRORS: 'true',
                     DATADOG_SYNTHETICS_FAIL_ON_MISSING_TESTS: 'true',
@@ -478,6 +484,7 @@ describe('run-tests', () => {
                     apiKey: overrideEnv.DATADOG_API_KEY,
                     appKey: overrideEnv.DATADOG_APP_KEY,
                     batchTimeout: (0, env_1.toNumber)(overrideEnv.DATADOG_SYNTHETICS_BATCH_TIMEOUT),
+                    buildCommand: overrideEnv.DATADOG_SYNTHETICS_BUILD_COMMAND,
                     configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH,
                     datadogSite: overrideEnv.DATADOG_SITE,
                     defaultTestOverrides: {
@@ -500,7 +507,7 @@ describe('run-tests', () => {
                         deviceIds: overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_DEVICE_IDS.split(';'),
                         executionRule: (0, internal_1.toExecutionRule)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_EXECUTION_RULE),
                         followRedirects: (0, env_1.toBoolean)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_FOLLOW_REDIRECTS),
-                        headers: (0, env_1.toStringMap)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_HEADERS),
+                        headers: Object.assign(Object.assign({}, configFile.defaultTestOverrides.headers), (0, env_1.toStringMap)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_HEADERS)),
                         locations: overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_LOCATIONS.split(';'),
                         mobileApplicationVersion: overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_MOBILE_APPLICATION_VERSION,
                         resourceUrlSubstitutionRegexes: (_a = overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_RESOURCE_URL_SUBSTITUTION_REGEXES) === null || _a === void 0 ? void 0 : _a.split(';'),
@@ -511,7 +518,7 @@ describe('run-tests', () => {
                         startUrl: overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_START_URL,
                         startUrlSubstitutionRegex: overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_START_URL_SUBSTITUTION_REGEX,
                         testTimeout: (0, env_1.toNumber)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_TEST_TIMEOUT),
-                        variables: (0, env_1.toStringMap)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_VARIABLES),
+                        variables: Object.assign(Object.assign({}, configFile.defaultTestOverrides.variables), (0, env_1.toStringMap)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_VARIABLES)),
                         // XXX: Added to make the test pass as we don't have an ENV variable for `mobileApplicationVersionFilePath`.
                         mobileApplicationVersionFilePath: configFile.defaultTestOverrides.mobileApplicationVersionFilePath,
                     },
@@ -534,7 +541,7 @@ describe('run-tests', () => {
                 expect(command['config']).toEqual(expectedEnvOverrideResult);
             }));
             test('config file < CLI', () => __awaiter(void 0, void 0, void 0, function* () {
-                var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+                var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
                 jest.spyOn(ciUtils, 'resolveConfigFromFile').mockImplementationOnce((baseConfig) => __awaiter(void 0, void 0, void 0, function* () {
                     return (Object.assign(Object.assign({}, baseConfig), configFile));
                 }));
@@ -542,6 +549,7 @@ describe('run-tests', () => {
                     apiKey: 'cli_api_key',
                     appKey: 'cli_app_key',
                     batchTimeout: 1,
+                    buildCommand: 'build-command',
                     configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file-from-cli.json',
                     datadogSite: 'datadoghq.eu',
                     failOnCriticalErrors: true,
@@ -597,6 +605,7 @@ describe('run-tests', () => {
                 command['apiKey'] = overrideCLI.apiKey;
                 command['appKey'] = overrideCLI.appKey;
                 command['batchTimeout'] = overrideCLI.batchTimeout;
+                command['buildCommand'] = overrideCLI.buildCommand;
                 command['configPath'] = overrideCLI.configPath;
                 command['datadogSite'] = overrideCLI.datadogSite;
                 command['failOnCriticalErrors'] = overrideCLI.failOnCriticalErrors;
@@ -625,25 +634,25 @@ describe('run-tests', () => {
                     `deviceIds=${(_f = defaultTestOverrides.deviceIds) === null || _f === void 0 ? void 0 : _f.join(';')}`,
                     `executionRule=${defaultTestOverrides.executionRule}`,
                     `followRedirects=${defaultTestOverrides.followRedirects}`,
-                    `headers.Content-Type=${defaultTestOverrides.headers ? defaultTestOverrides.headers['Content-Type'] : ''}`,
-                    `headers.Authorization=${(_g = defaultTestOverrides.headers) === null || _g === void 0 ? void 0 : _g.Authorization}`,
-                    `locations=${(_h = defaultTestOverrides.locations) === null || _h === void 0 ? void 0 : _h.join(';')}`,
-                    `retry.count=${(_j = defaultTestOverrides.retry) === null || _j === void 0 ? void 0 : _j.count}`,
-                    `retry.interval=${(_k = defaultTestOverrides.retry) === null || _k === void 0 ? void 0 : _k.interval}`,
+                    `headers.Content-Type=${(_g = defaultTestOverrides.headers) === null || _g === void 0 ? void 0 : _g['Content-Type']}`,
+                    `headers.Authorization=${(_h = defaultTestOverrides.headers) === null || _h === void 0 ? void 0 : _h.Authorization}`,
+                    `locations=${(_j = defaultTestOverrides.locations) === null || _j === void 0 ? void 0 : _j.join(';')}`,
+                    `retry.count=${(_k = defaultTestOverrides.retry) === null || _k === void 0 ? void 0 : _k.count}`,
+                    `retry.interval=${(_l = defaultTestOverrides.retry) === null || _l === void 0 ? void 0 : _l.interval}`,
                     `startUrl=${defaultTestOverrides.startUrl}`,
                     `startUrlSubstitutionRegex=${defaultTestOverrides.startUrlSubstitutionRegex}`,
                     `testTimeout=${defaultTestOverrides.testTimeout}`,
-                    `resourceUrlSubstitutionRegexes=${(_l = defaultTestOverrides.resourceUrlSubstitutionRegexes) === null || _l === void 0 ? void 0 : _l.join(';')}`,
-                    `variables.cliVar1=${(_m = defaultTestOverrides.variables) === null || _m === void 0 ? void 0 : _m.cliVar1}`,
-                    `variables.cliVar2=${(_o = defaultTestOverrides.variables) === null || _o === void 0 ? void 0 : _o.cliVar2}`,
+                    `resourceUrlSubstitutionRegexes=${(_m = defaultTestOverrides.resourceUrlSubstitutionRegexes) === null || _m === void 0 ? void 0 : _m.join(';')}`,
+                    `variables.cliVar1=${(_o = defaultTestOverrides.variables) === null || _o === void 0 ? void 0 : _o.cliVar1}`,
+                    `variables.cliVar2=${(_p = defaultTestOverrides.variables) === null || _p === void 0 ? void 0 : _p.cliVar2}`,
                 ];
                 yield command['resolveConfig']();
                 const { mobileApplicationVersionFilePath } = overrideCLI, filteredOverrideCLI = __rest(overrideCLI, ["mobileApplicationVersionFilePath"]);
-                const expectedCLIOverrideResult = Object.assign(Object.assign({}, filteredOverrideCLI), { defaultTestOverrides: Object.assign(Object.assign({}, defaultTestOverrides), { mobileApplicationVersionFilePath }), proxy: configFile.proxy });
+                const expectedCLIOverrideResult = Object.assign(Object.assign({}, filteredOverrideCLI), { defaultTestOverrides: Object.assign(Object.assign({}, defaultTestOverrides), { headers: Object.assign(Object.assign({}, configFile.defaultTestOverrides.headers), defaultTestOverrides.headers), mobileApplicationVersionFilePath, variables: Object.assign(Object.assign({}, configFile.defaultTestOverrides.variables), defaultTestOverrides.variables) }), proxy: configFile.proxy });
                 expect(command['config']).toEqual(expectedCLIOverrideResult);
             }));
             test('ENV < CLI', () => __awaiter(void 0, void 0, void 0, function* () {
-                var _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+                var _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
                 jest.spyOn(ciUtils, 'resolveConfigFromFile').mockImplementationOnce((baseConfig) => __awaiter(void 0, void 0, void 0, function* () { return baseConfig; }));
                 const overrideEnv = {
                     DATADOG_API_KEY: 'env_api_key',
@@ -651,6 +660,7 @@ describe('run-tests', () => {
                     DATADOG_SITE: 'us5.datadoghq.com',
                     DATADOG_SYNTHETICS_CONFIG_PATH: 'path/to/config_from_env.json',
                     DATADOG_SUBDOMAIN: 'subdomain_from_env',
+                    DATADOG_SYNTHETICS_BUILD_COMMAND: 'default-build-command',
                     DATADOG_SYNTHETICS_FAIL_ON_CRITICAL_ERRORS: 'true',
                     DATADOG_SYNTHETICS_FAIL_ON_MISSING_TESTS: 'true',
                     DATADOG_SYNTHETICS_FAIL_ON_TIMEOUT: 'true',
@@ -688,6 +698,7 @@ describe('run-tests', () => {
                     apiKey: 'cli_api_key',
                     appKey: 'cli_app_key',
                     batchTimeout: 1,
+                    buildCommand: 'build-command',
                     configPath: 'path/to/config_from_cli.json',
                     datadogSite: 'datadoghq.eu',
                     failOnCriticalErrors: false,
@@ -744,6 +755,7 @@ describe('run-tests', () => {
                 command['apiKey'] = overrideCLI.apiKey;
                 command['appKey'] = overrideCLI.appKey;
                 command['batchTimeout'] = overrideCLI.batchTimeout;
+                command['buildCommand'] = overrideCLI.buildCommand;
                 command['configPath'] = overrideCLI.configPath;
                 command['datadogSite'] = overrideCLI.datadogSite;
                 command['failOnCriticalErrors'] = overrideCLI.failOnCriticalErrors;
@@ -760,8 +772,8 @@ describe('run-tests', () => {
                 command['testSearchQuery'] = overrideCLI.testSearchQuery;
                 command['overrides'] = [
                     `allowInsecureCertificates=${defaultTestOverrides.allowInsecureCertificates}`,
-                    `basicAuth.password=${(_p = defaultTestOverrides.basicAuth) === null || _p === void 0 ? void 0 : _p.password}`,
-                    `basicAuth.username=${(_q = defaultTestOverrides.basicAuth) === null || _q === void 0 ? void 0 : _q.username}`,
+                    `basicAuth.password=${(_q = defaultTestOverrides.basicAuth) === null || _q === void 0 ? void 0 : _q.password}`,
+                    `basicAuth.username=${(_r = defaultTestOverrides.basicAuth) === null || _r === void 0 ? void 0 : _r.username}`,
                     `body=${defaultTestOverrides.body}`,
                     `bodyType=${defaultTestOverrides.bodyType}`,
                     `cookies=${defaultTestOverrides.cookies.value}`,
@@ -769,24 +781,24 @@ describe('run-tests', () => {
                     `setCookies=${defaultTestOverrides.setCookies.value}`,
                     `setCookies.append=${defaultTestOverrides.setCookies.append}`,
                     `defaultStepTimeout=${defaultTestOverrides.defaultStepTimeout}`,
-                    `deviceIds=${(_r = defaultTestOverrides.deviceIds) === null || _r === void 0 ? void 0 : _r.join(';')}`,
+                    `deviceIds=${(_s = defaultTestOverrides.deviceIds) === null || _s === void 0 ? void 0 : _s.join(';')}`,
                     `executionRule=${defaultTestOverrides.executionRule}`,
                     `followRedirects=${defaultTestOverrides.followRedirects}`,
                     `headers.Content-Type=${defaultTestOverrides.headers ? defaultTestOverrides.headers['Content-Type'] : ''}`,
-                    `headers.Authorization=${(_s = defaultTestOverrides.headers) === null || _s === void 0 ? void 0 : _s.Authorization}`,
-                    `locations=${(_t = defaultTestOverrides.locations) === null || _t === void 0 ? void 0 : _t.join(';')}`,
-                    `retry.count=${(_u = defaultTestOverrides.retry) === null || _u === void 0 ? void 0 : _u.count}`,
-                    `retry.interval=${(_v = defaultTestOverrides.retry) === null || _v === void 0 ? void 0 : _v.interval}`,
+                    `headers.Authorization=${(_t = defaultTestOverrides.headers) === null || _t === void 0 ? void 0 : _t.Authorization}`,
+                    `locations=${(_u = defaultTestOverrides.locations) === null || _u === void 0 ? void 0 : _u.join(';')}`,
+                    `retry.count=${(_v = defaultTestOverrides.retry) === null || _v === void 0 ? void 0 : _v.count}`,
+                    `retry.interval=${(_w = defaultTestOverrides.retry) === null || _w === void 0 ? void 0 : _w.interval}`,
                     `startUrl=${defaultTestOverrides.startUrl}`,
                     `startUrlSubstitutionRegex=${defaultTestOverrides.startUrlSubstitutionRegex}`,
                     `testTimeout=${defaultTestOverrides.testTimeout}`,
-                    `resourceUrlSubstitutionRegexes=${(_w = defaultTestOverrides.resourceUrlSubstitutionRegexes) === null || _w === void 0 ? void 0 : _w.join(';')}`,
-                    `variables.cliVar1=${(_x = defaultTestOverrides.variables) === null || _x === void 0 ? void 0 : _x.cliVar1}`,
-                    `variables.cliVar2=${(_y = defaultTestOverrides.variables) === null || _y === void 0 ? void 0 : _y.cliVar2}`,
+                    `resourceUrlSubstitutionRegexes=${(_x = defaultTestOverrides.resourceUrlSubstitutionRegexes) === null || _x === void 0 ? void 0 : _x.join(';')}`,
+                    `variables.cliVar1=${(_y = defaultTestOverrides.variables) === null || _y === void 0 ? void 0 : _y.cliVar1}`,
+                    `variables.cliVar2=${(_z = defaultTestOverrides.variables) === null || _z === void 0 ? void 0 : _z.cliVar2}`,
                 ];
                 yield command['resolveConfig']();
                 const { mobileApplicationVersionFilePath } = overrideCLI, filteredOverrideCLI = __rest(overrideCLI, ["mobileApplicationVersionFilePath"]);
-                const expectedCLIOverrideResult = Object.assign(Object.assign({}, filteredOverrideCLI), { defaultTestOverrides: Object.assign(Object.assign({}, defaultTestOverrides), { mobileApplicationVersionFilePath }), proxy: { protocol: 'http' } });
+                const expectedCLIOverrideResult = Object.assign(Object.assign({}, filteredOverrideCLI), { defaultTestOverrides: Object.assign(Object.assign({}, defaultTestOverrides), { headers: Object.assign(Object.assign({}, (0, env_1.toStringMap)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_HEADERS)), defaultTestOverrides.headers), mobileApplicationVersionFilePath, variables: Object.assign(Object.assign({}, (0, env_1.toStringMap)(overrideEnv.DATADOG_SYNTHETICS_OVERRIDE_VARIABLES)), defaultTestOverrides.variables) }), proxy: { protocol: 'http' } });
                 expect(command['config']).toEqual(expectedCLIOverrideResult);
             }));
             const overrideTestConfig = {
@@ -899,7 +911,7 @@ describe('run-tests', () => {
                 expect(getTestsToTriggerMock).toHaveBeenNthCalledWith(1, ...getExpectedTestsToTriggerArguments(overrideTestConfig));
             }));
             test('CLI < test file', () => __awaiter(void 0, void 0, void 0, function* () {
-                var _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
+                var _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
                 const getTestsToTriggerMock = jest.spyOn(testUtils, 'getTestsToTrigger');
                 const command = (0, fixtures_1.createCommand)(run_tests_command_1.RunTestsCommand);
                 jest.spyOn(ciUtils, 'resolveConfigFromFile').mockImplementation((config, _) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
@@ -945,8 +957,8 @@ describe('run-tests', () => {
                 command['mobileApplicationVersion'] = defaultTestOverrides.mobileApplicationVersion;
                 command['overrides'] = [
                     `allowInsecureCertificates=${defaultTestOverrides.allowInsecureCertificates}`,
-                    `basicAuth.password=${(_z = defaultTestOverrides.basicAuth) === null || _z === void 0 ? void 0 : _z.password}`,
-                    `basicAuth.username=${(_0 = defaultTestOverrides.basicAuth) === null || _0 === void 0 ? void 0 : _0.username}`,
+                    `basicAuth.password=${(_0 = defaultTestOverrides.basicAuth) === null || _0 === void 0 ? void 0 : _0.password}`,
+                    `basicAuth.username=${(_1 = defaultTestOverrides.basicAuth) === null || _1 === void 0 ? void 0 : _1.username}`,
                     `body=${defaultTestOverrides.body}`,
                     `bodyType=${defaultTestOverrides.bodyType}`,
                     `cookies=${defaultTestOverrides.cookies.value}`,
@@ -954,20 +966,20 @@ describe('run-tests', () => {
                     `setCookies=${defaultTestOverrides.setCookies.value}`,
                     `setCookies.append=${defaultTestOverrides.setCookies.append}`,
                     `defaultStepTimeout=${defaultTestOverrides.defaultStepTimeout}`,
-                    `deviceIds=${(_1 = defaultTestOverrides.deviceIds) === null || _1 === void 0 ? void 0 : _1.join(';')}`,
+                    `deviceIds=${(_2 = defaultTestOverrides.deviceIds) === null || _2 === void 0 ? void 0 : _2.join(';')}`,
                     `executionRule=${defaultTestOverrides.executionRule}`,
                     `followRedirects=${defaultTestOverrides.followRedirects}`,
                     `headers.Content-Type=${defaultTestOverrides.headers ? defaultTestOverrides.headers['Content-Type'] : ''}`,
-                    `headers.Authorization=${(_2 = defaultTestOverrides.headers) === null || _2 === void 0 ? void 0 : _2.Authorization}`,
-                    `locations=${(_3 = defaultTestOverrides.locations) === null || _3 === void 0 ? void 0 : _3.join(';')}`,
-                    `retry.count=${(_4 = defaultTestOverrides.retry) === null || _4 === void 0 ? void 0 : _4.count}`,
-                    `retry.interval=${(_5 = defaultTestOverrides.retry) === null || _5 === void 0 ? void 0 : _5.interval}`,
+                    `headers.Authorization=${(_3 = defaultTestOverrides.headers) === null || _3 === void 0 ? void 0 : _3.Authorization}`,
+                    `locations=${(_4 = defaultTestOverrides.locations) === null || _4 === void 0 ? void 0 : _4.join(';')}`,
+                    `retry.count=${(_5 = defaultTestOverrides.retry) === null || _5 === void 0 ? void 0 : _5.count}`,
+                    `retry.interval=${(_6 = defaultTestOverrides.retry) === null || _6 === void 0 ? void 0 : _6.interval}`,
                     `startUrl=${defaultTestOverrides.startUrl}`,
                     `startUrlSubstitutionRegex=${defaultTestOverrides.startUrlSubstitutionRegex}`,
                     `testTimeout=${defaultTestOverrides.testTimeout}`,
-                    `resourceUrlSubstitutionRegexes=${(_6 = defaultTestOverrides.resourceUrlSubstitutionRegexes) === null || _6 === void 0 ? void 0 : _6.join(';')}`,
-                    `variables.cliVar1=${(_7 = defaultTestOverrides.variables) === null || _7 === void 0 ? void 0 : _7.cliVar1}`,
-                    `variables.cliVar2=${(_8 = defaultTestOverrides.variables) === null || _8 === void 0 ? void 0 : _8.cliVar2}`,
+                    `resourceUrlSubstitutionRegexes=${(_7 = defaultTestOverrides.resourceUrlSubstitutionRegexes) === null || _7 === void 0 ? void 0 : _7.join(';')}`,
+                    `variables.cliVar1=${(_8 = defaultTestOverrides.variables) === null || _8 === void 0 ? void 0 : _8.cliVar1}`,
+                    `variables.cliVar2=${(_9 = defaultTestOverrides.variables) === null || _9 === void 0 ? void 0 : _9.cliVar2}`,
                 ];
                 yield command['resolveConfig']();
                 expect(yield command.execute()).toBe(0);
@@ -1156,7 +1168,7 @@ describe('upload-application', () => {
             process.env = overrideEnv;
             const command = (0, fixtures_1.createCommand)(upload_application_command_1.UploadApplicationCommand);
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, upload_application_command_1.DEFAULT_UPLOAD_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, versionName: overrideEnv.DATADOG_SYNTHETICS_VERSION_NAME, latest: (0, env_1.toBoolean)(overrideEnv.DATADOG_SYNTHETICS_LATEST) }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, upload_application_command_1.UploadApplicationCommand.getDefaultConfig()), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, versionName: overrideEnv.DATADOG_SYNTHETICS_VERSION_NAME, latest: (0, env_1.toBoolean)(overrideEnv.DATADOG_SYNTHETICS_LATEST) }));
         }));
         test('override from config file', () => __awaiter(void 0, void 0, void 0, function* () {
             const expectedConfig = {
@@ -1196,7 +1208,7 @@ describe('upload-application', () => {
             command['versionName'] = overrideCLI.versionName;
             command['latest'] = overrideCLI.latest;
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, upload_application_command_1.DEFAULT_UPLOAD_COMMAND_CONFIG), { apiKey: 'fake_api_key_cli', appKey: 'fake_app_key_cli', configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.cli', mobileApplicationVersionFilePath: 'fake_path/cli_fake_app.apk', mobileApplicationId: 'fake-abc-cli', versionName: 'new cli', latest: true }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, upload_application_command_1.UploadApplicationCommand.getDefaultConfig()), { apiKey: 'fake_api_key_cli', appKey: 'fake_app_key_cli', configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.cli', mobileApplicationVersionFilePath: 'fake_path/cli_fake_app.apk', mobileApplicationId: 'fake-abc-cli', versionName: 'new cli', latest: true }));
         }));
         test('override from config file < ENV < CLI', () => __awaiter(void 0, void 0, void 0, function* () {
             jest.spyOn(ciUtils, 'resolveConfigFromFile').mockImplementationOnce((baseConfig) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1210,7 +1222,31 @@ describe('upload-application', () => {
             command['apiKey'] = 'api_key_cli';
             command['mobileApplicationVersionFilePath'] = './path/to/application_cli.apk';
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, upload_application_command_1.DEFAULT_UPLOAD_COMMAND_CONFIG), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'us5.datadoghq.com', mobileApplicationVersionFilePath: './path/to/application_cli.apk', mobileApplicationId: 'fake-abc', versionName: 'new', latest: true }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, upload_application_command_1.UploadApplicationCommand.getDefaultConfig()), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'us5.datadoghq.com', mobileApplicationVersionFilePath: './path/to/application_cli.apk', mobileApplicationId: 'fake-abc', versionName: 'new', latest: true }));
+        }));
+    });
+    describe('any kind of error is reported', () => {
+        test.each([
+            [
+                'CI error',
+                new errors_1.CriticalError('INVALID_MOBILE_APP', 'some message'),
+                'A CI error occurred: [INVALID_MOBILE_APP] some message',
+            ],
+            ['Endpoint error', new api.EndpointError('some message', 404), 'A backend error occurred: some message (404)'],
+            [
+                'Axios error',
+                (0, fixtures_1.getAxiosError)(400, { message: 'Bad Request' }),
+                'An unexpected error occurred: AxiosError: Bad Request\n    at getAxiosError',
+            ],
+            ['Unknown error', new Error('Unknown error'), 'An unexpected error occurred: Error: Unknown error\n    at '],
+        ])('%s', (_, error, expectedMessage) => __awaiter(void 0, void 0, void 0, function* () {
+            const writeMock = jest.fn();
+            const command = (0, fixtures_1.createCommand)(upload_application_command_1.UploadApplicationCommand, { stdout: { write: writeMock } });
+            jest.spyOn(mobile, 'uploadMobileApplicationVersion').mockImplementation(() => {
+                throw error;
+            });
+            expect(yield command['execute']()).toBe(1);
+            expect(writeMock).toHaveBeenCalledWith(expect.stringContaining(expectedMessage));
         }));
     });
 });
@@ -1237,7 +1273,7 @@ describe('import-tests', () => {
             process.env = overrideEnv;
             const command = (0, fixtures_1.createCommand)(import_tests_command_1.ImportTestsCommand);
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, import_tests_command_1.DEFAULT_IMPORT_TESTS_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, files: (_a = overrideEnv.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = overrideEnv.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), testSearchQuery: overrideEnv.DATADOG_SYNTHETICS_TEST_SEARCH_QUERY }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, import_tests_command_1.ImportTestsCommand.getDefaultConfig()), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, files: (_a = overrideEnv.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = overrideEnv.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), testSearchQuery: overrideEnv.DATADOG_SYNTHETICS_TEST_SEARCH_QUERY }));
         }));
         test('override from config file', () => __awaiter(void 0, void 0, void 0, function* () {
             const expectedConfig = {
@@ -1274,7 +1310,7 @@ describe('import-tests', () => {
             command['publicIds'] = overrideCLI.publicIds;
             command['testSearchQuery'] = overrideCLI.testSearchQuery;
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, import_tests_command_1.DEFAULT_IMPORT_TESTS_COMMAND_CONFIG), { apiKey: 'fake_api_key_cli', appKey: 'fake_app_key_cli', configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.cli', files: ['new-file'], publicIds: ['ran-dom-id2'], testSearchQuery: 'a-search-query' }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, import_tests_command_1.ImportTestsCommand.getDefaultConfig()), { apiKey: 'fake_api_key_cli', appKey: 'fake_app_key_cli', configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.cli', files: ['new-file'], publicIds: ['ran-dom-id2'], testSearchQuery: 'a-search-query' }));
         }));
         test('override from config file < ENV < CLI', () => __awaiter(void 0, void 0, void 0, function* () {
             jest.spyOn(ciUtils, 'resolveConfigFromFile').mockImplementationOnce((baseConfig) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1287,7 +1323,7 @@ describe('import-tests', () => {
             const command = (0, fixtures_1.createCommand)(import_tests_command_1.ImportTestsCommand);
             command['apiKey'] = 'api_key_cli';
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, import_tests_command_1.DEFAULT_IMPORT_TESTS_COMMAND_CONFIG), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'us5.datadoghq.com' }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, import_tests_command_1.ImportTestsCommand.getDefaultConfig()), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'us5.datadoghq.com' }));
         }));
     });
 });
@@ -1314,7 +1350,7 @@ describe('deploy-tests', () => {
             process.env = overrideEnv;
             const command = (0, fixtures_1.createCommand)(deploy_tests_command_1.DeployTestsCommand);
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, deploy_tests_command_1.DEFAULT_DEPLOY_TESTS_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, files: (_a = overrideEnv.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = overrideEnv.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), subdomain: overrideEnv.DATADOG_SUBDOMAIN }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, deploy_tests_command_1.DeployTestsCommand.getDefaultConfig()), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, configPath: overrideEnv.DATADOG_SYNTHETICS_CONFIG_PATH, datadogSite: overrideEnv.DATADOG_SITE, files: (_a = overrideEnv.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = overrideEnv.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), subdomain: overrideEnv.DATADOG_SUBDOMAIN }));
         }));
         test('override from config file', () => __awaiter(void 0, void 0, void 0, function* () {
             const expectedConfig = {
@@ -1351,7 +1387,7 @@ describe('deploy-tests', () => {
             command['publicIds'] = overrideCLI.publicIds;
             command['subdomain'] = overrideCLI.subdomain;
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, deploy_tests_command_1.DEFAULT_DEPLOY_TESTS_COMMAND_CONFIG), { apiKey: 'fake_api_key_cli', appKey: 'fake_app_key_cli', configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.cli', files: ['new-file'], publicIds: ['ran-dom-id2'], subdomain: 'subdomain-from-cli' }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, deploy_tests_command_1.DeployTestsCommand.getDefaultConfig()), { apiKey: 'fake_api_key_cli', appKey: 'fake_app_key_cli', configPath: 'src/commands/synthetics/__tests__/config-fixtures/empty-config-file.json', datadogSite: 'datadoghq.cli', files: ['new-file'], publicIds: ['ran-dom-id2'], subdomain: 'subdomain-from-cli' }));
         }));
         test('override from config file < ENV < CLI', () => __awaiter(void 0, void 0, void 0, function* () {
             jest.spyOn(ciUtils, 'resolveConfigFromFile').mockImplementationOnce((baseConfig) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1364,7 +1400,7 @@ describe('deploy-tests', () => {
             const command = (0, fixtures_1.createCommand)(deploy_tests_command_1.DeployTestsCommand);
             command['apiKey'] = 'api_key_cli';
             yield command['resolveConfig']();
-            expect(command['config']).toEqual(Object.assign(Object.assign({}, deploy_tests_command_1.DEFAULT_DEPLOY_TESTS_COMMAND_CONFIG), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'us5.datadoghq.com' }));
+            expect(command['config']).toEqual(Object.assign(Object.assign({}, deploy_tests_command_1.DeployTestsCommand.getDefaultConfig()), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'us5.datadoghq.com' }));
         }));
     });
 });