@datadog/datadog-ci 1.0.0 → 1.1.2

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

@@ -129,30 +129,36 @@ describe('run-test', () => {
             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 };
-            serverError.config = { baseURL: 'baseURL', url: 'url' };
-            const apiHelper = {
-                searchTests: jest.fn(() => {
-                    throw serverError;
-                }),
-            };
-            jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
-            yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { testSearchQuery: 'a-search-query', tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError('UNAVAILABLE_TEST_CONFIG'));
-        }));
-        test('getTestsToTrigger throws', () => __awaiter(void 0, void 0, void 0, function* () {
-            const serverError = new Error('Server Error');
-            serverError.response = { data: { errors: ['Bad Gateway'] }, status: 502 };
-            serverError.config = { baseURL: 'baseURL', url: 'url' };
-            const apiHelper = {
-                getTest: 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'], tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError('UNAVAILABLE_TEST_CONFIG'));
-        }));
+        const cases = [
+            [403, 'AUTHORIZATION_ERROR'],
+            [502, 'UNAVAILABLE_TEST_CONFIG'],
+        ];
+        describe.each(cases)('%s triggers %s', (status, error) => {
+            test(`getTestsList throws - ${status}`, () => __awaiter(void 0, void 0, void 0, function* () {
+                const serverError = new Error('Server Error');
+                serverError.response = { data: { errors: ['Error'] }, status };
+                serverError.config = { baseURL: 'baseURL', url: 'url' };
+                const apiHelper = {
+                    searchTests: jest.fn(() => {
+                        throw serverError;
+                    }),
+                };
+                jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+                yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { testSearchQuery: 'a-search-query', tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError(error));
+            }));
+            test(`getTestsToTrigger throws - ${status}`, () => __awaiter(void 0, void 0, void 0, function* () {
+                const serverError = new Error('Server Error');
+                serverError.response = { data: { errors: ['Bad Gateway'] }, status };
+                serverError.config = { baseURL: 'baseURL', url: 'url' };
+                const apiHelper = {
+                    getTest: 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'], tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError(error));
+            }));
+        });
         test('getPresignedURL throws', () => __awaiter(void 0, void 0, void 0, function* () {
             jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(Promise.resolve({
                 overriddenTestsToTrigger: [],
@@ -254,10 +260,10 @@ describe('run-test', () => {
         });
         test('should throw an error if API or Application key are undefined', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env = {};
-            expect(() => runTests.getApiHelper(fixtures_1.ciConfig)).toThrow(new errors_1.CiError('MISSING_APP_KEY'));
-            yield expect(runTests.executeTests(fixtures_1.mockReporter, fixtures_1.ciConfig)).rejects.toMatchError(new errors_1.CiError('MISSING_APP_KEY'));
-            expect(() => runTests.getApiHelper(Object.assign(Object.assign({}, fixtures_1.ciConfig), { appKey: 'fakeappkey' }))).toThrow(new errors_1.CiError('MISSING_API_KEY'));
-            yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { appKey: 'fakeappkey' }))).rejects.toMatchError(new errors_1.CiError('MISSING_API_KEY'));
+            expect(() => runTests.getApiHelper(fixtures_1.ciConfig)).toThrow(new errors_1.CriticalError('MISSING_APP_KEY'));
+            yield expect(runTests.executeTests(fixtures_1.mockReporter, fixtures_1.ciConfig)).rejects.toMatchError(new errors_1.CriticalError('MISSING_APP_KEY'));
+            expect(() => runTests.getApiHelper(Object.assign(Object.assign({}, fixtures_1.ciConfig), { appKey: 'fakeappkey' }))).toThrow(new errors_1.CriticalError('MISSING_API_KEY'));
+            yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { appKey: 'fakeappkey' }))).rejects.toMatchError(new errors_1.CriticalError('MISSING_API_KEY'));
         }));
     });
     describe('getTestsList', () => {

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

@@ -38,6 +38,7 @@ const axios_1 = __importDefault(require("axios"));
 const glob_1 = __importDefault(require("glob"));
 const ciHelpers = __importStar(require("../../../helpers/ci"));
 const api_1 = require("../api");
+const errors_1 = require("../errors");
 const interfaces_1 = require("../interfaces");
 const utils = __importStar(require("../utils"));
 const fixtures_1 = require("./fixtures");
@@ -86,27 +87,36 @@ describe('utils', () => {
         test('runTests sends batch metadata', () => __awaiter(void 0, void 0, void 0, function* () {
             jest.spyOn(ciHelpers, 'getCIMetadata').mockImplementation(() => undefined);
             const payloadMetadataSpy = jest.fn();
-            const axiosMock = jest.spyOn(axios_1.default, 'create');
-            axiosMock.mockImplementation((() => (e) => {
-                payloadMetadataSpy(e.data.metadata);
-                if (e.url === '/synthetics/tests/trigger/ci') {
+            jest.spyOn(axios_1.default, 'create').mockImplementation((() => (request) => {
+                payloadMetadataSpy(request.data.metadata);
+                if (request.url === '/synthetics/tests/trigger/ci') {
                     return { data: fakeTrigger };
                 }
             }));
             yield utils.runTests(api, [{ public_id: fakeId, executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }]);
-            expect(payloadMetadataSpy).toHaveBeenCalledWith({
-                ci: { job: {}, pipeline: {}, provider: {}, stage: {} },
-                git: { commit: { author: {}, committer: {} } },
-                trigger_app: 'npm_package',
-            });
+            expect(payloadMetadataSpy).toHaveBeenCalledWith(undefined);
             const metadata = {
                 ci: { job: { name: 'job' }, pipeline: {}, provider: { name: 'jest' }, stage: {} },
                 git: { commit: { author: {}, committer: {}, message: 'test' } },
             };
             jest.spyOn(ciHelpers, 'getCIMetadata').mockImplementation(() => metadata);
+            yield utils.runTests(api, [{ public_id: fakeId, executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }]);
+            expect(payloadMetadataSpy).toHaveBeenCalledWith(metadata);
+        }));
+        test('runTests api call includes trigger app header', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(ciHelpers, 'getCIMetadata').mockImplementation(() => undefined);
+            const headersMetadataSpy = jest.fn();
+            jest.spyOn(axios_1.default, 'create').mockImplementation((() => (request) => {
+                headersMetadataSpy(request.headers);
+                if (request.url === '/synthetics/tests/trigger/ci') {
+                    return { data: fakeTrigger };
+                }
+            }));
+            yield utils.runTests(api, [{ public_id: fakeId, executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }]);
+            expect(headersMetadataSpy).toHaveBeenCalledWith(expect.objectContaining({ 'X-Trigger-App': 'npm_package' }));
             utils.setCiTriggerApp('unit_test');
             yield utils.runTests(api, [{ public_id: fakeId, executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }]);
-            expect(payloadMetadataSpy).toHaveBeenCalledWith(Object.assign(Object.assign({}, metadata), { trigger_app: 'unit_test' }));
+            expect(headersMetadataSpy).toHaveBeenCalledWith(expect.objectContaining({ 'X-Trigger-App': 'unit_test' }));
         }));
         test('should run test with publicId from url', () => __awaiter(void 0, void 0, void 0, function* () {
             const axiosMock = jest.spyOn(axios_1.default, 'create');
@@ -163,6 +173,9 @@ describe('utils', () => {
                 if (fakeTests[publicId]) {
                     return { data: fakeTests[publicId] };
                 }
+                const error = new Error('Not found');
+                error.status = 404;
+                throw error;
             }));
         });
         afterAll(() => {
@@ -191,7 +204,7 @@ describe('utils', () => {
             expect(summary).toEqual(expectedSummary);
         }));
         test('no tests triggered throws an error', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield expect(utils.getTestsToTrigger(api, [], fixtures_1.mockReporter)).rejects.toEqual(new Error('No tests to trigger'));
+            yield expect(utils.getTestsToTrigger(api, [], fixtures_1.mockReporter)).rejects.toEqual(new errors_1.CiError('NO_TESTS_TO_RUN'));
         }));
     });
     describe('handleConfig', () => {

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

@@ -1,5 +1,5 @@
 import { AxiosError } from 'axios';
-import { APIConfiguration, Payload, PollResult, Test, TestSearchResult, Trigger } from './interfaces';
+import { APIConfiguration, APIHelper } from './interfaces';
 interface BackendError {
     errors: string[];
 }
@@ -9,16 +9,8 @@ export declare class EndpointError extends Error {
     constructor(message: string, status: number);
 }
 export declare const formatBackendErrors: (requestError: AxiosError<BackendError>) => string;
+export declare const isForbiddenError: (error: AxiosError | EndpointError) => boolean;
+export declare const isNotFoundError: (error: AxiosError | EndpointError) => boolean;
 export declare const is5xxError: (error: AxiosError | EndpointError) => boolean | 0 | undefined;
-export declare const apiConstructor: (configuration: APIConfiguration) => {
-    getPresignedURL: (testIds: string[]) => Promise<{
-        url: string;
-    }>;
-    getTest: (testId: string) => Promise<Test>;
-    pollResults: (resultIds: string[]) => Promise<{
-        results: PollResult[];
-    }>;
-    searchTests: (query: string) => Promise<TestSearchResult>;
-    triggerTests: (data: Payload) => Promise<Trigger>;
-};
+export declare const apiConstructor: (configuration: APIConfiguration) => APIHelper;
 export {};

package/dist/commands/synthetics/api.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiConstructor = exports.is5xxError = exports.formatBackendErrors = exports.EndpointError = void 0;
+exports.apiConstructor = exports.is5xxError = exports.isNotFoundError = exports.isForbiddenError = exports.formatBackendErrors = exports.EndpointError = void 0;
 const querystring_1 = require("querystring");
 const utils_1 = require("../../helpers/utils");
 const utils_2 = require("./utils");
@@ -43,6 +43,7 @@ exports.formatBackendErrors = formatBackendErrors;
 const triggerTests = (request) => (data) => __awaiter(void 0, void 0, void 0, function* () {
     const resp = yield retryRequest({
         data,
+        headers: { 'X-Trigger-App': utils_2.ciTriggerApp },
         method: 'POST',
         url: '/synthetics/tests/trigger/ci',
     }, request);
@@ -87,9 +88,13 @@ const retryOn5xxErrors = (retries, error) => {
         return 500;
     }
 };
+const getErrorHttpStatus = (error) => { var _a; return 'status' in error ? error.status : (_a = error.response) === null || _a === void 0 ? void 0 : _a.status; };
+const isForbiddenError = (error) => getErrorHttpStatus(error) === 403;
+exports.isForbiddenError = isForbiddenError;
+const isNotFoundError = (error) => getErrorHttpStatus(error) === 404;
+exports.isNotFoundError = isNotFoundError;
 const is5xxError = (error) => {
-    var _a;
-    const statusCode = 'status' in error ? error.status : (_a = error.response) === null || _a === void 0 ? void 0 : _a.status;
+    const statusCode = getErrorHttpStatus(error);
     return statusCode && statusCode >= 500 && statusCode <= 599;
 };
 exports.is5xxError = is5xxError;

package/dist/commands/synthetics/command.js

@@ -68,8 +68,14 @@ class RunTestCommand extends clipanion_1.Command {
             catch (error) {
                 if (error instanceof errors_1.CiError) {
                     this.reportCiError(error, this.reporter);
-                    if (error instanceof errors_1.CriticalError && this.config.failOnCriticalErrors) {
-                        return 1;
+                    if (error instanceof errors_1.CriticalError) {
+                        if (this.config.failOnCriticalErrors) {
+                            return 1;
+                        }
+                        else {
+                            this.reporter.error(chalk_1.default.yellow('Because `failOnCriticalErrors` is not set or disabled, the command will exit with an error code 0. ' +
+                                'Use `failOnCriticalErrors: true` to exit with an error code 1.\n'));
+                        }
                     }
                 }
                 return 0;
@@ -128,12 +134,18 @@ class RunTestCommand extends clipanion_1.Command {
     }
     reportCiError(error, reporter) {
         switch (error.code) {
+            // Non critical errors
             case 'NO_RESULTS_TO_POLL':
                 reporter.log('No results to poll.\n');
                 break;
             case 'NO_TESTS_TO_RUN':
                 reporter.log('No test to run.\n');
                 break;
+            // Critical command errors
+            case 'AUTHORIZATION_ERROR':
+                reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: authorization error ')}\n${error.message}\n\n`);
+                reporter.log('Credentials refused, make sure `apiKey`, `appKey` and `datadogSite` are correct.\n');
+                break;
             case 'MISSING_APP_KEY':
                 reporter.error(`Missing ${chalk_1.default.red.bold('DATADOG_APP_KEY')} in your environment.\n`);
                 break;
@@ -144,16 +156,16 @@ class RunTestCommand extends clipanion_1.Command {
                 reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to poll test results ')}\n${error.message}\n\n`);
                 break;
             case 'TUNNEL_START_FAILED':
-                reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to start tunnel')}\n${error.message}\n\n`);
+                reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to start tunnel ')}\n${error.message}\n\n`);
                 break;
             case 'TRIGGER_TESTS_FAILED':
-                reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to trigger tests')}\n${error.message}\n\n`);
+                reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to trigger tests ')}\n${error.message}\n\n`);
                 break;
             case 'UNAVAILABLE_TEST_CONFIG':
                 reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to obtain test configurations with search query ')}\n${error.message}\n\n`);
                 break;
             case 'UNAVAILABLE_TUNNEL_CONFIG':
-                reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to get tunnel configuration')}\n${error.message}\n\n`);
+                reporter.error(`\n${chalk_1.default.bgRed.bold(' ERROR: unable to get tunnel configuration ')}\n${error.message}\n\n`);
         }
     }
     resolveConfig() {

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

@@ -1,9 +1,14 @@
-declare const ciErrorCodes: readonly ["UNAVAILABLE_TEST_CONFIG", "MISSING_API_KEY", "MISSING_APP_KEY", "NO_RESULTS_TO_POLL", "NO_TESTS_TO_RUN", "UNAVAILABLE_TUNNEL_CONFIG", "TUNNEL_START_FAILED", "TRIGGER_TESTS_FAILED", "POLL_RESULTS_FAILED"];
-declare type CiErrorCode = typeof ciErrorCodes[number];
+declare const nonCriticalErrorCodes: readonly ["NO_TESTS_TO_RUN", "NO_RESULTS_TO_POLL"];
+export declare type NonCriticalCiErrorCode = typeof nonCriticalErrorCodes[number];
+declare const criticalErrorCodes: readonly ["AUTHORIZATION_ERROR", "MISSING_API_KEY", "MISSING_APP_KEY", "POLL_RESULTS_FAILED", "TRIGGER_TESTS_FAILED", "TUNNEL_START_FAILED", "UNAVAILABLE_TEST_CONFIG", "UNAVAILABLE_TUNNEL_CONFIG"];
+export declare type CriticalCiErrorCode = typeof criticalErrorCodes[number];
+export declare type CiErrorCode = NonCriticalCiErrorCode | CriticalCiErrorCode;
 export declare class CiError extends Error {
     code: CiErrorCode;
     constructor(code: CiErrorCode);
 }
 export declare class CriticalError extends CiError {
+    code: CriticalCiErrorCode;
+    constructor(code: CriticalCiErrorCode);
 }
 export {};

package/dist/commands/synthetics/errors.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CriticalError = exports.CiError = void 0;
 /* tslint:disable:max-classes-per-file */
-const ciErrorCodes = [
-    'UNAVAILABLE_TEST_CONFIG',
+const nonCriticalErrorCodes = ['NO_TESTS_TO_RUN', 'NO_RESULTS_TO_POLL'];
+const criticalErrorCodes = [
+    'AUTHORIZATION_ERROR',
     'MISSING_API_KEY',
     'MISSING_APP_KEY',
-    'NO_RESULTS_TO_POLL',
-    'NO_TESTS_TO_RUN',
-    'UNAVAILABLE_TUNNEL_CONFIG',
-    'TUNNEL_START_FAILED',
-    'TRIGGER_TESTS_FAILED',
     'POLL_RESULTS_FAILED',
+    'TRIGGER_TESTS_FAILED',
+    'TUNNEL_START_FAILED',
+    'UNAVAILABLE_TEST_CONFIG',
+    'UNAVAILABLE_TUNNEL_CONFIG',
 ];
 class CiError extends Error {
     constructor(code) {
@@ -21,5 +21,9 @@ class CiError extends Error {
 }
 exports.CiError = CiError;
 class CriticalError extends CiError {
+    constructor(code) {
+        super(code);
+        this.code = code;
+    }
 }
 exports.CriticalError = CriticalError;

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

@@ -1,4 +1,4 @@
-export { CiError } from './errors';
+export { CiError, CriticalError } from './errors';
 export * from './interfaces';
 export { DefaultReporter } from './reporters/default';
 export { executeTests } from './run-test';

package/dist/commands/synthetics/index.js

@@ -22,9 +22,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.utils = exports.executeTests = exports.DefaultReporter = exports.CiError = void 0;
+exports.utils = exports.executeTests = exports.DefaultReporter = exports.CriticalError = exports.CiError = void 0;
 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; } });
 __exportStar(require("./interfaces"), exports);
 var default_1 = require("./reporters/default");
 Object.defineProperty(exports, "DefaultReporter", { enumerable: true, get: function () { return default_1.DefaultReporter; } });

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

@@ -11,6 +11,7 @@ export interface MainReporter {
     }): void;
     runEnd(summary: Summary): void;
     testEnd(test: Test, results: PollResult[], baseUrl: string, locationNames: LocationsMapping, failOnCriticalErrors: boolean, failOnTimeout: boolean): void;
+    testsWait(tests: Test[]): void;
     testTrigger(test: Test, testId: string, executionRule: ExecutionRule, config: ConfigOverride): void;
     testWait(test: Test): void;
 }
@@ -252,12 +253,9 @@ export interface ConfigOverride {
     };
 }
 export interface Payload {
-    metadata?: SyntheticsMetadata;
+    metadata?: Metadata;
     tests: TestPayload[];
 }
-export declare type SyntheticsMetadata = Metadata & {
-    trigger_app: string;
-};
 export interface TestPayload extends ConfigOverride {
     executionRule: ExecutionRule;
     public_id: string;

package/dist/commands/synthetics/reporters/default.d.ts

@@ -13,6 +13,7 @@ export declare class DefaultReporter implements MainReporter {
     }): void;
     runEnd(summary: Summary): void;
     testEnd(test: Test, results: PollResult[], baseUrl: string, locationNames: LocationsMapping, failOnCriticalErrors: boolean, failOnTimeout: boolean): void;
+    testsWait(tests: Test[]): void;
     testTrigger(test: Test, testId: string, executionRule: ExecutionRule, config: ConfigOverride): void;
     testWait(test: Test): void;
 }

package/dist/commands/synthetics/reporters/default.js

@@ -195,14 +195,14 @@ class DefaultReporter {
         this.write(error);
     }
     initErrors(errors) {
-        this.write(errors.join('\n'));
+        this.write(errors.join('\n') + '\n\n');
     }
     log(log) {
         this.write(log);
     }
     reportStart(timings) {
         const delay = (Date.now() - timings.startTime).toString();
-        this.write(['\n', chalk_1.default.bold.cyan('=== REPORT ==='), `Took ${chalk_1.default.bold(delay)}ms`, '\n'].join('\n'));
+        this.write(['', chalk_1.default.bold.cyan('=== REPORT ==='), `Took ${chalk_1.default.bold(delay)}ms`, '\n'].join('\n'));
     }
     runEnd(summary) {
         const summaries = [
@@ -239,6 +239,15 @@ class DefaultReporter {
             .concat('\n\n');
         this.write([`${icon} ${idDisplay}${nonBlockingText} | ${nameColor(test.name)}`, testResultsText].join('\n'));
     }
+    testsWait(tests) {
+        const testsList = tests.map((t) => t.public_id);
+        if (testsList.length > 10) {
+            testsList.splice(10);
+            testsList.push('…');
+        }
+        const testsDisplay = chalk_1.default.gray(`(${testsList.join(', ')})`);
+        this.write(`Waiting for ${chalk_1.default.bold.cyan(tests.length)} test result${tests.length > 1 ? 's' : ''} ${testsDisplay}…\n`);
+    }
     testTrigger(test, testId, executionRule, config) {
         const idDisplay = `[${chalk_1.default.bold.dim(testId)}]`;
         const getMessage = () => {
@@ -246,22 +255,21 @@ class DefaultReporter {
                 // Test is either skipped from datadog-ci config or from test config
                 const isSkippedByCIConfig = config.executionRule === interfaces_1.ExecutionRule.SKIPPED;
                 if (isSkippedByCIConfig) {
-                    return `>> Skipped test "${chalk_1.default.yellow.dim(test.name)}"`;
+                    return `Skipped test "${chalk_1.default.yellow.dim(test.name)}"`;
                 }
                 else {
-                    return `>> Skipped test "${chalk_1.default.yellow.dim(test.name)}" because of execution rule configuration in Datadog`;
+                    return `Skipped test "${chalk_1.default.yellow.dim(test.name)}" because of execution rule configuration in Datadog`;
                 }
             }
             if (executionRule === interfaces_1.ExecutionRule.NON_BLOCKING) {
-                return `Trigger test "${chalk_1.default.green.bold(test.name)}" (non-blocking)`;
+                return `Found test "${chalk_1.default.green.bold(test.name)}" (non-blocking)`;
             }
-            return `Trigger test "${chalk_1.default.green.bold(test.name)}"`;
+            return `Found test "${chalk_1.default.green.bold(test.name)}"`;
         };
         this.write(`${idDisplay} ${getMessage()}\n`);
     }
     testWait(test) {
-        const idDisplay = `[${chalk_1.default.bold.dim(test.public_id)}]`;
-        this.write(`${idDisplay} Waiting results for "${chalk_1.default.green.bold(test.name)}"\n`);
+        return;
     }
 }
 exports.DefaultReporter = DefaultReporter;

package/dist/commands/synthetics/run-test.d.ts

@@ -62,15 +62,5 @@ export declare const getTestsList: (api: APIHelper, config: SyntheticsCIConfig,
     id: string;
     suite: string | undefined;
 }[]>;
-export declare const getApiHelper: (config: SyntheticsCIConfig) => {
-    getPresignedURL: (testIds: string[]) => Promise<{
-        url: string;
-    }>;
-    getTest: (testId: string) => Promise<Test>;
-    pollResults: (resultIds: string[]) => Promise<{
-        results: PollResult[];
-    }>;
-    searchTests: (query: string) => Promise<import("./interfaces").TestSearchResult>;
-    triggerTests: (data: import("./interfaces").Payload) => Promise<Trigger>;
-};
+export declare const getApiHelper: (config: SyntheticsCIConfig) => APIHelper;
 export declare const getDatadogHost: (useIntake: boolean | undefined, config: SyntheticsCIConfig) => string;

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

@@ -32,8 +32,7 @@ const executeTests = (reporter, config) => __awaiter(void 0, void 0, void 0, fun
             testsToTrigger = yield exports.getTestsList(api, config, reporter);
         }
         catch (error) {
-            const isCriticalError = api_1.is5xxError(error);
-            throw new (isCriticalError ? errors_1.CriticalError : errors_1.CiError)('UNAVAILABLE_TEST_CONFIG');
+            throw new errors_1.CriticalError(api_1.isForbiddenError(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG');
         }
     }
     if (!testsToTrigger.length) {
@@ -44,8 +43,10 @@ const executeTests = (reporter, config) => __awaiter(void 0, void 0, void 0, fun
         testsToTriggerResult = yield utils_1.getTestsToTrigger(api, testsToTrigger, reporter);
     }
     catch (error) {
-        const isCriticalError = api_1.is5xxError(error);
-        throw new (isCriticalError ? errors_1.CriticalError : errors_1.CiError)('UNAVAILABLE_TEST_CONFIG');
+        if (error instanceof errors_1.CiError) {
+            throw error;
+        }
+        throw new errors_1.CriticalError(api_1.isForbiddenError(error) ? 'AUTHORIZATION_ERROR' : 'UNAVAILABLE_TEST_CONFIG');
     }
     const { tests, overriddenTestsToTrigger, summary } = testsToTriggerResult;
     // All tests have been skipped or are missing.
@@ -60,8 +61,7 @@ const executeTests = (reporter, config) => __awaiter(void 0, void 0, void 0, fun
             presignedURL = (yield api.getPresignedURL(publicIdsToTrigger)).url;
         }
         catch (error) {
-            const isCriticalError = api_1.is5xxError(error);
-            throw new (isCriticalError ? errors_1.CriticalError : errors_1.CiError)('UNAVAILABLE_TUNNEL_CONFIG');
+            throw new errors_1.CriticalError('UNAVAILABLE_TUNNEL_CONFIG');
         }
         // Open a tunnel to Datadog
         try {
@@ -72,9 +72,8 @@ const executeTests = (reporter, config) => __awaiter(void 0, void 0, void 0, fun
             });
         }
         catch (error) {
-            const isCriticalError = api_1.is5xxError(error);
             yield stopTunnel();
-            throw new (isCriticalError ? errors_1.CriticalError : errors_1.CiError)('TUNNEL_START_FAILED');
+            throw new errors_1.CriticalError('TUNNEL_START_FAILED');
         }
     }
     let triggers;
@@ -82,13 +81,12 @@ const executeTests = (reporter, config) => __awaiter(void 0, void 0, void 0, fun
         triggers = yield utils_1.runTests(api, overriddenTestsToTrigger);
     }
     catch (error) {
-        const isCriticalError = api_1.is5xxError(error);
         yield stopTunnel();
-        throw new (isCriticalError ? errors_1.CriticalError : errors_1.CiError)('TRIGGER_TESTS_FAILED');
+        throw new errors_1.CriticalError('TRIGGER_TESTS_FAILED');
     }
     if (!triggers.results) {
         yield stopTunnel();
-        throw new errors_1.CriticalError('NO_RESULTS_TO_POLL');
+        throw new errors_1.CiError('NO_RESULTS_TO_POLL');
     }
     const results = {};
     try {
@@ -97,8 +95,7 @@ const executeTests = (reporter, config) => __awaiter(void 0, void 0, void 0, fun
         Object.assign(results, resultPolled);
     }
     catch (error) {
-        const isCriticalError = api_1.is5xxError(error);
-        throw new (isCriticalError ? errors_1.CriticalError : errors_1.CiError)('POLL_RESULTS_FAILED');
+        throw new errors_1.CriticalError('POLL_RESULTS_FAILED');
     }
     finally {
         yield stopTunnel();
@@ -132,10 +129,10 @@ const getTestsList = (api, config, reporter) => __awaiter(void 0, void 0, void 0
 exports.getTestsList = getTestsList;
 const getApiHelper = (config) => {
     if (!config.appKey) {
-        throw new errors_1.CiError('MISSING_APP_KEY');
+        throw new errors_1.CriticalError('MISSING_APP_KEY');
     }
     if (!config.apiKey) {
-        throw new errors_1.CiError('MISSING_API_KEY');
+        throw new errors_1.CriticalError('MISSING_API_KEY');
     }
     return api_1.apiConstructor({
         apiKey: config.apiKey,

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

@@ -1,5 +1,6 @@
 import { APIHelper, ConfigOverride, ExecutionRule, InternalTest, MainReporter, PollResult, Reporter, Result, Suite, Summary, TestPayload, Trigger, TriggerConfig, TriggerResponse, TriggerResult } from './interfaces';
 import { Tunnel } from './tunnel';
+export declare let ciTriggerApp: string;
 export declare const handleConfig: (test: InternalTest, publicId: string, reporter: MainReporter, config?: ConfigOverride | undefined) => TestPayload;
 export declare const setCiTriggerApp: (source: string) => void;
 export declare const getExecutionRule: (test: InternalTest, configOverride?: ConfigOverride | undefined) => ExecutionRule;

package/dist/commands/synthetics/utils.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseVariablesFromCli = exports.retry = exports.runTests = exports.getTestsToTrigger = exports.getReporter = exports.getResultDuration = exports.createSummary = exports.createTriggerResultMap = exports.waitForResults = exports.wait = exports.getSuites = exports.hasTestSucceeded = exports.hasResultPassed = exports.isCriticalError = exports.getStrictestExecutionRule = exports.getExecutionRule = exports.setCiTriggerApp = exports.handleConfig = void 0;
+exports.parseVariablesFromCli = exports.retry = exports.runTests = exports.getTestsToTrigger = exports.getReporter = exports.getResultDuration = exports.createSummary = exports.createTriggerResultMap = exports.waitForResults = exports.wait = exports.getSuites = exports.hasTestSucceeded = exports.hasResultPassed = exports.isCriticalError = exports.getStrictestExecutionRule = exports.getExecutionRule = exports.setCiTriggerApp = exports.handleConfig = exports.ciTriggerApp = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const url_1 = require("url");
@@ -41,13 +41,14 @@ const glob_1 = __importDefault(require("glob"));
 const ci_1 = require("../../helpers/ci");
 const utils_1 = require("../../helpers/utils");
 const api_1 = require("./api");
+const errors_1 = require("./errors");
 const interfaces_1 = require("./interfaces");
 const POLLING_INTERVAL = 5000; // In ms
 const PUBLIC_ID_REGEX = /^[\d\w]{3}-[\d\w]{3}-[\d\w]{3}$/;
 const SUBDOMAIN_REGEX = /(.*?)\.(?=[^\/]*\..{2,5})/;
 const TEMPLATE_REGEX = /{{\s*([^{}]*?)\s*}}/g;
 const template = (st, context) => st.replace(TEMPLATE_REGEX, (match, p1) => (p1 in context ? context[p1] : match));
-let ciTriggerApp = 'npm_package';
+exports.ciTriggerApp = 'npm_package';
 const handleConfig = (test, publicId, reporter, config) => {
     const executionRule = exports.getExecutionRule(test, config);
     let handledConfig = {
@@ -85,7 +86,7 @@ const handleConfig = (test, publicId, reporter, config) => {
 };
 exports.handleConfig = handleConfig;
 const setCiTriggerApp = (source) => {
-    ciTriggerApp = source;
+    exports.ciTriggerApp = source;
 };
 exports.setCiTriggerApp = setCiTriggerApp;
 const parseUrlVariables = (url, reporter) => {
@@ -370,6 +371,13 @@ const getReporter = (reporters) => ({
             }
         }
     },
+    testsWait: (tests) => {
+        for (const reporter of reporters) {
+            if (typeof reporter.testsWait === 'function') {
+                reporter.testsWait(tests);
+            }
+        }
+    },
 });
 exports.getReporter = getReporter;
 const getTestsToTrigger = (api, triggerConfigs, reporter) => __awaiter(void 0, void 0, void 0, function* () {
@@ -382,14 +390,14 @@ const getTestsToTrigger = (api, triggerConfigs, reporter) => __awaiter(void 0, v
         try {
             test = Object.assign(Object.assign({}, (yield api.getTest(id))), { suite });
         }
-        catch (e) {
-            if (api_1.is5xxError(e)) {
-                throw e;
+        catch (error) {
+            if (api_1.isNotFoundError(error)) {
+                summary.testsNotFound.add(id);
+                const errorMessage = api_1.formatBackendErrors(error);
+                errorMessages.push(`[${chalk_1.default.bold.dim(id)}] ${chalk_1.default.yellow.bold('Test not found')}: ${errorMessage}`);
+                return;
             }
-            summary.testsNotFound.add(id);
-            const errorMessage = api_1.formatBackendErrors(e);
-            errorMessages.push(`[${chalk_1.default.bold.dim(id)}] ${chalk_1.default.yellow.bold('Test not found')}: ${errorMessage}\n`);
-            return;
+            throw error;
         }
         const overriddenConfig = exports.handleConfig(test, id, reporter, config);
         overriddenTestsToTrigger.push(overriddenConfig);
@@ -405,16 +413,21 @@ const getTestsToTrigger = (api, triggerConfigs, reporter) => __awaiter(void 0, v
     // Display errors at the end of all tests for better visibility.
     reporter.initErrors(errorMessages);
     if (!overriddenTestsToTrigger.length) {
-        throw new Error('No tests to trigger');
+        throw new errors_1.CiError('NO_TESTS_TO_RUN');
     }
-    return { tests: tests.filter(definedTypeGuard), overriddenTestsToTrigger, summary };
+    const waitedTests = tests.filter(definedTypeGuard);
+    if (waitedTests.length > 0) {
+        reporter.testsWait(waitedTests);
+    }
+    return { tests: waitedTests, overriddenTestsToTrigger, summary };
 });
 exports.getTestsToTrigger = getTestsToTrigger;
 const runTests = (api, testsToTrigger) => __awaiter(void 0, void 0, void 0, function* () {
     const payload = { tests: testsToTrigger };
     const ciMetadata = ci_1.getCIMetadata();
-    const syntheticsMetadata = Object.assign(Object.assign({ ci: { job: {}, pipeline: {}, provider: {}, stage: {} }, git: { commit: { author: {}, committer: {} } } }, ciMetadata), { trigger_app: ciTriggerApp });
-    payload.metadata = syntheticsMetadata;
+    if (ciMetadata) {
+        payload.metadata = ciMetadata;
+    }
     try {
         return yield api.triggerTests(payload);
     }