@datadog/datadog-ci 0.17.12 → 0.18.1

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

@@ -34,12 +34,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // tslint:disable: no-string-literal
 jest.mock('fs');
 jest.mock('aws-sdk');
+jest.mock('../prompt');
 const aws_sdk_1 = require("aws-sdk");
 const chalk_1 = require("chalk");
 const advanced_1 = require("clipanion/lib/advanced");
 const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
+const constants_1 = require("../constants");
 const instrument_1 = require("../instrument");
+const prompt_1 = require("../prompt");
 const fixtures_1 = require("./fixtures");
 // tslint:disable-next-line
 const { version } = require(path_1.default.join(__dirname, '../../../../package.json'));
@@ -101,6 +104,7 @@ UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:123456789012:function:la
     \\"Variables\\": {
       \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
       \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
       \\"DD_ENV\\": \\"staging\\",
       \\"DD_TAGS\\": \\"layer:api,team:intake\\",
       \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
@@ -120,6 +124,83 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
   \\"dd_sls_ci\\": \\"v${version}\\"
 }
 "
+`);
+            }));
+            test('prints dry run data for lambda library and extension layers using kebab case args', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--layer-version',
+                    '10',
+                    '--extension-version',
+                    '5',
+                    '--merge-xray-traces',
+                    'true',
+                    '--flush-metrics-to-logs',
+                    'false',
+                    '--log-level',
+                    'debug',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(0);
+                expect(output).toMatchInlineSnapshot(`
+"${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${chalk_1.bold(chalk_1.yellow('[!]'))} Functions to be updated:
+\t- ${chalk_1.bold('arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world')}\n
+${chalk_1.bold(chalk_1.cyan('[Dry Run] '))}Will apply the following updates:
+UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
+{
+  \\"FunctionName\\": \\"arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\\",
+  \\"Handler\\": \\"/opt/nodejs/node_modules/datadog-lambda-js/handler.handler\\",
+  \\"Environment\\": {
+    \\"Variables\\": {
+      \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
+      \\"DD_API_KEY\\": \\"1234\\",
+      \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
+      \\"DD_ENV\\": \\"staging\\",
+      \\"DD_TAGS\\": \\"layer:api,team:intake\\",
+      \\"DD_MERGE_XRAY_TRACES\\": \\"true\\",
+      \\"DD_SERVICE\\": \\"middletier\\",
+      \\"DD_TRACE_ENABLED\\": \\"true\\",
+      \\"DD_VERSION\\": \\"0.2\\",
+      \\"DD_LOG_LEVEL\\": \\"debug\\"
+    }
+  },
+  \\"Layers\\": [
+    \\"arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Extension:5\\",
+    \\"arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:10\\"
+  ]
+}
+TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
+{
+  \\"dd_sls_ci\\": \\"v${version}\\"
+}
+"
 `);
             }));
             test('prints dry run data for lambda extension layer', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -169,6 +250,7 @@ UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:123456789012:function:la
       \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
       \\"DD_API_KEY\\": \\"1234\\",
       \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
       \\"DD_ENV\\": \\"staging\\",
       \\"DD_TAGS\\": \\"layer:api,team:intake\\",
       \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
@@ -186,6 +268,75 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
   \\"dd_sls_ci\\": \\"v${version}\\"
 }
 "
+`);
+            }));
+            test('prints dry run data for lambda .NET layer', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'dotnetcore3.1',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '129',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(0);
+                expect(output).toMatchInlineSnapshot(`
+"${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${chalk_1.bold(chalk_1.yellow('[!]'))} Functions to be updated:
+\t- ${chalk_1.bold('arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world')}\n
+${chalk_1.bold(chalk_1.cyan('[Dry Run] '))}Will apply the following updates:
+UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
+{
+  \\"FunctionName\\": \\"arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\\",
+  \\"Environment\\": {
+    \\"Variables\\": {
+      \\"DD_API_KEY\\": \\"1234\\",
+      \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
+      \\"DD_ENV\\": \\"staging\\",
+      \\"DD_TAGS\\": \\"layer:api,team:intake\\",
+      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
+      \\"DD_SERVICE\\": \\"middletier\\",
+      \\"DD_TRACE_ENABLED\\": \\"true\\",
+      \\"DD_VERSION\\": \\"0.2\\",
+      \\"DD_FLUSH_TO_LOG\\": \\"true\\",
+      \\"CORECLR_ENABLE_PROFILING\\": \\"1\\",
+      \\"CORECLR_PROFILER\\": \\"{846F5F1C-F9AE-4B07-969E-05C26BC060D8}\\",
+      \\"CORECLR_PROFILER_PATH\\": \\"/opt/datadog/Datadog.Trace.ClrProfiler.Native.so\\",
+      \\"DD_DOTNET_TRACER_HOME\\": \\"/opt/datadog\\"
+    }
+  },
+  \\"Layers\\": [
+    \\"arn:aws:lambda:us-east-1:464622532012:layer:dd-trace-dotnet:129\\"
+  ]
+}
+TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
+{
+  \\"dd_sls_ci\\": \\"v${version}\\"
+}
+"
 `);
             }));
             test('instrumenting with source code integrations fails if not run within a git repo', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -218,7 +369,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     '0.1',
                 ], context);
                 const output = context.stdout.toString();
-                expect(output).toMatch(/.*Make sure the command is running within your git repository\..*/i);
+                expect(output.replace('\n', '')).toMatch(/.*Error: Couldn't get local git status.*/);
             }));
             test('instrumenting with source code integrations fails if DATADOG_API_KEY is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -346,6 +497,7 @@ UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:123456789012:function:la
       \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
       \\"DD_API_KEY\\": \\"1234\\",
       \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
       \\"DD_ENV\\": \\"dummy\\",
       \\"DD_TAGS\\": \\"git.commit.sha:1be168ff837f043bde17c0314341c84271047b31\\",
       \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
@@ -473,7 +625,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-                                                            "No functions specified for instrumentation.
+                                                            "${chalk_1.red('[Error]')} No functions specified for instrumentation.
                                                             "
                                                 `);
             }));
@@ -491,7 +643,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 yield command['execute']();
                 const output = command.context.stdout.toString();
                 expect(output).toMatchInlineSnapshot(`
-                                                            "No functions specified for instrumentation.
+                                                            "${chalk_1.red('[Error]')} No functions specified for instrumentation.
                                                             "
                                                 `);
             }));
@@ -550,7 +702,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-                                                  "Couldn't fetch lambda functions. Error: Can't instrument arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world, as current State is Failed (must be \\"Active\\") and Last Update Status is Unsuccessful (must be \\"Successful\\")
+                                                  "${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Can't instrument arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world, as current State is Failed (must be \\"Active\\") and Last Update Status is Unsuccessful (must be \\"Successful\\")
                                                   "
                                         `);
             }));
@@ -581,7 +733,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-          "\\"extensionVersion\\" and \\"forwarder\\" should not be used at the same time.
+          "${chalk_1.red('[Error]')} \\"extensionVersion\\" and \\"forwarder\\" should not be used at the same time.
           "
         `);
             }));
@@ -622,6 +774,19 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 output = command.context.stdout.toString();
                 expect(output).toMatch('"--functions" and "--functions-regex" should not be used at the same time.\n');
             }));
+            test('aborts if pattern is set and no default region is specified', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({}));
+                process.env = {};
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
+                command['environment'] = 'staging';
+                command['service'] = 'middletier';
+                command['version'] = '2';
+                command['regExPattern'] = 'valid-pattern';
+                yield command['execute']();
+                const output = command.context.stdout.toString();
+                expect(output).toMatch(`${chalk_1.red('[Error]')} No default region specified. Use \`-r\`, \`--region\`.\n`);
+            }));
             test('aborts if the regEx pattern is an ARN', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({}));
@@ -636,6 +801,469 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = command.context.stdout.toString();
                 expect(output).toMatch(`"--functions-regex" isn't meant to be used with ARNs.\n`);
             }));
+            test('instrument multiple functions interactively', () => __awaiter(void 0, void 0, void 0, function* () {
+                const node14LibraryLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node14-x`;
+                const node12LibraryLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node12-x`;
+                const extensionLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Extension`;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world',
+                        FunctionName: 'lambda-hello-world',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2': {
+                        FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2',
+                        FunctionName: 'lambda-hello-world-2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                }, {
+                    [`${node14LibraryLayer}:1`]: {
+                        LayerVersionArn: `${node14LibraryLayer}:1`,
+                        Version: 1,
+                    },
+                    [`${node12LibraryLayer}:1`]: {
+                        LayerVersionArn: `${node12LibraryLayer}:1`,
+                        Version: 1,
+                    },
+                    [`${extensionLayer}:1`]: {
+                        LayerVersionArn: `${extensionLayer}:1`,
+                        Version: 1,
+                    },
+                }));
+                prompt_1.requestAWSCredentials.mockImplementation(() => {
+                    process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] = fixtures_1.mockAwsAccessKeyId;
+                    process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] = fixtures_1.mockAwsSecretAccessKey;
+                    process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR] = 'sa-east-1';
+                });
+                prompt_1.requestDatadogEnvVars.mockImplementation(() => {
+                    process.env[constants_1.CI_SITE_ENV_VAR] = 'datadoghq.com';
+                    process.env[constants_1.CI_API_KEY_ENV_VAR] = fixtures_1.mockDatadogApiKey;
+                });
+                prompt_1.requestFunctionSelection.mockImplementation(() => [
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world',
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2',
+                ]);
+                prompt_1.requestChangesConfirmation.mockImplementation(() => true);
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run(['lambda', 'instrument', '-i'], context);
+                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('[!]'))} 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.'))}
+${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
+${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(chalk_1.yellow('[Warning]'))} At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.
+\t- ${chalk_1.bold('arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2')}
+\t${chalk_1.bold(chalk_1.yellow('[Warning]'))} At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.\n
+Will apply the following updates:
+UpdateFunctionConfiguration -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
+{
+  \\"FunctionName\\": \\"arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world\\",
+  \\"Handler\\": \\"/opt/nodejs/node_modules/datadog-lambda-js/handler.handler\\",
+  \\"Environment\\": {
+    \\"Variables\\": {
+      \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
+      \\"DD_API_KEY\\": \\"02aeb762fff59ac0d5ad1536cd9633bd\\",
+      \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
+      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
+      \\"DD_TRACE_ENABLED\\": \\"true\\",
+      \\"DD_FLUSH_TO_LOG\\": \\"true\\"
+    }
+  },
+  \\"Layers\\": [
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:1\\",
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:1\\"
+  ]
+}
+TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
+{
+  \\"dd_sls_ci\\": \\"v${version}\\"
+}
+UpdateFunctionConfiguration -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2
+{
+  \\"FunctionName\\": \\"arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2\\",
+  \\"Handler\\": \\"/opt/nodejs/node_modules/datadog-lambda-js/handler.handler\\",
+  \\"Environment\\": {
+    \\"Variables\\": {
+      \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
+      \\"DD_API_KEY\\": \\"02aeb762fff59ac0d5ad1536cd9633bd\\",
+      \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
+      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
+      \\"DD_TRACE_ENABLED\\": \\"true\\",
+      \\"DD_FLUSH_TO_LOG\\": \\"true\\"
+    }
+  },
+  \\"Layers\\": [
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:1\\",
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node14-x:1\\"
+  ]
+}
+TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2
+{
+  \\"dd_sls_ci\\": \\"v${version}\\"
+}
+${chalk_1.yellow('[!]')} Confirmation needed.
+${chalk_1.yellow('[!]')} Instrumenting functions.
+"
+`);
+            }));
+            test('instrument multiple specified functions interactively', () => __awaiter(void 0, void 0, void 0, function* () {
+                const node14LibraryLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node14-x`;
+                const node12LibraryLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node12-x`;
+                const extensionLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Extension`;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world',
+                        FunctionName: 'lambda-hello-world',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2': {
+                        FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2',
+                        FunctionName: 'lambda-hello-world-2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                }, {
+                    [`${node14LibraryLayer}:1`]: {
+                        LayerVersionArn: `${node14LibraryLayer}:1`,
+                        Version: 1,
+                    },
+                    [`${node12LibraryLayer}:1`]: {
+                        LayerVersionArn: `${node12LibraryLayer}:1`,
+                        Version: 1,
+                    },
+                    [`${extensionLayer}:1`]: {
+                        LayerVersionArn: `${extensionLayer}:1`,
+                        Version: 1,
+                    },
+                }));
+                prompt_1.requestAWSCredentials.mockImplementation(() => {
+                    process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] = fixtures_1.mockAwsAccessKeyId;
+                    process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] = fixtures_1.mockAwsSecretAccessKey;
+                    process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR] = 'sa-east-1';
+                    process.env[constants_1.AWS_SESSION_TOKEN_ENV_VAR] = 'some-session-token';
+                });
+                prompt_1.requestDatadogEnvVars.mockImplementation(() => {
+                    process.env[constants_1.CI_SITE_ENV_VAR] = 'datadoghq.com';
+                    process.env[constants_1.CI_API_KEY_ENV_VAR] = fixtures_1.mockDatadogApiKey;
+                });
+                prompt_1.requestChangesConfirmation.mockImplementation(() => true);
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-i',
+                    '-f',
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world',
+                    '-f',
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2',
+                ], context);
+                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('[!]'))} 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
+${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(chalk_1.yellow('[Warning]'))} At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.
+\t- ${chalk_1.bold('arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2')}
+\t${chalk_1.bold(chalk_1.yellow('[Warning]'))} At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.\n
+Will apply the following updates:
+UpdateFunctionConfiguration -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
+{
+  \\"FunctionName\\": \\"arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world\\",
+  \\"Handler\\": \\"/opt/nodejs/node_modules/datadog-lambda-js/handler.handler\\",
+  \\"Environment\\": {
+    \\"Variables\\": {
+      \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
+      \\"DD_API_KEY\\": \\"02aeb762fff59ac0d5ad1536cd9633bd\\",
+      \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
+      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
+      \\"DD_TRACE_ENABLED\\": \\"true\\",
+      \\"DD_FLUSH_TO_LOG\\": \\"true\\"
+    }
+  },
+  \\"Layers\\": [
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:1\\",
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:1\\"
+  ]
+}
+TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
+{
+  \\"dd_sls_ci\\": \\"v${version}\\"
+}
+UpdateFunctionConfiguration -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2
+{
+  \\"FunctionName\\": \\"arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2\\",
+  \\"Handler\\": \\"/opt/nodejs/node_modules/datadog-lambda-js/handler.handler\\",
+  \\"Environment\\": {
+    \\"Variables\\": {
+      \\"DD_LAMBDA_HANDLER\\": \\"index.handler\\",
+      \\"DD_API_KEY\\": \\"02aeb762fff59ac0d5ad1536cd9633bd\\",
+      \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
+      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
+      \\"DD_TRACE_ENABLED\\": \\"true\\",
+      \\"DD_FLUSH_TO_LOG\\": \\"true\\"
+    }
+  },
+  \\"Layers\\": [
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:1\\",
+    \\"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node14-x:1\\"
+  ]
+}
+TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2
+{
+  \\"dd_sls_ci\\": \\"v${version}\\"
+}
+${chalk_1.yellow('[!]')} Confirmation needed.
+${chalk_1.yellow('[!]')} Instrumenting functions.
+"
+`);
+            }));
+            test('aborts if a problem occurs while setting the AWS credentials interactively', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                prompt_1.requestAWSCredentials.mockImplementation(() => Promise.reject('Unexpected error'));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run(['lambda', 'instrument', '-i'], context);
+                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.red('[Error]')} Unexpected error
+"
+`);
+            }));
+            test('aborts if a problem occurs while setting the Datadog Environment Variables interactively', () => __awaiter(void 0, void 0, void 0, function* () {
+                process.env = {
+                    [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',
+                };
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                prompt_1.requestDatadogEnvVars.mockImplementation(() => Promise.reject('Unexpected error'));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run(['lambda', 'instrument', '-i'], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
+${chalk_1.red('[Error]')} Unexpected error
+"
+`);
+            }));
+            test('aborts if there are no functions to instrument in the user AWS account', () => __awaiter(void 0, void 0, void 0, function* () {
+                process.env = {
+                    [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.CI_SITE_ENV_VAR]: 'datadoghq.com',
+                    [constants_1.CI_API_KEY_ENV_VAR]: fixtures_1.mockDatadogApiKey,
+                };
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run(['lambda', 'instrument', '-i'], context);
+                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 find any Lambda functions in the specified region.
+"
+`);
+            }));
+            test('aborts early when the aws-sdk throws an error while instrumenting interactively', () => __awaiter(void 0, void 0, void 0, function* () {
+                process.env = {
+                    [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.CI_SITE_ENV_VAR]: 'datadoghq.com',
+                    [constants_1.CI_API_KEY_ENV_VAR]: fixtures_1.mockDatadogApiKey,
+                };
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => ({
+                    listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('Lambda failed') })),
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run(['lambda', 'instrument', '-i'], context);
+                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.
+"
+`);
+            }));
+            test('aborts early when a layer version is set for Java', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'java8.al2',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '6',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Only the --extension-version argument should be set for the java8.al2 runtime. Please remove the --layer-version argument from the instrument command.
+"
+`);
+            }));
+            test('aborts early when a layer version is set for Ruby', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'ruby2.7',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '40',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Only the --extension-version argument should be set for the ruby2.7 runtime. Please remove the --layer-version argument from the instrument command.
+"
+`);
+            }));
+            test('aborts early when a layer version is set for a Custom runtime', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'provided.al2',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '6',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Only the --extension-version argument should be set for the provided.al2 runtime. Please remove the --layer-version argument from the instrument command.
+"
+`);
+            }));
+            test('aborts early when .NET is using ARM64 architecture', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        Architectures: ['arm64'],
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'dotnetcore3.1',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '6',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Instrumenting arm64 architecture is not currently supported for .NET. Please only instrument .NET functions using x86_64 architecture.
+"
+`);
+            }));
         });
         describe('getSettings', () => {
             test('uses config file settings', () => {
@@ -650,11 +1278,13 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 command['config']['tracing'] = 'false';
                 command['config']['logLevel'] = 'debug';
                 expect(command['getSettings']()).toEqual({
+                    captureLambdaPayload: false,
                     environment: undefined,
                     extensionVersion: 6,
                     extraTags: undefined,
                     flushMetricsToLogs: false,
                     forwarderARN: 'my-forwarder',
+                    interactive: false,
                     layerAWSAccount: 'another-account',
                     layerVersion: 2,
                     logLevel: 'debug',
@@ -682,8 +1312,10 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 command['logLevel'] = 'debug';
                 command['config']['logLevel'] = 'info';
                 expect(command['getSettings']()).toEqual({
+                    captureLambdaPayload: false,
                     flushMetricsToLogs: false,
                     forwarderARN: 'my-forwarder',
+                    interactive: false,
                     layerAWSAccount: 'my-account',
                     layerVersion: 1,
                     logLevel: 'debug',
@@ -713,30 +1345,37 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 process.env = {};
                 const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 const validSettings = {
+                    captureLambdaPayload: true,
                     extensionVersion: undefined,
                     flushMetricsToLogs: false,
                     forwarderARN: undefined,
+                    interactive: false,
                     layerAWSAccount: undefined,
                     layerVersion: undefined,
                     logLevel: undefined,
                     mergeXrayTraces: false,
                     tracingEnabled: true,
                 };
+                command['config']['captureLambdaPayload'] = 'truE';
                 command['config']['flushMetricsToLogs'] = 'False';
                 command['config']['mergeXrayTraces'] = 'falSE';
                 command['config']['tracing'] = 'TRUE';
                 expect(command['getSettings']()).toEqual(validSettings);
+                command['config']['captureLambdaPayload'] = 'true';
                 command['config']['flushMetricsToLogs'] = 'false';
                 command['config']['mergeXrayTraces'] = 'false';
                 command['config']['tracing'] = 'true';
                 expect(command['getSettings']()).toEqual(validSettings);
+                validSettings.captureLambdaPayload = false;
                 validSettings.flushMetricsToLogs = true;
                 validSettings.mergeXrayTraces = true;
                 validSettings.tracingEnabled = false;
+                command['captureLambdaPayload'] = 'faLSE';
                 command['flushMetricsToLogs'] = 'truE';
                 command['mergeXrayTraces'] = 'TRUe';
                 command['tracing'] = 'FALSE';
                 expect(command['getSettings']()).toEqual(validSettings);
+                command['captureLambdaPayload'] = 'false';
                 command['flushMetricsToLogs'] = 'true';
                 command['mergeXrayTraces'] = 'true';
                 command['tracing'] = 'false';