@datadog/datadog-ci 0.17.7 → 0.17.11

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

@@ -35,43 +35,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 jest.mock('fs');
 jest.mock('aws-sdk');
 const aws_sdk_1 = require("aws-sdk");
-const fs = __importStar(require("fs"));
+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 fixtures_1 = require("./fixtures");
 // tslint:disable-next-line
 const { version } = require(path_1.default.join(__dirname, '../../../../package.json'));
 describe('lambda', () => {
-    const createMockContext = () => {
-        let data = '';
-        return {
-            stdout: {
-                toString: () => data,
-                write: (input) => {
-                    data += input;
-                },
-            },
-        };
-    };
-    const createCommand = () => {
-        const command = new instrument_1.InstrumentCommand();
-        command.context = createMockContext();
-        return command;
-    };
-    const makeCli = () => {
-        const cli = new advanced_1.Cli();
-        cli.register(instrument_1.InstrumentCommand);
-        return cli;
-    };
-    const makeMockLambda = (functionConfigs) => ({
-        getFunction: jest.fn().mockImplementation(({ FunctionName }) => ({
-            promise: () => Promise.resolve({ Configuration: functionConfigs[FunctionName] }),
-        })),
-        listTags: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve({ Tags: {} }) })),
-        tagResource: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve({}) })),
-        updateFunctionConfiguration: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve() })),
-    });
     describe('instrument', () => {
         describe('execute', () => {
             const OLD_ENV = process.env;
@@ -85,15 +57,15 @@ describe('lambda', () => {
             test('prints dry run data for lambda library layer', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                aws_sdk_1.Lambda.mockImplementation(() => makeMockLambda({
+                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 = makeCli();
-                const context = createMockContext();
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
                 const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
                 const code = yield cli.run([
                     'lambda',
@@ -117,48 +89,51 @@ describe('lambda', () => {
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-          "[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_ENV\\": \\"staging\\",
-                \\"DD_TAGS\\": \\"layer:api,team:intake\\",
-                \\"DD_FLUSH_TO_LOG\\": \\"true\\",
-                \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
-                \\"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-Node12-x:10\\"
-            ]
-          }
-          TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
-          {
-            \\"dd_sls_ci\\": \\"v${version}\\"
-          }
-          "
-        `);
+"${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_SITE\\": \\"datadoghq.com\\",
+      \\"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}\\"
+}
+"
+`);
             }));
             test('prints dry run data for lambda extension layer', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                aws_sdk_1.Lambda.mockImplementation(() => makeMockLambda({
+                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 = makeCli();
-                const context = createMockContext();
+                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([
@@ -181,40 +156,259 @@ describe('lambda', () => {
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-          "[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_ENV\\": \\"staging\\",
-                \\"DD_TAGS\\": \\"layer:api,team:intake\\",
-                \\"DD_FLUSH_TO_LOG\\": \\"true\\",
-                \\"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}\\"
-          }
-          "
-        `);
+"${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_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}\\"
+}
+"
+`);
+            }));
+            test('instrumenting with source code integrations fails if not run within a git repo', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                const lambda = 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',
+                    },
+                });
+                aws_sdk_1.Lambda.mockImplementation(() => lambda);
+                process.env.DATADOG_API_KEY = '1234';
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '--function',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    '--layerVersion',
+                    '10',
+                    '-s',
+                    '--service',
+                    'dummy',
+                    '--env',
+                    'dummy',
+                    '--version',
+                    '0.1',
+                ], context);
+                const output = context.stdout.toString();
+                expect(output).toMatch(/.*Make sure the command is running within your git repository\..*/i);
+            }));
+            test('instrumenting with source code integrations fails if DATADOG_API_KEY is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                const lambda = 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',
+                    },
+                });
+                aws_sdk_1.Lambda.mockImplementation(() => lambda);
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '--function',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    '--layerVersion',
+                    '10',
+                    '-s',
+                    '--service',
+                    'dummy',
+                    '--env',
+                    'dummy',
+                    '--version',
+                    '0.1',
+                ], context);
+                const output = context.stdout.toString();
+                expect(output).toMatch(/.*Missing DATADOG_API_KEY in your environment.*/i);
+            }));
+            test('ensure the instrument command ran from a dirty git repo fails', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                const lambda = 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',
+                    },
+                });
+                aws_sdk_1.Lambda.mockImplementation(() => lambda);
+                process.env.DATADOG_API_KEY = '1234';
+                const context = fixtures_1.createMockContext();
+                const instrumentCommand = instrument_1.InstrumentCommand;
+                const mockGitStatus = jest.spyOn(instrumentCommand.prototype, 'getCurrentGitStatus');
+                mockGitStatus.mockImplementation(() => ({
+                    ahead: 0,
+                    isClean: false,
+                }));
+                const cli = new advanced_1.Cli();
+                cli.register(instrumentCommand);
+                yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '--function',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    '--layerVersion',
+                    '10',
+                    '-s',
+                    '--service',
+                    'dummy',
+                    '--env',
+                    'dummy',
+                    '--version',
+                    '0.1',
+                ], context);
+                const output = context.stdout.toString();
+                expect(output).toMatch('Error: Local git repository is dirty');
+            }));
+            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({
+                    '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',
+                    },
+                });
+                aws_sdk_1.Lambda.mockImplementation(() => lambda);
+                process.env.DATADOG_API_KEY = '1234';
+                const context = fixtures_1.createMockContext();
+                const instrumentCommand = instrument_1.InstrumentCommand;
+                const mockGitStatus = jest.spyOn(instrumentCommand.prototype, 'getCurrentGitStatus');
+                mockGitStatus.mockImplementation(() => ({
+                    ahead: 0,
+                    hash: '1be168ff837f043bde17c0314341c84271047b31',
+                    isClean: true,
+                }));
+                const mockUploadFunction = jest.spyOn(instrumentCommand.prototype, 'uploadGitData');
+                mockUploadFunction.mockImplementation(() => {
+                    return;
+                });
+                const cli = new advanced_1.Cli();
+                cli.register(instrumentCommand);
+                yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '--function',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    '--layerVersion',
+                    '10',
+                    '-s',
+                    '--service',
+                    'dummy',
+                    '--env',
+                    'dummy',
+                    '--version',
+                    '0.1',
+                ], context);
+                const output = context.stdout.toString();
+                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
+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_ENV\\": \\"dummy\\",
+      \\"DD_TAGS\\": \\"git.commit.sha:1be168ff837f043bde17c0314341c84271047b31\\",
+      \\"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}\\"
+}
+"
+`);
+            }));
+            test('ensure the instrument command ran from a local git repo ahead of the origin fails', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                const lambda = 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',
+                    },
+                });
+                aws_sdk_1.Lambda.mockImplementation(() => lambda);
+                process.env.DATADOG_API_KEY = '1234';
+                const context = fixtures_1.createMockContext();
+                const instrumentCommand = instrument_1.InstrumentCommand;
+                const mockGitStatus = jest.spyOn(instrumentCommand.prototype, 'getCurrentGitStatus');
+                mockGitStatus.mockImplementation(() => ({
+                    ahead: 1,
+                    isClean: true,
+                }));
+                const cli = new advanced_1.Cli();
+                cli.register(instrumentCommand);
+                yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '--function',
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    '--layerVersion',
+                    '10',
+                    '-s',
+                    '--service',
+                    'dummy',
+                    '--env',
+                    'dummy',
+                    '--version',
+                    '0.1',
+                ], context);
+                const output = context.stdout.toString();
+                expect(output).toMatch('Error: Local changes have not been pushed remotely. Aborting git upload.');
             }));
             test('runs function update command for lambda library layer', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                const lambda = makeMockLambda({
+                const lambda = 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',
@@ -222,8 +416,8 @@ describe('lambda', () => {
                     },
                 });
                 aws_sdk_1.Lambda.mockImplementation(() => lambda);
-                const cli = makeCli();
-                const context = createMockContext();
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
                 yield cli.run([
                     'lambda',
                     'instrument',
@@ -237,7 +431,7 @@ describe('lambda', () => {
             test('runs function update command for lambda extension layer', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                const lambda = makeMockLambda({
+                const lambda = 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',
@@ -245,8 +439,8 @@ describe('lambda', () => {
                     },
                 });
                 aws_sdk_1.Lambda.mockImplementation(() => lambda);
-                const cli = makeCli();
-                const context = createMockContext();
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
                 process.env.DATADOG_API_KEY = '1234';
                 yield cli.run([
                     'lambda',
@@ -261,9 +455,9 @@ describe('lambda', () => {
             test('aborts early when no functions are specified', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                aws_sdk_1.Lambda.mockImplementation(() => makeMockLambda({}));
-                const cli = makeCli();
-                const context = createMockContext();
+                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',
@@ -287,7 +481,7 @@ describe('lambda', () => {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({}));
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['config']['layerVersion'] = '60';
                 command['config']['extensionVersion'] = '10';
                 command['config']['region'] = 'ap-southeast-1';
@@ -304,9 +498,9 @@ describe('lambda', () => {
             test("aborts early when function regions can't be found", () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                aws_sdk_1.Lambda.mockImplementation(() => makeMockLambda({}));
-                const cli = makeCli();
-                const context = createMockContext();
+                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',
@@ -323,15 +517,12 @@ describe('lambda', () => {
                 ], context);
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
-                expect(output).toMatchInlineSnapshot(`
-                                                  "'No default region specified for [\\"my-func\\"]. Use -r,--region, or use a full functionARN
-                                                  "
-                                        `);
+                expect(output).toMatch(`Couldn't group functions. Error: No default region specified for ["my-func"]. Use -r, --region, or use a full functionARN\n`);
             }));
             test('aborts if a function is not in an Active state with LastUpdateStatus Successful', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                aws_sdk_1.Lambda.mockImplementation(() => makeMockLambda({
+                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',
@@ -340,8 +531,8 @@ describe('lambda', () => {
                         State: 'Failed',
                     },
                 }));
-                const cli = makeCli();
-                const context = createMockContext();
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
                 const code = yield cli.run([
                     'lambda',
                     'instrument',
@@ -366,9 +557,9 @@ describe('lambda', () => {
             test('aborts early when extensionVersion and forwarder are set', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
-                aws_sdk_1.Lambda.mockImplementation(() => makeMockLambda({}));
-                const cli = makeCli();
-                const context = createMockContext();
+                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',
@@ -398,7 +589,7 @@ describe('lambda', () => {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({}));
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['config']['layerVersion'] = '60';
                 command['config']['extensionVersion'] = '10';
                 command['config']['region'] = 'ap-southeast-1';
@@ -410,7 +601,7 @@ describe('lambda', () => {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({}));
                 process.env = {};
-                let command = createCommand();
+                let command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['config']['environment'] = 'staging';
                 command['config']['service'] = 'middletier';
                 command['config']['version'] = '2';
@@ -420,7 +611,7 @@ describe('lambda', () => {
                 yield command['execute']();
                 let output = command.context.stdout.toString();
                 expect(output).toMatch('Functions in config file and "--functions-regex" should not be used at the same time.\n');
-                command = createCommand();
+                command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['environment'] = 'staging';
                 command['service'] = 'middletier';
                 command['version'] = '2';
@@ -435,7 +626,7 @@ describe('lambda', () => {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({}));
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['environment'] = 'staging';
                 command['service'] = 'middletier';
                 command['version'] = '2';
@@ -449,7 +640,7 @@ describe('lambda', () => {
         describe('getSettings', () => {
             test('uses config file settings', () => {
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['config']['flushMetricsToLogs'] = 'false';
                 command['config']['forwarder'] = 'my-forwarder';
                 command['config']['layerVersion'] = '2';
@@ -459,19 +650,23 @@ describe('lambda', () => {
                 command['config']['tracing'] = 'false';
                 command['config']['logLevel'] = 'debug';
                 expect(command['getSettings']()).toEqual({
+                    environment: undefined,
                     extensionVersion: 6,
+                    extraTags: undefined,
                     flushMetricsToLogs: false,
                     forwarderARN: 'my-forwarder',
                     layerAWSAccount: 'another-account',
                     layerVersion: 2,
                     logLevel: 'debug',
                     mergeXrayTraces: false,
+                    service: undefined,
                     tracingEnabled: false,
+                    version: undefined,
                 });
             });
             test('prefers command line arguments over config file', () => {
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['forwarder'] = 'my-forwarder';
                 command['config']['forwarder'] = 'another-forwarder';
                 command['layerVersion'] = '1';
@@ -498,7 +693,7 @@ describe('lambda', () => {
             });
             test("returns undefined when layer version can't be parsed", () => {
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command.context = {
                     stdout: { write: jest.fn() },
                 };
@@ -507,7 +702,7 @@ describe('lambda', () => {
             });
             test("returns undefined when extension version can't be parsed", () => {
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command.context = {
                     stdout: { write: jest.fn() },
                 };
@@ -516,7 +711,7 @@ describe('lambda', () => {
             });
             test('converts string boolean from command line and config file correctly', () => {
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 const validSettings = {
                     extensionVersion: undefined,
                     flushMetricsToLogs: false,
@@ -555,12 +750,12 @@ describe('lambda', () => {
                     'tracing',
                 ];
                 for (const option of stringBooleans) {
-                    let command = createCommand();
+                    let command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                     command['config'][option] = 'NotBoolean';
                     command['getSettings']();
                     let output = command.context.stdout.toString();
                     expect(output).toMatch(`Invalid boolean specified for ${option}.\n`);
-                    command = createCommand();
+                    command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                     command[option] = 'NotBoolean';
                     command['getSettings']();
                     output = command.context.stdout.toString();
@@ -571,26 +766,26 @@ describe('lambda', () => {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({}));
                 process.env = {};
-                let command = createCommand();
+                let command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['config']['region'] = 'ap-southeast-1';
                 command['config']['functions'] = ['arn:aws:lambda:ap-southeast-1:123456789012:function:lambda-hello-world'];
                 yield command['getSettings']();
                 let output = command.context.stdout.toString();
-                expect(output).toMatch('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');
-                command = createCommand();
+                expect(output).toMatch(`${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.'))}\n`);
+                command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['config']['region'] = 'ap-southeast-1';
                 command['config']['functions'] = ['arn:aws:lambda:ap-southeast-1:123456789012:function:lambda-hello-world'];
                 command['config']['environment'] = 'b';
                 command['config']['service'] = 'middletier';
                 yield command['getSettings']();
                 output = command.context.stdout.toString();
-                expect(output).toMatch('Warning: The version tag has not been configured. Learn more about Datadog unified service tagging: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.\n');
+                expect(output).toMatch(`${chalk_1.bold(chalk_1.yellow('[Warning]'))} The version tag has 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.'))}\n`);
             }));
             test('aborts early if extraTags do not comply with expected key:value list', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({}));
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['config']['region'] = 'ap-southeast-1';
                 command['config']['functions'] = ['arn:aws:lambda:ap-southeast-1:123456789012:function:lambda-hello-world'];
                 command['config']['service'] = 'middletier';
@@ -602,88 +797,25 @@ describe('lambda', () => {
                 expect(output).toMatch('Extra tags do not comply with the <key>:<value> array.\n');
             }));
         });
-        describe('collectFunctionsByRegion', () => {
-            test('groups functions with region read from arn', () => {
-                process.env = {};
-                const command = createCommand();
-                command['functions'] = [
-                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
-                    'arn:aws:lambda:us-east-1:123456789012:function:another',
-                    'arn:aws:lambda:us-east-2:123456789012:function:third-func',
-                ];
-                expect(command['collectFunctionsByRegion']()).toEqual({
-                    'us-east-1': [
-                        'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
-                        'arn:aws:lambda:us-east-1:123456789012:function:another',
-                    ],
-                    'us-east-2': ['arn:aws:lambda:us-east-2:123456789012:function:third-func'],
-                });
-            });
-            test('groups functions in the config object', () => {
-                process.env = {};
-                const command = createCommand();
-                command['config'].functions = [
-                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
-                    'arn:aws:lambda:us-east-1:123456789012:function:another',
-                    'arn:aws:lambda:us-east-2:123456789012:function:third-func',
-                ];
-                expect(command['collectFunctionsByRegion']()).toEqual({
-                    'us-east-1': [
-                        'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
-                        'arn:aws:lambda:us-east-1:123456789012:function:another',
-                    ],
-                    'us-east-2': ['arn:aws:lambda:us-east-2:123456789012:function:third-func'],
-                });
-            });
-            test('uses default region for functions not in arn format', () => {
-                process.env = {};
-                const command = createCommand();
-                command['functions'] = [
-                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
-                    'arn:aws:lambda:*:123456789012:function:func-with-wildcard',
-                    'func-without-region',
-                    'arn:aws:lambda:us-east-2:123456789012:function:third-func',
-                ];
-                command['region'] = 'ap-south-1';
-                expect(command['collectFunctionsByRegion']()).toEqual({
-                    'ap-south-1': ['arn:aws:lambda:*:123456789012:function:func-with-wildcard', 'func-without-region'],
-                    'us-east-1': ['arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world'],
-                    'us-east-2': ['arn:aws:lambda:us-east-2:123456789012:function:third-func'],
-                });
-            });
-            test('fails to collect when there are regionless functions and no default region is set', () => {
-                process.env = {};
-                const command = createCommand();
-                command['functions'] = [
-                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
-                    'arn:aws:lambda:*:123456789012:function:func-with-wildcard',
-                    'func-without-region',
-                    'arn:aws:lambda:us-east-2:123456789012:function:third-func',
-                ];
-                command['region'] = undefined;
-                command['config']['region'] = undefined;
-                expect(command['collectFunctionsByRegion']()).toBeUndefined();
-            });
-        });
         describe('printPlannedActions', () => {
             test('prints no output when list is empty', () => {
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['printPlannedActions']([]);
                 const output = command.context.stdout.toString();
                 expect(output).toMatchInlineSnapshot(`
-                                        "No updates will be applied
+                                        "
+                                        No updates will be applied
                                         "
                                 `);
             });
             test('prints log group actions', () => {
                 process.env = {};
-                const command = createCommand();
+                const command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                 command['printPlannedActions']([
                     {
                         functionARN: 'my-func',
                         lambdaConfig: {},
-                        lambdaLibraryLayerArn: 'my-layer',
                         logGroupConfiguration: {
                             createLogGroupRequest: { logGroupName: 'my-log-group' },
                             deleteSubscriptionFilterRequest: { filterName: 'my-filter' },
@@ -694,39 +826,24 @@ describe('lambda', () => {
                 ]);
                 const output = command.context.stdout.toString();
                 expect(output).toMatchInlineSnapshot(`
-                    "Will apply the following updates:
-                    CreateLogGroup -> my-log-group
-                    {
-                      \\"logGroupName\\": \\"my-log-group\\"
-                    }
-                    DeleteSubscriptionFilter -> my-log-group
-                    {
-                      \\"filterName\\": \\"my-filter\\"
-                    }
-                    PutSubscriptionFilter -> my-log-group
-                    {
-                      \\"filterName\\": \\"my-filter\\"
-                    }
-                    "
-                `);
-            });
-        });
-        describe('sentenceMatchesRegEx', () => {
-            const tags = [
-                ['not-complying:regex-should-fail', false],
-                ['1first-char-is-number:should-fail', false],
-                ['_also-not-complying:should-fail', false],
-                ['complying_tag:accepted/with/slashes.and.dots,but-empty-tag', false],
-                ['also_complying:success,1but_is_illegal:should-fail', false],
-                ['this:complies,also_this_one:yes,numb3r_in_name:should-succeed,dots:al.lo.wed', true],
-                ['complying_ip_address_4:192.342.3134.231', true],
-                ['complying:alone', true],
-                ['one_divided_by_two:1/2,one_divided_by_four:0.25,three_minus_one_half:3-1/2', true],
-                ['this_is_a_valid_t4g:yes/it.is-42', true],
-            ];
-            test.each(tags)('check if the tags match the expected result from the regex', (tag, expectedResult) => {
-                const result = !!instrument_1.sentenceMatchesRegEx(tag, constants_1.EXTRA_TAGS_REG_EXP);
-                expect(result).toEqual(expectedResult);
+"${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('my-func')}\n
+Will apply the following updates:
+CreateLogGroup -> my-log-group
+{
+  \\"logGroupName\\": \\"my-log-group\\"
+}
+DeleteSubscriptionFilter -> my-log-group
+{
+  \\"filterName\\": \\"my-filter\\"
+}
+PutSubscriptionFilter -> my-log-group
+{
+  \\"filterName\\": \\"my-filter\\"
+}
+"
+`);
             });
         });
     });