@datadog/datadog-ci 1.0.0 → 1.1.2

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);