@datadog/datadog-ci 2.1.0 → 2.3.0

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

@@ -34,6 +34,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 jest.mock('fs');
 jest.mock('aws-sdk');
 jest.mock('../prompt');
+jest.mock('../renderer', () => require('../__mocks__/renderer'));
 const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const aws_sdk_1 = require("aws-sdk");
@@ -89,7 +90,8 @@ describe('lambda', () => {
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[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[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:
@@ -165,7 +167,8 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[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[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:
@@ -234,7 +237,8 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[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[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:
@@ -300,7 +304,8 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[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[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:
@@ -368,7 +373,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 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* () {
+            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({
@@ -379,8 +384,16 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     },
                 });
                 aws_sdk_1.Lambda.mockImplementation(() => lambda);
-                const cli = fixtures_1.makeCli();
+                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',
@@ -397,9 +410,9 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     '0.1',
                 ], context);
                 const output = context.stdout.toString();
-                expect(output).toMatch(/.*Missing DATADOG_API_KEY in your environment.*/i);
+                expect(output).toMatch('Error: Local git repository is dirty');
             }));
-            test('ensure the instrument command ran from a dirty git repo fails', () => __awaiter(void 0, void 0, void 0, function* () {
+            test('ensure source code integration git remotes get formatted correctly', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
                 const lambda = fixtures_1.makeMockLambda({
@@ -413,14 +426,17 @@ 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,
-                    isClean: false,
+                    hash: '1be168ff837f043bde17c0314341c84271047b31',
+                    remote: 'https://github.com/datadog/test.git',
+                    isClean: true,
                 }));
                 const cli = new advanced_1.Cli();
                 cli.register(instrumentCommand);
-                yield cli.run([
+                const cliInput = [
                     'lambda',
                     'instrument',
                     '--function',
@@ -434,9 +450,26 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     'dummy',
                     '--version',
                     '0.1',
-                ], context);
-                const output = context.stdout.toString();
-                expect(output).toMatch('Error: Local git repository is dirty');
+                ];
+                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');
             }));
             test('ensure source code integration flag works from a clean repo', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -456,12 +489,9 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 mockGitStatus.mockImplementation(() => ({
                     ahead: 0,
                     hash: '1be168ff837f043bde17c0314341c84271047b31',
+                    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([
@@ -481,7 +511,8 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 ], context);
                 const output = context.stdout.toString();
                 expect(output).toMatchInlineSnapshot(`
-"[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🐶 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:
@@ -496,7 +527,7 @@ UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:123456789012:function:la
       \\"DD_SITE\\": \\"datadoghq.com\\",
       \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
       \\"DD_ENV\\": \\"dummy\\",
-      \\"DD_TAGS\\": \\"git.commit.sha:1be168ff837f043bde17c0314341c84271047b31\\",
+      \\"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\\",
@@ -552,7 +583,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     '0.1',
                 ], context);
                 const output = context.stdout.toString();
-                expect(output).toMatch('Error: Local changes have not been pushed remotely. Aborting git upload.');
+                expect(output).toMatch('Error: Local changes have not been pushed remotely. Aborting git data tagging.');
             }));
             test('runs function update command for lambda library layer', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -622,9 +653,10 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-                                                            "[Error] No functions specified for instrumentation.
-                                                            "
-                                                `);
+"\n🐶 Instrumenting Lambda function
+[Error] No functions specified to instrument.
+"
+`);
             }));
             test('aborts early when no functions are specified while using config file', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -640,9 +672,10 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 yield command['execute']();
                 const output = command.context.stdout.toString();
                 expect(output).toMatchInlineSnapshot(`
-                                                            "[Error] No functions specified for instrumentation.
-                                                            "
-                                                `);
+"\n🐶 Instrumenting Lambda function
+[Error] No functions specified to instrument.
+"
+`);
             }));
             test("aborts early when function regions can't be found", () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -699,9 +732,10 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-                                                  "[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\\")
-                                                  "
-                                        `);
+"\n🐶 Instrumenting Lambda function
+[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\\")
+"
+`);
             }));
             test('aborts early when extensionVersion and forwarder are set', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -730,9 +764,10 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-          "[Error] \\"extensionVersion\\" and \\"forwarder\\" should not be used at the same time.
-          "
-        `);
+"\n🐶 Instrumenting Lambda function
+[Error] \\"extensionVersion\\" and \\"forwarder\\" should not be used at the same time.
+"
+`);
             }));
             test('check if functions are not empty while using config file', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -799,8 +834,9 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 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 node18LibraryLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node18-x`;
                 const node16LibraryLayer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node16-x`;
+                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' }));
@@ -823,6 +859,12 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                         Handler: 'index.handler',
                         Runtime: 'nodejs16.x',
                     },
+                    'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-4': {
+                        FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world-3',
+                        FunctionName: 'lambda-hello-world-4',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs18.x',
+                    },
                 }, {
                     [`${node14LibraryLayer}:1`]: {
                         LayerVersionArn: `${node14LibraryLayer}:1`,
@@ -836,6 +878,10 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                         LayerVersionArn: `${node16LibraryLayer}:1`,
                         Version: 1,
                     },
+                    [`${node18LibraryLayer}:1`]: {
+                        LayerVersionArn: `${node18LibraryLayer}:1`,
+                        Version: 1,
+                    },
                     [`${extensionLayer}:1`]: {
                         LayerVersionArn: `${extensionLayer}:1`,
                         Version: 1,
@@ -861,13 +907,13 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[!] 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.
-[!] Configure AWS region.
-[!] Configure Datadog settings.
-Fetching Lambda functions, this might take a while.
-[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.
-[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:
+"\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
@@ -994,12 +1040,13 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[!] 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.
-[!] Configure AWS region.
-[!] Configure Datadog settings.
-[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.
-[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:
+"\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
@@ -1068,7 +1115,8 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"[!] 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🐶 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.
 [Error] Unexpected error
 "
 `);
@@ -1087,8 +1135,9 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"[!] Configure AWS region.
-[!] Configure Datadog settings.
+"\n🐶 Instrumenting Lambda function
+\n[!] Configure AWS region.
+\n[!] Configure Datadog settings.
 [Error] Unexpected error
 "
 `);
@@ -1138,13 +1187,12 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[!] 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.
-[!] Configure AWS region.
-[!] Configure Datadog settings.
-Fetching Lambda functions, this might take a while.
-[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.
-
-[!] Functions to be updated:
+"\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\`.
 
@@ -1226,14 +1274,13 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"[!] 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.
-[!] Configure AWS region.
-[!] Configure Datadog settings.
-Fetching Lambda functions, this might take a while.
-[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.
-[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.
-
-[!] Functions to be updated:
+"\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\`.
 
@@ -1283,8 +1330,8 @@ TagResource -> arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"[!] Configure AWS region.
-Fetching Lambda functions, this might take a while.
+"\n🐶 Instrumenting Lambda function
+\n[!] Configure AWS region.
 [Error] Couldn't find any Lambda functions in the specified region.
 "
 `);
@@ -1307,8 +1354,8 @@ Fetching Lambda functions, this might take a while.
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"[!] Configure AWS region.
-Fetching Lambda functions, this might take a while.
+"\n🐶 Instrumenting Lambda function
+\n[!] Configure AWS region.
 [Error] Couldn't fetch Lambda functions. Error: Max retry count exceeded. ListFunctionsError
 "
 `);
@@ -1346,7 +1393,8 @@ Fetching Lambda functions, this might take a while.
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"[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.
+"\n[Dry Run] 🐶 Instrumenting Lambda function
+[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.
 "
 `);
             }));
@@ -1383,7 +1431,8 @@ Fetching Lambda functions, this might take a while.
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"[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.
+"\n[Dry Run] 🐶 Instrumenting Lambda function
+[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.
 "
 `);
             }));
@@ -1421,7 +1470,48 @@ Fetching Lambda functions, this might take a while.
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"[Error] Couldn't fetch Lambda functions. Error: Instrumenting arm64 architecture is not supported for the given dd-extension version. Please choose the latest dd-extension version or use x86_64 architecture.
+"\n[Dry Run] 🐶 Instrumenting Lambda function
+[Error] Couldn't fetch Lambda functions. Error: Instrumenting arm64 architecture is not supported for the given dd-extension version. Please choose the latest dd-extension version or use x86_64 architecture.
+"
+`);
+            }));
+            test('instruments correctly with profile when provided', () => __awaiter(void 0, void 0, void 0, function* () {
+                var _a;
+                const credentials = {
+                    accessKeyId: fixtures_1.mockAwsAccessKeyId,
+                    getPromise: () => Promise.resolve(),
+                    needsRefresh: () => false,
+                    secretAccessKey: fixtures_1.mockAwsSecretAccessKey,
+                };
+                aws_sdk_1.SharedIniFileCredentials.mockImplementation(() => credentials);
+                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: 'nodejs14.x',
+                    },
+                }));
+                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', 'instrument', '-f', functionARN, '--profile', 'SOME-AWS-PROFILE'], context);
+                expect(code).toBe(0);
+                expect((_a = aws_sdk_1.config.credentials) === null || _a === void 0 ? void 0 : _a.accessKeyId).toBe(fixtures_1.mockAwsAccessKeyId);
+            }));
+            test('prints error when updating aws profile credentials fails', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                aws_sdk_1.SharedIniFileCredentials.mockImplementation(() => {
+                    throw Error('Update failed!');
+                });
+                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', 'instrument', '-f', functionARN, '--profile', 'SOME-AWS-PROFILE'], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"\n🐶 Instrumenting Lambda function
+[Error] Error: Couldn't set AWS profile credentials. Update failed!
 "
 `);
             }));
@@ -1554,7 +1644,7 @@ Fetching Lambda functions, this might take a while.
                     command['config'][option] = 'NotBoolean';
                     command['getSettings']();
                     let output = command.context.stdout.toString();
-                    expect(output).toMatch(`Invalid boolean specified for ${option}.\n`);
+                    expect(output).toMatch(`[Error] Invalid boolean specified for ${option}.\n`);
                     command = fixtures_1.createCommand(instrument_1.InstrumentCommand);
                     command[option] = 'NotBoolean';
                     command['getSettings']();
@@ -1594,7 +1684,7 @@ Fetching Lambda functions, this might take a while.
                 command['config']['extraTags'] = 'not-complying:illegal-chars-in-key,complies:valid-pair';
                 command['getSettings']();
                 const output = command.context.stdout.toString();
-                expect(output).toMatch('Extra tags do not comply with the <key>:<value> array.\n');
+                expect(output).toMatch('[Error] Extra tags do not comply with the <key>:<value> array.\n');
             }));
         });
         describe('printPlannedActions', () => {
@@ -1605,7 +1695,7 @@ Fetching Lambda functions, this might take a while.
                 const output = command.context.stdout.toString();
                 expect(output).toMatchInlineSnapshot(`
                                         "
-                                        No updates will be applied
+                                        No updates will be applied.
                                         "
                                 `);
             });
@@ -1626,7 +1716,7 @@ Fetching Lambda functions, this might take a while.
                 ]);
                 const output = command.context.stdout.toString();
                 expect(output).toMatchInlineSnapshot(`
-"[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[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- my-func\n
 Will apply the following updates: