@datadog/datadog-ci 1.0.0 → 1.1.0

package/LICENSE-3rdparty.csv

@@ -30,7 +30,7 @@ inquirer,import,MIT,Copyright (c) 2012 Simon Boudrias
 jest,dev,MIT,Copyright (c) Facebook, Inc. and its affiliates.
 jest-environment-node,dev,MIT,Copyright (c) Facebook, Inc. and its affiliates.
 jest-matcher-specific-error,dev,MIT,Copyright (c) 2020 Daniel Hreben
-nexe,dev,MIT,Copyright (c) 2013-2018 Nexe Contributors
+pkg,dev,MIT,Copyright (c) 2021 Vercel, Inc.
 prettier,dev,MIT,Copyright © James Long and contributors
 proxy,dev,MIT,Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>
 proxy-agent,import,MIT,Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>

package/README.md

@@ -29,6 +29,34 @@ npm install -g @datadog/datadog-ci
 yarn global add @datadog/datadog-ci
 ```
 
+### Standalone binary (**beta**)
+
+If installing nodejs in the CI is an issue, standalone binaries are provided with [releases](https://github.com/DataDog/datadog-ci/releases). Only _linux-x64_, _darwin-x64_ (macOS) and _win-x64_ (Windows) are supported at the time. **These standalone binaries are in _beta_ and their stability is not guaranteed**. To install:
+
+#### Linux
+
+```sh
+curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
+```
+
+#### MacOS
+
+```sh
+curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_darwin-x64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
+```
+
+#### Windows
+
+```sh
+Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64.exe" -OutFile "datadog-ci.exe"
+```
+
+Then you can run `datadog-ci` commands normally:
+
+```sh
+datadog-ci version
+```
+
 ## Usage
 
 ```bash

package/dist/commands/lambda/__tests__/functions/instrument.test.js

@@ -741,7 +741,7 @@ describe('instrument', () => {
         test('fails when retry count is exceeded', () => __awaiter(void 0, void 0, void 0, function* () {
             const makeMockLambdaListFunctionsError = () => ({
                 listFunctions: jest.fn().mockImplementation((args) => ({
-                    promise: () => Promise.reject(),
+                    promise: () => Promise.reject('ListFunctionsError'),
                 })),
             });
             const lambda = makeMockLambdaListFunctionsError();
@@ -753,7 +753,7 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            yield expect(instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
+            yield expect(instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded. ListFunctionsError'));
         }));
     });
 });

package/dist/commands/lambda/__tests__/functions/uninstrument.test.js

@@ -394,12 +394,12 @@ describe('uninstrument', () => {
         test('fails when retry count is exceeded', () => __awaiter(void 0, void 0, void 0, function* () {
             const makeMockLambdaListFunctionsError = () => ({
                 listFunctions: jest.fn().mockImplementation((args) => ({
-                    promise: () => Promise.reject(),
+                    promise: () => Promise.reject('ListFunctionsError'),
                 })),
             });
             const lambda = makeMockLambdaListFunctionsError();
             const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            yield expect(uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'fake-pattern', undefined)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
+            yield expect(uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'fake-pattern', undefined)).rejects.toStrictEqual(new Error('Max retry count exceeded. ListFunctionsError'));
         }));
     });
 });

package/dist/commands/lambda/__tests__/instrument.test.js

@@ -853,7 +853,8 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
+${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
 ${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
 Fetching Lambda functions, this might take a while.
 ${chalk_1.bold(chalk_1.yellow('[Warning]'))} The environment, service and version tags have not been configured. Learn more about Datadog unified service tagging: ${chalk_1.underline(chalk_1.blueBright('https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.'))}
@@ -974,7 +975,8 @@ ${chalk_1.yellow('[!]')} Instrumenting functions.
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
+${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
 ${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
 ${chalk_1.bold(chalk_1.yellow('[Warning]'))} The environment, service and version tags have not been configured. Learn more about Datadog unified service tagging: ${chalk_1.underline(chalk_1.blueBright('https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.'))}
 ${chalk_1.bold(chalk_1.yellow('[Warning]'))} Instrument your ${chalk_1.hex('#FF9900').bold('Lambda')} functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`${chalk_1.bold('uninstrument')}\` with the same arguments to revert the changes.\n
@@ -1047,7 +1049,7 @@ ${chalk_1.yellow('[!]')} Instrumenting functions.
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
 ${chalk_1.red('[Error]')} Unexpected error
 "
 `);
@@ -1066,7 +1068,8 @@ ${chalk_1.red('[Error]')} Unexpected error
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
+"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
+${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
 ${chalk_1.red('[Error]')} Unexpected error
 "
 `);
@@ -1087,7 +1090,8 @@ ${chalk_1.red('[Error]')} Unexpected error
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"Fetching Lambda functions, this might take a while.
+"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
+Fetching Lambda functions, this might take a while.
 ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified region.
 "
 `);
@@ -1102,7 +1106,7 @@ ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified re
                 };
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
                 aws_sdk_1.Lambda.mockImplementation(() => ({
-                    listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('Lambda failed') })),
+                    listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('ListFunctionsError') })),
                 }));
                 const cli = fixtures_1.makeCli();
                 const context = fixtures_1.createMockContext();
@@ -1110,8 +1114,9 @@ ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified re
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"Fetching Lambda functions, this might take a while.
-${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded.
+"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
+Fetching Lambda functions, this might take a while.
+${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded. ListFunctionsError
 "
 `);
             }));

package/dist/commands/lambda/__tests__/prompt.test.js

@@ -80,25 +80,21 @@ describe('prompt', () => {
             inquirer_1.prompt.mockImplementation(() => Promise.resolve({
                 [constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]: fixtures_1.mockAwsAccessKeyId,
                 [constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]: fixtures_1.mockAwsSecretAccessKey,
-                [constants_1.AWS_DEFAULT_REGION_ENV_VAR]: 'sa-east-1',
             }));
             yield prompt_1.requestAWSCredentials();
             expect(process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]).toBe(fixtures_1.mockAwsAccessKeyId);
             expect(process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]).toBe(fixtures_1.mockAwsSecretAccessKey);
-            expect(process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR]).toBe('sa-east-1');
         }));
         test('sets the AWS credentials with session token as environment variables', () => __awaiter(void 0, void 0, void 0, function* () {
             ;
             inquirer_1.prompt.mockImplementation(() => Promise.resolve({
                 [constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]: fixtures_1.mockAwsAccessKeyId,
                 [constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]: fixtures_1.mockAwsSecretAccessKey,
-                [constants_1.AWS_DEFAULT_REGION_ENV_VAR]: 'sa-east-1',
                 [constants_1.AWS_SESSION_TOKEN_ENV_VAR]: 'some-session-token',
             }));
             yield prompt_1.requestAWSCredentials();
             expect(process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]).toBe(fixtures_1.mockAwsAccessKeyId);
             expect(process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]).toBe(fixtures_1.mockAwsSecretAccessKey);
-            expect(process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR]).toBe('sa-east-1');
             expect(process.env[constants_1.AWS_SESSION_TOKEN_ENV_VAR]).toBe('some-session-token');
         }));
         test('throws error when something unexpected happens while prompting', () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/commands/lambda/__tests__/uninstrument.test.js

@@ -257,15 +257,20 @@ UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:000000000000:function:un
         test('aborts if the the aws-sdk fails', () => __awaiter(void 0, void 0, void 0, function* () {
             ;
             fs.readFile.mockImplementation((a, b, callback) => callback({}));
-            aws_sdk_1.Lambda.mockImplementation(() => ({ promise: Promise.reject() }));
+            aws_sdk_1.Lambda.mockImplementation(() => ({
+                listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('ListFunctionsError') })),
+            }));
             process.env = {};
+            aws_sdk_1.Lambda.mockImplementation(() => ({
+                listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('ListFunctionsError') })),
+            }));
             const command = fixtures_1.createCommand(uninstrument_1.UninstrumentCommand);
             command['region'] = 'ap-southeast-1';
             command['regExPattern'] = 'my-function';
             const code = yield command['execute']();
             const output = command.context.stdout.toString();
             expect(code).toBe(1);
-            expect(output).toMatch(`Fetching Lambda functions, this might take a while.\n${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded.\n`);
+            expect(output).toMatch(`Fetching Lambda functions, this might take a while.\n${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded. ListFunctionsError\n`);
         }));
         test('uninstrument multiple functions interactively', () => __awaiter(void 0, void 0, void 0, function* () {
             ;
@@ -357,7 +362,7 @@ UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:000000000000:function:un
             const output = context.stdout.toString();
             expect(code).toBe(0);
             expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
 Fetching Lambda functions, this might take a while.\n
 ${chalk_1.bold(chalk_1.yellow('[!]'))} Functions to be updated:
 \t- ${chalk_1.bold('arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world')}
@@ -486,7 +491,7 @@ ${chalk_1.yellow('[!]')} Uninstrumenting functions.
             const output = context.stdout.toString();
             expect(code).toBe(0);
             expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!\n
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.\n
 ${chalk_1.bold(chalk_1.yellow('[!]'))} Functions to be updated:
 \t- ${chalk_1.bold('arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world')}
 \t- ${chalk_1.bold('arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2')}\n
@@ -526,7 +531,7 @@ ${chalk_1.yellow('[!]')} Uninstrumenting functions.
             const output = context.stdout.toString();
             expect(code).toBe(1);
             expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
 ${chalk_1.red('[Error]')} Unexpected error
 "
 `);
@@ -558,7 +563,7 @@ ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified re
             };
             fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
             aws_sdk_1.Lambda.mockImplementation(() => ({
-                listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('Lambda failed') })),
+                listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('ListFunctionsError') })),
             }));
             const cli = fixtures_1.makeCli();
             const context = fixtures_1.createMockContext();
@@ -567,7 +572,7 @@ ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified re
             expect(code).toBe(1);
             expect(output).toMatchInlineSnapshot(`
 "Fetching Lambda functions, this might take a while.
-${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded.
+${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded. ListFunctionsError
 "
 `);
         }));

package/dist/commands/lambda/constants.d.ts

@@ -41,7 +41,6 @@ export declare const ARM_LAYER_SUFFIX = "-ARM";
 export declare const PYTHON_HANDLER_LOCATION = "datadog_lambda.handler.handler";
 export declare const NODE_HANDLER_LOCATION = "/opt/nodejs/node_modules/datadog-lambda-js/handler.handler";
 export declare const SITES: string[];
-export declare const AWS_REGIONS: string[];
 export declare const DEFAULT_LAYER_AWS_ACCOUNT = "464622532012";
 export declare const GOVCLOUD_LAYER_AWS_ACCOUNT = "002406178527";
 export declare const SUBSCRIPTION_FILTER_NAME = "datadog-ci-filter";

package/dist/commands/lambda/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.API_KEY_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.AWS_REGIONS = exports.SITES = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.DOTNET_RUNTIME = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
-exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = void 0;
+exports.AWS_ACCESS_KEY_ID_REG_EXP = exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.API_KEY_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.SITES = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.DOTNET_RUNTIME = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
+exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = void 0;
 exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
 exports.EXTENSION_LAYER_KEY = 'extension';
 exports.DOTNET_RUNTIME = 'dotnetcore3.1';
@@ -50,31 +50,6 @@ exports.SITES = [
     'us5.datadoghq.com',
     'ddog-gov.com',
 ];
-exports.AWS_REGIONS = [
-    'us-east-1',
-    'us-east-2',
-    'us-west-1',
-    'us-west-2',
-    'af-south-1',
-    'ap-east-1',
-    'ap-south-1',
-    'ap-northeast-3',
-    'ap-northeast-2',
-    'ap-southeast-1',
-    'ap-southeast-2',
-    'ap-northeast-1',
-    'ca-central-1',
-    'eu-central-1',
-    'eu-west-1',
-    'eu-west-2',
-    'eu-south-1',
-    'eu-west-3',
-    'eu-north-1',
-    'me-south-1',
-    'sa-east-1',
-    'us-gov-east-1',
-    'us-gov-west-1',
-];
 exports.DEFAULT_LAYER_AWS_ACCOUNT = '464622532012';
 exports.GOVCLOUD_LAYER_AWS_ACCOUNT = '002406178527';
 exports.SUBSCRIPTION_FILTER_NAME = 'datadog-ci-filter';

package/dist/commands/lambda/functions/commons.js

@@ -206,7 +206,7 @@ const getLambdaFunctionConfigsFromRegex = (lambda, pattern) => __awaiter(void 0,
         catch (e) {
             retryCount++;
             if (retryCount > constants_1.LIST_FUNCTIONS_MAX_RETRY_COUNT) {
-                throw Error('Max retry count exceeded.');
+                throw Error(`Max retry count exceeded. ${e}`);
             }
         }
     }

package/dist/commands/lambda/instrument.js

@@ -42,9 +42,12 @@ class InstrumentCommand extends clipanion_1.Command {
             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`);
+                        this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.\n`);
                         yield prompt_1.requestAWSCredentials();
                     }
+                    // Always ask for region since the user may not want to use the default
+                    this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.\n`);
+                    yield prompt_1.requestAWSRegion(process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR]);
                     if (commons_1.isMissingDatadogEnvVars()) {
                         this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.\n`);
                         yield prompt_1.requestDatadogEnvVars();

package/dist/commands/lambda/prompt.d.ts

@@ -4,6 +4,7 @@ export declare const datadogEnvVarsQuestions: (datadogApiKeyType: Record<string,
 export declare const confirmationQuestion: (message: string) => ConfirmQuestion;
 export declare const functionSelectionQuestion: (functionNames: string[]) => CheckboxQuestion;
 export declare const requestAWSCredentials: () => Promise<void>;
+export declare const requestAWSRegion: (defaultRegion?: string | undefined) => Promise<void>;
 export declare const requestDatadogEnvVars: () => Promise<void>;
 export declare const requestChangesConfirmation: (message: string) => Promise<any>;
 export declare const requestFunctionSelection: (functionNames: string[]) => Promise<any>;

package/dist/commands/lambda/prompt.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestFunctionSelection = exports.requestChangesConfirmation = exports.requestDatadogEnvVars = exports.requestAWSCredentials = exports.functionSelectionQuestion = exports.confirmationQuestion = exports.datadogEnvVarsQuestions = exports.datadogApiKeyTypeQuestion = void 0;
+exports.requestFunctionSelection = exports.requestChangesConfirmation = exports.requestDatadogEnvVars = exports.requestAWSRegion = exports.requestAWSCredentials = exports.functionSelectionQuestion = exports.confirmationQuestion = exports.datadogEnvVarsQuestions = exports.datadogApiKeyTypeQuestion = void 0;
 const chalk_1 = require("chalk");
 const inquirer_1 = require("inquirer");
 const constants_1 = require("./constants");
@@ -47,15 +47,13 @@ const awsCredentialsQuestions = [
         name: constants_1.AWS_SESSION_TOKEN_ENV_VAR,
         type: 'password',
     },
-    {
-        // AWS_DEFAULT_REGION
-        choices: constants_1.AWS_REGIONS,
-        default: 0,
-        message: 'Select an AWS region:',
-        name: constants_1.AWS_DEFAULT_REGION_ENV_VAR,
-        type: 'list',
-    },
 ];
+const awsRegionQuestion = (defaultRegion) => ({
+    default: defaultRegion,
+    message: 'Which AWS region (e.g., us-east-1) your Lambda functions are deployed?',
+    name: constants_1.AWS_DEFAULT_REGION_ENV_VAR,
+    type: 'input',
+});
 const datadogApiKeyTypeQuestion = (datadogSite) => ({
     choices: [
         {
@@ -131,7 +129,6 @@ const requestAWSCredentials = () => __awaiter(void 0, void 0, void 0, function*
         const awsCredentialsAnswers = yield inquirer_1.prompt(awsCredentialsQuestions);
         process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] = awsCredentialsAnswers[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR];
         process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] = awsCredentialsAnswers[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR];
-        process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR] = awsCredentialsAnswers[constants_1.AWS_DEFAULT_REGION_ENV_VAR];
         if (awsCredentialsAnswers[constants_1.AWS_SESSION_TOKEN_ENV_VAR] !== undefined) {
             process.env[constants_1.AWS_SESSION_TOKEN_ENV_VAR] = awsCredentialsAnswers[constants_1.AWS_SESSION_TOKEN_ENV_VAR];
         }
@@ -143,6 +140,18 @@ const requestAWSCredentials = () => __awaiter(void 0, void 0, void 0, function*
     }
 });
 exports.requestAWSCredentials = requestAWSCredentials;
+const requestAWSRegion = (defaultRegion) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const awsRegionAnswer = yield inquirer_1.prompt(awsRegionQuestion(defaultRegion));
+        process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR] = awsRegionAnswer[constants_1.AWS_DEFAULT_REGION_ENV_VAR];
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            throw Error(`Couldn't set AWS region. ${e.message}`);
+        }
+    }
+});
+exports.requestAWSRegion = requestAWSRegion;
 const requestDatadogEnvVars = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const datadogSiteAnswer = yield inquirer_1.prompt(datadogSiteQuestion);

package/dist/commands/lambda/uninstrument.js

@@ -38,7 +38,7 @@ class UninstrumentCommand extends clipanion_1.Command {
             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`);
+                        this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.\n`);
                         yield prompt_1.requestAWSCredentials();
                     }
                 }

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

@@ -56,6 +56,12 @@ test('all option flags are supported', () => __awaiter(void 0, void 0, void 0, f
     const usage = cli.usage(command_1.RunTestCommand);
     options.forEach((option) => expect(usage).toContain(`--${option}`));
 }));
+const getAxiosHttpError = (status, error) => {
+    const serverError = new Error(error);
+    serverError.response = { data: { errors: [error] }, status };
+    serverError.config = { baseURL: 'baseURL', url: 'url' };
+    return serverError;
+};
 describe('run-test', () => {
     beforeEach(() => {
         jest.restoreAllMocks();
@@ -205,11 +211,8 @@ describe('run-test', () => {
             jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, _) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
             jest.spyOn(utils, 'getSuites').mockImplementation((() => [conf]));
             // Throw to stop the test
-            const serverError = new Error('Server Error');
-            serverError.response = { data: { errors: ['Bad Gateway'] }, status: 502 };
-            serverError.config = { baseURL: 'baseURL', url: 'url' };
             const triggerTests = jest.fn(() => {
-                throw serverError;
+                throw getAxiosHttpError(502, 'Bad Gateway');
             });
             const apiHelper = {
                 getTest: jest.fn(() => (Object.assign({}, fixtures_1.getApiTest('publicId')))),
@@ -252,4 +255,104 @@ describe('run-test', () => {
             }));
         }));
     });
+    describe('exit code respects `failOnCriticalErrors`', () => {
+        test('404 leading to `NO_TESTS_TO_RUN` never exit with 1', () => __awaiter(void 0, void 0, void 0, function* () {
+            const command = new command_1.RunTestCommand();
+            command.context = { stdout: { write: jest.fn() } };
+            command['config'].failOnCriticalErrors = true;
+            const apiHelper = {
+                getTest: jest.fn(() => {
+                    throw getAxiosHttpError(404, 'Test not found');
+                }),
+            };
+            jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+            jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, _) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
+            jest.spyOn(utils, 'getSuites').mockImplementation((() => [fixtures_1.getTestSuite()]));
+            expect(yield command.execute()).toBe(0);
+            expect(apiHelper.getTest).toHaveBeenCalledTimes(1);
+        }));
+        test('`NO_RESULTS_TO_POLL` never exit with 1', () => __awaiter(void 0, void 0, void 0, function* () {
+            const command = new command_1.RunTestCommand();
+            command.context = { stdout: { write: jest.fn() } };
+            command['config'].failOnCriticalErrors = true;
+            const apiHelper = {
+                getTest: () => fixtures_1.getApiTest('123-456-789'),
+                triggerTests: jest.fn(() => ({})),
+            };
+            jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+            jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, _) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
+            jest.spyOn(utils, 'getSuites').mockImplementation((() => [fixtures_1.getTestSuite()]));
+            expect(yield command.execute()).toBe(0);
+            expect(apiHelper.triggerTests).toHaveBeenCalledTimes(1);
+        }));
+        describe.each([false, true])('%s', (failOnCriticalErrors) => {
+            const cases = [['HTTP 4xx error', 403], ['HTTP 5xx error', 502], ['Unknown error']];
+            const expectedExit = failOnCriticalErrors ? 1 : 0;
+            describe.each(cases)('%s', (_, errorCode) => {
+                test('unable to obtain test configurations', () => __awaiter(void 0, void 0, void 0, function* () {
+                    const command = new command_1.RunTestCommand();
+                    command.context = { stdout: { write: jest.fn() } };
+                    command['config'].failOnCriticalErrors = failOnCriticalErrors;
+                    command['testSearchQuery'] = 'test:search';
+                    const apiHelper = {
+                        searchTests: jest.fn(() => {
+                            throw errorCode ? getAxiosHttpError(errorCode, 'Error') : new Error('Unknown error');
+                        }),
+                    };
+                    jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+                    jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, __) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
+                    expect(yield command.execute()).toBe(expectedExit);
+                    expect(apiHelper.searchTests).toHaveBeenCalledTimes(1);
+                }));
+                test('unavailable test config', () => __awaiter(void 0, void 0, void 0, function* () {
+                    const command = new command_1.RunTestCommand();
+                    command.context = { stdout: { write: jest.fn() } };
+                    command['config'].failOnCriticalErrors = failOnCriticalErrors;
+                    const apiHelper = {
+                        getTest: jest.fn(() => {
+                            throw errorCode ? getAxiosHttpError(errorCode, 'Error') : new Error('Unknown error');
+                        }),
+                    };
+                    jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+                    jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, __) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
+                    jest.spyOn(utils, 'getSuites').mockImplementation((() => [fixtures_1.getTestSuite()]));
+                    expect(yield command.execute()).toBe(expectedExit);
+                    expect(apiHelper.getTest).toHaveBeenCalledTimes(1);
+                }));
+                test('unable to trigger tests', () => __awaiter(void 0, void 0, void 0, function* () {
+                    const command = new command_1.RunTestCommand();
+                    command.context = { stdout: { write: jest.fn() } };
+                    command['config'].failOnCriticalErrors = failOnCriticalErrors;
+                    const apiHelper = {
+                        getTest: () => fixtures_1.getApiTest('123-456-789'),
+                        triggerTests: jest.fn(() => {
+                            throw errorCode ? getAxiosHttpError(errorCode, 'Error') : new Error('Unknown error');
+                        }),
+                    };
+                    jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+                    jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, __) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
+                    jest.spyOn(utils, 'getSuites').mockImplementation((() => [fixtures_1.getTestSuite()]));
+                    expect(yield command.execute()).toBe(expectedExit);
+                    expect(apiHelper.triggerTests).toHaveBeenCalledTimes(1);
+                }));
+                test('unable to poll test results', () => __awaiter(void 0, void 0, void 0, function* () {
+                    const command = new command_1.RunTestCommand();
+                    command.context = { stdout: { write: jest.fn() } };
+                    command['config'].failOnCriticalErrors = failOnCriticalErrors;
+                    const apiHelper = {
+                        getTest: () => fixtures_1.getApiTest('123-456-789'),
+                        pollResults: jest.fn(() => {
+                            throw errorCode ? getAxiosHttpError(errorCode, 'Error') : new Error('Unknown error');
+                        }),
+                        triggerTests: () => (Object.assign(Object.assign({}, fixtures_1.mockTestTriggerResponse), { results: [{ location: 1, public_id: '123-456-789', result_id: '1' }] })),
+                    };
+                    jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
+                    jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, __) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
+                    jest.spyOn(utils, 'getSuites').mockImplementation((() => [fixtures_1.getTestSuite()]));
+                    expect(yield command.execute()).toBe(expectedExit);
+                    expect(apiHelper.pollResults).toHaveBeenCalledTimes(1);
+                }));
+            });
+        });
+    });
 });

package/dist/commands/synthetics/__tests__/fixtures.d.ts

@@ -2,12 +2,13 @@
 /// <reference types="node" />
 import * as http from 'http';
 import { ProxyConfiguration } from '../../../helpers/utils';
-import { ApiTestResult, BrowserTestResult, CommandConfig, MainReporter, MultiStep, MultiStepsTestResult, PollResult, Step, Test } from '../interfaces';
+import { ApiTestResult, BrowserTestResult, CommandConfig, MainReporter, MultiStep, MultiStepsTestResult, PollResult, Step, Suite, Test } from '../interfaces';
 export declare const mockReporter: MainReporter;
 export declare const ciConfig: CommandConfig;
 export declare const getApiTest: (publicId: string) => Test;
 export declare const getStep: () => Step;
 export declare const getMultiStep: () => MultiStep;
+export declare const getTestSuite: () => Suite;
 export declare const getBrowserPollResult: () => PollResult;
 export declare const getApiPollResult: () => PollResult;
 export declare const getBrowserResult: (opts?: any) => BrowserTestResult;

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

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSyntheticsProxy = exports.mockPollResultResponse = exports.mockTestTriggerResponse = exports.mockSearchResponse = exports.getMultiStepsResult = exports.getApiResult = exports.getBrowserResult = exports.getApiPollResult = exports.getBrowserPollResult = exports.getMultiStep = exports.getStep = exports.getApiTest = exports.ciConfig = exports.mockReporter = void 0;
+exports.getSyntheticsProxy = exports.mockPollResultResponse = exports.mockTestTriggerResponse = exports.mockSearchResponse = exports.getMultiStepsResult = exports.getApiResult = exports.getBrowserResult = exports.getApiPollResult = exports.getBrowserPollResult = exports.getTestSuite = exports.getMultiStep = exports.getStep = exports.getApiTest = exports.ciConfig = exports.mockReporter = void 0;
 const http = __importStar(require("http"));
 const url_1 = require("url");
 const ws_1 = require("ws");
@@ -38,6 +38,7 @@ exports.mockReporter = {
     testEnd: jest.fn(),
     testTrigger: jest.fn(),
     testWait: jest.fn(),
+    testsWait: jest.fn(),
 };
 exports.ciConfig = {
     apiKey: '',
@@ -123,6 +124,8 @@ const getMultiStep = () => ({
     },
 });
 exports.getMultiStep = getMultiStep;
+const getTestSuite = () => ({ content: { tests: [{ config: {}, id: '123-456-789' }] }, name: 'Suite 1' });
+exports.getTestSuite = getTestSuite;
 const getPollResult = () => ({
     dc_id: 1,
     resultID: '123',

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

@@ -13,6 +13,7 @@ describe('Default reporter', () => {
     };
     const reporter = new default_1.DefaultReporter(mockContext);
     it('should log for each hook', () => {
+        // `testWait` is skipped as nothing is logged for the default reporter.
         const calls = [
             ['error', ['error']],
             ['initErrors', [['error']]],
@@ -21,7 +22,7 @@ describe('Default reporter', () => {
             ['runEnd', [utils_1.createSummary()]],
             ['testEnd', [{ options: {} }, [], '', []]],
             ['testTrigger', [{}, '', '', {}]],
-            ['testWait', [{}]],
+            ['testsWait', [[{}]]],
         ];
         for (const [fnName, args] of calls) {
             reporter[fnName](...args);

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

@@ -254,10 +254,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");
@@ -163,6 +164,9 @@ describe('utils', () => {
                 if (fakeTests[publicId]) {
                     return { data: fakeTests[publicId] };
                 }
+                const error = new Error('Not found');
+                error.status = 404;
+                throw error;
             }));
         });
         afterAll(() => {
@@ -191,7 +195,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

@@ -9,6 +9,7 @@ export declare class EndpointError extends Error {
     constructor(message: string, status: number);
 }
 export declare const formatBackendErrors: (requestError: AxiosError<BackendError>) => string;
+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<{

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.formatBackendErrors = exports.EndpointError = void 0;
 const querystring_1 = require("querystring");
 const utils_1 = require("../../helpers/utils");
 const utils_2 = require("./utils");
@@ -87,9 +87,11 @@ 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 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,14 @@ 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 'MISSING_APP_KEY':
                 reporter.error(`Missing ${chalk_1.default.red.bold('DATADOG_APP_KEY')} in your environment.\n`);
                 break;
@@ -144,16 +152,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"];
+declare type NonCriticalCiErrorCode = typeof nonCriticalErrorCodes[number];
+declare const criticalErrorCodes: readonly ["UNAVAILABLE_TEST_CONFIG", "MISSING_API_KEY", "MISSING_APP_KEY", "UNAVAILABLE_TUNNEL_CONFIG", "TUNNEL_START_FAILED", "TRIGGER_TESTS_FAILED", "POLL_RESULTS_FAILED"];
+declare type CriticalCiErrorCode = typeof criticalErrorCodes[number];
+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,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CriticalError = exports.CiError = void 0;
 /* tslint:disable:max-classes-per-file */
-const ciErrorCodes = [
+const nonCriticalErrorCodes = ['NO_TESTS_TO_RUN', 'NO_RESULTS_TO_POLL'];
+const criticalErrorCodes = [
     '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',
@@ -21,5 +20,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;
 }

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');
     }
     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(`\nWaiting 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.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('UNAVAILABLE_TEST_CONFIG');
         }
     }
     if (!testsToTrigger.length) {
@@ -44,8 +43,7 @@ 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');
+        throw error instanceof errors_1.CiError ? error : new errors_1.CriticalError('UNAVAILABLE_TEST_CONFIG');
     }
     const { tests, overriddenTestsToTrigger, summary } = testsToTriggerResult;
     // All tests have been skipped or are missing.
@@ -60,8 +58,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 +69,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 +78,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 +92,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 +126,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.js

@@ -41,6 +41,7 @@ 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}$/;
@@ -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,9 +413,13 @@ 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');
+    }
+    const waitedTests = tests.filter(definedTypeGuard);
+    if (waitedTests.length > 0) {
+        reporter.testsWait(waitedTests);
     }
-    return { tests: tests.filter(definedTypeGuard), overriddenTestsToTrigger, summary };
+    return { tests: waitedTests, overriddenTestsToTrigger, summary };
 });
 exports.getTestsToTrigger = getTestsToTrigger;
 const runTests = (api, testsToTrigger) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/datadog-ci",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Run datadog actions from the CI.",
   "repository": "https://github.com/DataDog/datadog-ci",
   "license": "Apache-2.0",
@@ -23,11 +23,20 @@
     "ini": "1.3.7",
     "kind-of@^6.0.0": "6.0.3"
   },
+  "pkg": {
+    "scripts": [
+      "dist/commands/*/*.js",
+      "node_modules/vm2/lib/contextify.js",
+      "node_modules/vm2/lib/setup-sandbox.js"
+    ]
+  },
   "scripts": {
     "build": "yarn clean; tsc",
+    "build:win": "tsc",
     "check-licenses": "node bin/check-licenses.js",
+    "clean:win": "rm dist -r",
     "clean": "rm -rf dist/*",
-    "dist-standalone": "nexe --verbose -i './dist/cli.js' --name datadog-ci --no-fs",
+    "dist-standalone": "pkg --compress GZip .",
     "dist-standalone:test": "jest --config ./jest.config-standalone.js",
     "format": "yarn tslint --fix && yarn prettier --write",
     "launch": "ts-node --transpile-only src/cli.ts",
@@ -84,7 +93,7 @@
     "jest": "27.0.5",
     "jest-environment-node": "27.0.5",
     "jest-matcher-specific-error": "1.0.0",
-    "nexe": "^4.0.0-beta.19",
+    "pkg": "5.5.2",
     "prettier": "2.0.5",
     "proxy": "1.0.2",
     "ts-jest": "27.0.3",