@datadog/datadog-ci 2.3.2 → 2.4.1

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

@@ -27,23 +27,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 jest.mock('fs');
 jest.mock('aws-sdk');
 jest.mock('../prompt');
 jest.mock('../renderer', () => require('../__mocks__/renderer'));
+jest.mock('../../../../package.json', () => ({ version: 'XXXX' }));
 const fs = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
 const aws_sdk_1 = require("aws-sdk");
 const advanced_1 = require("clipanion/lib/advanced");
 const constants_1 = require("../constants");
 const instrument_1 = require("../instrument");
 const prompt_1 = require("../prompt");
 const fixtures_1 = require("./fixtures");
-const { version } = require(path_1.default.join(__dirname, '../../../../package.json'));
 describe('lambda', () => {
     describe('instrument', () => {
         describe('execute', () => {
@@ -90,41 +86,7 @@ describe('lambda', () => {
                 ], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n[Dry Run] 🐶 Instrumenting Lambda function
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\n
-[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_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\\",
-      \\"DD_LOG_LEVEL\\": \\"debug\\"
-    }
-  },
-  \\"Layers\\": [
-    \\"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}\\"
-}
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             test('prints dry run data for lambda library and extension layers using kebab case args', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -168,42 +130,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 ], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n[Dry Run] 🐶 Instrumenting Lambda function
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\n
-[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}\\"
-}
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             test('prints dry run data for lambda extension layer', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -239,40 +166,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 ], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n[Dry Run] 🐶 Instrumenting Lambda function
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\n
-[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\\": \\"false\\",
-      \\"DD_SERVICE\\": \\"middletier\\",
-      \\"DD_TRACE_ENABLED\\": \\"true\\",
-      \\"DD_VERSION\\": \\"0.2\\"
-    }
-  },
-  \\"Layers\\": [
-    \\"arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Extension:6\\"
-  ]
-}
-TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
-{
-  \\"dd_sls_ci\\": \\"v${version}\\"
-}
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             test('prints dry run data for lambda .NET layer', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -307,43 +201,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 ], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n[Dry Run] 🐶 Instrumenting Lambda function
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\n
-[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}\\"
-}
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             test('instrumenting with source code integrations fails if not run within a git repo', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -416,7 +274,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(output).toMatch('Error: Local git repository is dirty');
             }));
-            test('ensure source code integration git remotes get formatted correctly', () => __awaiter(void 0, void 0, void 0, function* () {
+            test('ensure source code integration flag works from a clean repo', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
                 const lambda = fixtures_1.makeMockLambda({
@@ -430,17 +288,20 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 process.env.DATADOG_API_KEY = '1234';
                 const context = fixtures_1.createMockContext();
                 const instrumentCommand = instrument_1.InstrumentCommand;
-                const instrumentCommandSpy = jest.spyOn(instrumentCommand.prototype, 'filterAndFormatGitRemote');
                 const mockGitStatus = jest.spyOn(instrumentCommand.prototype, 'getCurrentGitStatus');
                 mockGitStatus.mockImplementation(() => ({
                     ahead: 0,
                     hash: '1be168ff837f043bde17c0314341c84271047b31',
-                    remote: 'https://github.com/datadog/test.git',
+                    remote: 'git.repository_url:git@github.com:datadog/test.git',
                     isClean: true,
                 }));
+                const mockUploadFunction = jest.spyOn(instrumentCommand.prototype, 'uploadGitData');
+                mockUploadFunction.mockImplementation(() => {
+                    return;
+                });
                 const cli = new advanced_1.Cli();
                 cli.register(instrumentCommand);
-                const cliInput = [
+                yield cli.run([
                     'lambda',
                     'instrument',
                     '--function',
@@ -454,28 +315,12 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     'dummy',
                     '--version',
                     '0.1',
-                ];
-                yield cli.run(cliInput, context);
-                mockGitStatus.mockImplementation(() => ({
-                    ahead: 0,
-                    hash: '1be168ff837f043bde17c0314341c84271047b31',
-                    remote: 'git@github.com:datadog/test.git',
-                    isClean: true,
-                }));
-                yield cli.run(cliInput, context);
-                mockGitStatus.mockImplementation(() => ({
-                    ahead: 0,
-                    hash: '1be168ff837f043bde17c0314341c84271047b31',
-                    remote: 'github.com/datadog/test.git',
-                    isClean: true,
-                }));
-                yield cli.run(cliInput, context);
-                expect(instrumentCommandSpy).toHaveBeenCalledTimes(3);
-                expect(instrumentCommandSpy).toHaveNthReturnedWith(1, 'github.com/datadog/test.git');
-                expect(instrumentCommandSpy).toHaveNthReturnedWith(2, 'github.com/datadog/test.git');
-                expect(instrumentCommandSpy).toHaveNthReturnedWith(3, 'github.com/datadog/test.git');
+                ], context);
+                const output = context.stdout.toString();
+                expect(output).toMatchSnapshot();
+                expect(mockUploadFunction).toHaveBeenCalledTimes(1);
             }));
-            test('ensure source code integration flag works from a clean repo', () => __awaiter(void 0, void 0, void 0, function* () {
+            test('ensure no git metadata upload flag works', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
                 const lambda = fixtures_1.makeMockLambda({
@@ -496,6 +341,10 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     remote: 'git.repository_url:git@github.com:datadog/test.git',
                     isClean: true,
                 }));
+                const mockUploadFunction = jest.spyOn(instrumentCommand.prototype, 'uploadGitData');
+                mockUploadFunction.mockImplementation(() => {
+                    return;
+                });
                 const cli = new advanced_1.Cli();
                 cli.register(instrumentCommand);
                 yield cli.run([
@@ -505,7 +354,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
                     '--layerVersion',
                     '10',
-                    '-s',
+                    '--no-upload-git-metadata',
                     '--service',
                     'dummy',
                     '--env',
@@ -514,41 +363,8 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     '0.1',
                 ], context);
                 const output = context.stdout.toString();
-                expect(output).toMatchInlineSnapshot(`
-"\n🐶 Instrumenting Lambda function\n
-[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\n
-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\\": \\"dummy\\",
-      \\"DD_TAGS\\": \\"git.commit.sha:1be168ff837f043bde17c0314341c84271047b31,git.repository_url:git.repository_url:github.com/datadog/test.git\\",
-      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
-      \\"DD_SERVICE\\": \\"dummy\\",
-      \\"DD_TRACE_ENABLED\\": \\"true\\",
-      \\"DD_VERSION\\": \\"0.1\\",
-      \\"DD_FLUSH_TO_LOG\\": \\"true\\"
-    }
-  },
-  \\"Layers\\": [
-    \\"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}\\"
-}
-"
-`);
+                expect(mockUploadFunction).toHaveBeenCalledTimes(0);
+                expect(output).toMatchSnapshot();
             }));
             test('ensure the instrument command ran from a local git repo ahead of the origin fails', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -918,71 +734,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const code = yield cli.run(['lambda', 'instrument', '-i', '--no-source-code-integration'], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n🐶 Instrumenting Lambda function
-[!] 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[!] Configure AWS region.
-\n[!] Configure Datadog settings.
-\n[Warning] The environment, service and version tags have not been configured. Learn more about Datadog unified service tagging: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
-\t[Warning] At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.
-\t- arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2
-\t[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}\\"
-}
-[!] Confirmation needed.
-[!] Instrumenting functions.
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             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`;
@@ -1052,71 +804,7 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 ], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n🐶 Instrumenting Lambda function
-[!] 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[!] Configure AWS region.
-\n[!] Configure Datadog settings.
-\n[Warning] The environment, service and version tags have not been configured. Learn more about Datadog unified service tagging: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
-\t[Warning] At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.
-\t- arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-2
-\t[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}\\"
-}
-[!] Confirmation needed.
-[!] Instrumenting functions.
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             test('aborts if a problem occurs while setting the AWS credentials interactively', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -1199,48 +887,7 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const code = yield cli.run(['lambda', 'instrument', '-i', '--no-source-code-integration'], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n🐶 Instrumenting Lambda function
-[!] 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[!] Configure AWS region.
-\n[!] Configure Datadog settings.
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
-\t[Warning] At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.
-
-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_ENV\\": \\"sandbox\\",
-      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
-      \\"DD_SERVICE\\": \\"testServiceName\\",
-      \\"DD_TRACE_ENABLED\\": \\"true\\",
-      \\"DD_VERSION\\": \\"1.0.0\\",
-      \\"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}\\"
-}
-[!] Confirmation needed.
-[!] Instrumenting functions.
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             test('when not provided it does not set DD_ENV, DD_SERVICE, and DD_VERSION tags in interactive mode', () => __awaiter(void 0, void 0, void 0, function* () {
                 const node12LibraryLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node12-x`;
@@ -1286,46 +933,7 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const code = yield cli.run(['lambda', 'instrument', '-i', '--no-source-code-integration'], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
-                expect(output).toMatchInlineSnapshot(`
-"\n🐶 Instrumenting Lambda function
-[!] 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[!] Configure AWS region.
-\n[!] Configure Datadog settings.
-\n[Warning] The environment, service and version tags have not been configured. Learn more about Datadog unified service tagging: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.
-\n[Warning] Instrument your Lambda functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`uninstrument\` with the same arguments to revert the changes.
-\n[!] Functions to be updated:
-\t- arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
-\t[Warning] At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.
-
-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}\\"
-}
-[!] Confirmation needed.
-[!] Instrumenting functions.
-"
-`);
+                expect(output).toMatchSnapshot();
             }));
             test('aborts if there are no functions to instrument in the user AWS account', () => __awaiter(void 0, void 0, void 0, function* () {
                 process.env = {
@@ -1531,6 +1139,119 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
 "
 `);
             }));
+            test('prints which functions failed to instrument without aborting when at least one function was instrumented correctly', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                const failingLambdas = [
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-2-us-east-1',
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2',
+                ];
+                aws_sdk_1.Lambda.mockImplementation(() => (Object.assign(Object.assign({}, fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1',
+                        FunctionName: 'lambda-1-us-east-1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-2-us-east-1': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-2-us-east-1',
+                        FunctionName: 'lambda-2-us-east-1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-3-us-east-1': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-3-us-east-1',
+                        FunctionName: 'lambda-3-us-east-1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2': {
+                        FunctionArn: 'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2',
+                        FunctionName: 'lambda-1-us-east-2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-2-us-east-2': {
+                        FunctionArn: 'arn:aws:lambda:us-east-2:123456789012:function:lambda-2-us-east-2',
+                        FunctionName: 'lambda-2-us-east-2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs16.x',
+                    },
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-3-us-east-2': {
+                        FunctionArn: 'arn:aws:lambda:us-east-2:123456789012:function:lambda-3-us-east-2',
+                        FunctionName: 'lambda-3-us-east-2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs18.x',
+                    },
+                })), { updateFunctionConfiguration: jest.fn().mockImplementation((updateRequest) => {
+                        if (failingLambdas.includes(updateRequest['FunctionName'])) {
+                            return { promise: () => Promise.reject(Error('Unexpected error updating request')) };
+                        }
+                        return { promise: () => Promise.resolve() };
+                    }) })));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1',
+                    '-f',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-2-us-east-1',
+                    '-f',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-3-us-east-1',
+                    '-f',
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2',
+                    '-f',
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-2-us-east-2',
+                    '-f',
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-3-us-east-2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(0);
+                expect(output).toMatchSnapshot();
+            }));
+            test('aborts when every lambda function fails to update on instrument', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                const failingLambdas = [
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1',
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2',
+                ];
+                aws_sdk_1.Lambda.mockImplementation(() => (Object.assign(Object.assign({}, fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1',
+                        FunctionName: 'lambda-1-us-east-1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2': {
+                        FunctionArn: 'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2',
+                        FunctionName: 'lambda-1-us-east-2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                })), { updateFunctionConfiguration: jest.fn().mockImplementation((updateRequest) => {
+                        if (failingLambdas.includes(updateRequest['FunctionName'])) {
+                            return { promise: () => Promise.reject(Error('Unexpected error updating request')) };
+                        }
+                        return { promise: () => Promise.resolve() };
+                    }) })));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-1-us-east-1',
+                    '-f',
+                    'arn:aws:lambda:us-east-2:123456789012:function:lambda-1-us-east-2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchSnapshot();
+            }));
         });
         describe('getSettings', () => {
             test('uses config file settings', () => {