@datadog/datadog-ci 0.18.0 → 1.1.0

package/LICENSE-3rdparty.csv

@@ -30,6 +30,7 @@ inquirer,import,MIT,Copyright (c) 2012 Simon Boudrias
 jest,dev,MIT,Copyright (c) Facebook, Inc. and its affiliates.
 jest-environment-node,dev,MIT,Copyright (c) Facebook, Inc. and its affiliates.
 jest-matcher-specific-error,dev,MIT,Copyright (c) 2020 Daniel Hreben
+pkg,dev,MIT,Copyright (c) 2021 Vercel, Inc.
 prettier,dev,MIT,Copyright © James Long and contributors
 proxy,dev,MIT,Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>
 proxy-agent,import,MIT,Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>

package/README.md

@@ -29,13 +29,40 @@ npm install -g @datadog/datadog-ci
 yarn global add @datadog/datadog-ci
 ```
 
+### Standalone binary (**beta**)
+
+If installing nodejs in the CI is an issue, standalone binaries are provided with [releases](https://github.com/DataDog/datadog-ci/releases). Only _linux-x64_, _darwin-x64_ (macOS) and _win-x64_ (Windows) are supported at the time. **These standalone binaries are in _beta_ and their stability is not guaranteed**. To install:
+
+#### Linux
+
+```sh
+curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
+```
+
+#### MacOS
+
+```sh
+curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_darwin-x64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
+```
+
+#### Windows
+
+```sh
+Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64.exe" -OutFile "datadog-ci.exe"
+```
+
+Then you can run `datadog-ci` commands normally:
+
+```sh
+datadog-ci version
+```
+
 ## Usage
 
 ```bash
 Usage: datadog-ci <command> <subcommand> [options]
 
 Available commands:
-  - dependencies
   - lambda
   - sourcemaps
   - synthetics
@@ -49,7 +76,6 @@ Each command allows interacting with a product of the Datadog platform. The comm
 
 Further documentation for each command can be found in its folder, ie:
 
-- [Dependencies](src/commands/dependencies)
 - [Lambda](src/commands/lambda)
 - [Sourcemaps](src/commands/sourcemaps/)
 - [Synthetics CI/CD Testing](src/commands/synthetics/)

package/dist/commands/git-metadata/__tests__/git.test.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,6 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const simpleGit = __importStar(require("simple-git"));
 const git_1 = require("../git");
 const createMockSimpleGit = (conf) => ({
     getRemotes: (_) => __awaiter(void 0, void 0, void 0, function* () {
@@ -84,7 +104,7 @@ describe('git', () => {
                 remotes: [{ name: 'first', refs: { push: 'https://git-repo' } }],
                 trackedFiles: ['myfile.js'],
             });
-            const commitInfo = yield git_1.getCommitInfo(mock, process.stdout);
+            const commitInfo = yield git_1.getCommitInfo(mock);
             expect(commitInfo).toBeDefined();
             expect(commitInfo.hash).toBe('abcd');
             expect(commitInfo.trackedFiles).toStrictEqual(['myfile.js']);
@@ -95,11 +115,33 @@ describe('git', () => {
                 hash: 'abcd',
                 trackedFiles: ['myfile.js'],
             });
-            const commitInfo = yield git_1.getCommitInfo(mock, process.stdout, 'https://overridden');
+            const commitInfo = yield git_1.getCommitInfo(mock, 'https://overridden');
             expect(commitInfo).toBeDefined();
             expect(commitInfo.hash).toBe('abcd');
             expect(commitInfo.trackedFiles).toStrictEqual(['myfile.js']);
             expect(commitInfo.remote).toBe('https://overridden');
         }));
     });
+    describe('newSimpleGit', () => {
+        test('should throw an error if git is not installed', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(simpleGit, 'gitP').mockImplementation(() => {
+                throw Error('gitp error');
+            });
+            yield expect(git_1.newSimpleGit()).rejects.toThrow('gitp error');
+        }));
+        test('should throw an error if revparse throws an error', () => __awaiter(void 0, void 0, void 0, function* () {
+            const mock = createMockSimpleGit({});
+            jest.spyOn(simpleGit, 'gitP').mockReturnValue(mock);
+            jest.spyOn(mock, 'revparse').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () {
+                throw Error('revparse error');
+            }));
+            yield expect(git_1.newSimpleGit()).rejects.toThrow('revparse error');
+        }));
+        test('should not throw any errors', () => __awaiter(void 0, void 0, void 0, function* () {
+            const mock = createMockSimpleGit({});
+            jest.spyOn(simpleGit, 'gitP').mockReturnValue(mock);
+            jest.spyOn(mock, 'revparse').mockResolvedValue('1234');
+            yield expect(git_1.newSimpleGit()).resolves.not.toThrow();
+        }));
+    });
 });

package/dist/commands/git-metadata/__tests__/library.test.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const apikey = __importStar(require("../../../helpers/apikey"));
+const upload = __importStar(require("../../../helpers/upload"));
+const git = __importStar(require("../git"));
+const interfaces_1 = require("../interfaces");
+const library_1 = require("../library");
+describe('library', () => {
+    describe('isGitRepo', () => {
+        test('should return false if checkIsRepo fails', () => __awaiter(void 0, void 0, void 0, function* () {
+            const simpleGitClient = {
+                checkIsRepo: () => {
+                    throw Error();
+                },
+            };
+            jest.spyOn(git, 'newSimpleGit').mockResolvedValue(simpleGitClient);
+            yield expect(library_1.isGitRepo()).resolves.toEqual(false);
+        }));
+        test('should return false git is not installed', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(git, 'newSimpleGit').mockImplementation(() => {
+                throw new Error('git is not installed');
+            });
+            yield expect(library_1.isGitRepo()).resolves.toEqual(false);
+        }));
+        test('should return true if datadog API key is set, git is installed, and we are in a repo', () => __awaiter(void 0, void 0, void 0, function* () {
+            const simpleGitClient = { checkIsRepo: () => true };
+            jest.spyOn(git, 'newSimpleGit').mockResolvedValue(simpleGitClient);
+            yield expect(library_1.isGitRepo()).resolves.toEqual(true);
+        }));
+    });
+    describe('addSourceCodeIntegration', () => {
+        test('source code integration fails if simpleGitOrFail throws an exception', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(git, 'newSimpleGit').mockImplementation(() => {
+                throw new Error('git is not installed');
+            });
+            jest.spyOn(apikey, 'newApiKeyValidator').mockReturnValue({});
+            yield expect(library_1.uploadGitCommitHash('dummy', 'fake.site')).rejects.toThrowError('git is not installed');
+        }));
+        test('source code integration returns the correct hash', () => __awaiter(void 0, void 0, void 0, function* () {
+            const simpleGitClient = { checkIsRepo: () => true };
+            jest.spyOn(git, 'newSimpleGit').mockResolvedValue(simpleGitClient);
+            jest.spyOn(git, 'getCommitInfo').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return new interfaces_1.CommitInfo('hash', 'url', ['file1', 'file2']); }));
+            jest.spyOn(upload, 'upload').mockReturnValue((a, b) => {
+                {
+                    return new Promise((resolve) => {
+                        resolve(upload.UploadStatus.Success);
+                    });
+                }
+            });
+            jest.spyOn(apikey, 'newApiKeyValidator').mockReturnValue({});
+            expect(yield library_1.uploadGitCommitHash('dummy', 'fake.site')).toBe('hash');
+        }));
+    });
+});

package/dist/commands/git-metadata/git.d.ts

@@ -1,8 +1,7 @@
 import * as simpleGit from 'simple-git';
-import { Writable } from 'stream';
 import { CommitInfo } from './interfaces';
 export declare const newSimpleGit: () => Promise<simpleGit.SimpleGit>;
 export declare const gitRemote: (git: simpleGit.SimpleGit) => Promise<string>;
 export declare const stripCredentials: (remote: string) => string;
 export declare const gitTrackedFiles: (git: simpleGit.SimpleGit) => Promise<string[]>;
-export declare const getCommitInfo: (git: simpleGit.SimpleGit, stdout: Writable, repositoryURL?: string | undefined) => Promise<CommitInfo | undefined>;
+export declare const getCommitInfo: (git: simpleGit.SimpleGit, repositoryURL?: string | undefined) => Promise<CommitInfo>;

package/dist/commands/git-metadata/git.js

@@ -31,7 +31,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommitInfo = exports.gitTrackedFiles = exports.stripCredentials = exports.gitRemote = exports.newSimpleGit = void 0;
 const simpleGit = __importStar(require("simple-git"));
 const url_1 = require("url");
-const renderer_1 = require("./renderer");
 const interfaces_1 = require("./interfaces");
 // Returns a configured SimpleGit.
 const newSimpleGit = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -40,16 +39,11 @@ const newSimpleGit = () => __awaiter(void 0, void 0, void 0, function* () {
         binary: 'git',
         maxConcurrentProcesses: 1,
     };
-    try {
-        // Attempt to set the baseDir to the root of the repository so the 'git ls-files' command
-        // returns the tracked files paths relative to the root of the repository.
-        const git = simpleGit.gitP(options);
-        const root = yield git.revparse('--show-toplevel');
-        options.baseDir = root;
-    }
-    catch (_a) {
-        // Ignore exception as it will fail if we are not inside a git repository.
-    }
+    // Attempt to set the baseDir to the root of the repository so the 'git ls-files' command
+    // returns the tracked files paths relative to the root of the repository.
+    const git = simpleGit.gitP(options);
+    const root = yield git.revparse('--show-toplevel');
+    options.baseDir = root;
     return simpleGit.gitP(options);
 });
 exports.newSimpleGit = newSimpleGit;
@@ -91,27 +85,21 @@ const gitTrackedFiles = (git) => __awaiter(void 0, void 0, void 0, function* ()
 });
 exports.gitTrackedFiles = gitTrackedFiles;
 // Returns the current hash, remote URL and tracked files paths.
-const getCommitInfo = (git, stdout, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
+const getCommitInfo = (git, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
     // Invoke git commands to retrieve the remote, hash and tracked files.
     // We're using Promise.all instead of Promive.allSettled since we want to fail early if
     // any of the promises fails.
     let remote;
     let hash;
     let trackedFiles;
-    try {
-        if (repositoryURL) {
-            ;
-            [hash, trackedFiles] = yield Promise.all([gitHash(git), exports.gitTrackedFiles(git)]);
-            remote = repositoryURL;
-        }
-        else {
-            ;
-            [remote, hash, trackedFiles] = yield Promise.all([exports.gitRemote(git), gitHash(git), exports.gitTrackedFiles(git)]);
-        }
+    if (repositoryURL) {
+        ;
+        [hash, trackedFiles] = yield Promise.all([gitHash(git), exports.gitTrackedFiles(git)]);
+        remote = repositoryURL;
     }
-    catch (e) {
-        stdout.write(renderer_1.renderGitError(e));
-        return;
+    else {
+        ;
+        [remote, hash, trackedFiles] = yield Promise.all([exports.gitRemote(git), gitHash(git), exports.gitTrackedFiles(git)]);
     }
     return new interfaces_1.CommitInfo(hash, remote, trackedFiles);
 });

package/dist/commands/git-metadata/index.d.ts

@@ -0,0 +1 @@
+export * from './library';

package/dist/commands/git-metadata/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./library"), exports);

package/dist/commands/git-metadata/library.d.ts

@@ -0,0 +1,6 @@
+import { RequestBuilder } from '../../helpers/interfaces';
+import { UploadOptions, UploadStatus } from '../../helpers/upload';
+import { CommitInfo } from './interfaces';
+export declare const isGitRepo: () => Promise<boolean>;
+export declare const uploadGitCommitHash: (apiKey: string, datadogSite: string) => Promise<string>;
+export declare const uploadRepository: (requestBuilder: RequestBuilder, libraryVersion: string) => (commitInfo: CommitInfo, opts: UploadOptions) => Promise<UploadStatus>;

package/dist/commands/git-metadata/library.js

@@ -0,0 +1,68 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadRepository = exports.uploadGitCommitHash = exports.isGitRepo = void 0;
+const apikey_1 = require("../../helpers/apikey");
+const upload_1 = require("../../helpers/upload");
+const utils_1 = require("../../helpers/utils");
+const git_1 = require("./git");
+const isGitRepo = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const simpleGit = yield git_1.newSimpleGit();
+        const isRepo = simpleGit.checkIsRepo();
+        return isRepo;
+    }
+    catch (_a) {
+        return false;
+    }
+});
+exports.isGitRepo = isGitRepo;
+const uploadGitCommitHash = (apiKey, datadogSite) => __awaiter(void 0, void 0, void 0, function* () {
+    const apiKeyValidator = apikey_1.newApiKeyValidator({
+        apiKey,
+        datadogSite,
+    });
+    const simpleGit = yield git_1.newSimpleGit();
+    const payload = yield git_1.getCommitInfo(simpleGit);
+    const version = require('../../../package.json').version;
+    const requestBuilder = utils_1.getRequestBuilder({
+        apiKey,
+        baseUrl: 'https://sourcemap-intake.' + datadogSite,
+        headers: new Map([
+            ['DD-EVP-ORIGIN', 'datadog-ci sci'],
+            ['DD-EVP-ORIGIN-VERSION', version],
+        ]),
+        overrideUrl: 'api/v2/srcmap',
+    });
+    const status = yield exports.uploadRepository(requestBuilder, version)(payload, {
+        apiKeyValidator,
+        onError: (e) => {
+            throw e;
+        },
+        onRetry: () => {
+            // Do nothing
+        },
+        onUpload: () => {
+            return;
+        },
+        retries: 5,
+    });
+    if (status !== upload_1.UploadStatus.Success) {
+        throw new Error('Error uploading commit information.');
+    }
+    return payload.hash;
+});
+exports.uploadGitCommitHash = uploadGitCommitHash;
+const uploadRepository = (requestBuilder, libraryVersion) => (commitInfo, opts) => __awaiter(void 0, void 0, void 0, function* () {
+    const payload = commitInfo.asMultipartPayload(libraryVersion);
+    return upload_1.upload(requestBuilder)(payload, opts);
+});
+exports.uploadRepository = uploadRepository;

package/dist/commands/git-metadata/upload.d.ts

@@ -6,7 +6,6 @@ export declare class UploadCommand extends Command {
     private config;
     private dryRun;
     constructor();
-    execute(): Promise<1 | 0>;
+    execute(): Promise<1 | 0 | undefined>;
     private getRequestBuilder;
-    private uploadRepository;
 }

package/dist/commands/git-metadata/upload.js

@@ -23,6 +23,7 @@ const upload_1 = require("../../helpers/upload");
 const utils_1 = require("../../helpers/utils");
 const api_1 = require("./api");
 const git_1 = require("./git");
+const library_1 = require("./library");
 const renderer_1 = require("./renderer");
 class UploadCommand extends clipanion_1.Command {
     constructor() {
@@ -49,28 +50,40 @@ class UploadCommand extends clipanion_1.Command {
                 datadogSite: api_1.datadogSite,
                 metricsLogger: metricsLogger.logger,
             });
-            const payload = yield git_1.getCommitInfo(yield git_1.newSimpleGit(), this.context.stdout, this.repositoryURL);
-            if (payload === undefined) {
-                return 1;
+            let payload;
+            try {
+                payload = yield git_1.getCommitInfo(yield git_1.newSimpleGit(), this.repositoryURL);
+            }
+            catch (e) {
+                if (e instanceof Error) {
+                    this.context.stdout.write(renderer_1.renderFailedUpload(e.message));
+                }
+                return;
             }
             this.context.stdout.write(renderer_1.renderCommandInfo(payload));
+            let status;
             try {
                 const requestBuilder = this.getRequestBuilder();
-                const status = yield this.uploadRepository(requestBuilder)(payload, {
-                    apiKeyValidator,
-                    onError: (e) => {
-                        this.context.stdout.write(renderer_1.renderFailedUpload(e.message));
-                        metricsLogger.logger.increment('failed', 1);
-                    },
-                    onRetry: (e, attempt) => {
-                        this.context.stdout.write(renderer_1.renderRetriedUpload(e.message, attempt));
-                        metricsLogger.logger.increment('retries', 1);
-                    },
-                    onUpload: () => {
-                        return;
-                    },
-                    retries: 5,
-                });
+                if (this.dryRun) {
+                    status = upload_1.UploadStatus.Success;
+                }
+                else {
+                    status = yield library_1.uploadRepository(requestBuilder, this.cliVersion)(payload, {
+                        apiKeyValidator,
+                        onError: (e) => {
+                            this.context.stdout.write(renderer_1.renderFailedUpload(e.message));
+                            metricsLogger.logger.increment('failed', 1);
+                        },
+                        onRetry: (e, attempt) => {
+                            this.context.stdout.write(renderer_1.renderRetriedUpload(e.message, attempt));
+                            metricsLogger.logger.increment('retries', 1);
+                        },
+                        onUpload: () => {
+                            return;
+                        },
+                        retries: 5,
+                    });
+                }
                 metricsLogger.logger.increment('success', 1);
                 const totalTime = (Date.now() - initialTime) / 1000;
                 if (status !== upload_1.UploadStatus.Success) {
@@ -113,15 +126,6 @@ class UploadCommand extends clipanion_1.Command {
             overrideUrl: 'api/v2/srcmap',
         });
     }
-    uploadRepository(requestBuilder) {
-        return (commitInfo, opts) => __awaiter(this, void 0, void 0, function* () {
-            const payload = commitInfo.asMultipartPayload(this.cliVersion);
-            if (this.dryRun) {
-                return upload_1.UploadStatus.Success;
-            }
-            return upload_1.upload(requestBuilder)(payload, opts);
-        });
-    }
 }
 exports.UploadCommand = UploadCommand;
 UploadCommand.usage = clipanion_1.Command.Usage({

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

@@ -741,7 +741,7 @@ describe('instrument', () => {
         test('fails when retry count is exceeded', () => __awaiter(void 0, void 0, void 0, function* () {
             const makeMockLambdaListFunctionsError = () => ({
                 listFunctions: jest.fn().mockImplementation((args) => ({
-                    promise: () => Promise.reject(),
+                    promise: () => Promise.reject('ListFunctionsError'),
                 })),
             });
             const lambda = makeMockLambdaListFunctionsError();
@@ -753,7 +753,7 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            yield expect(instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
+            yield expect(instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded. ListFunctionsError'));
         }));
     });
 });

package/dist/commands/lambda/__tests__/functions/uninstrument.test.js

@@ -394,12 +394,12 @@ describe('uninstrument', () => {
         test('fails when retry count is exceeded', () => __awaiter(void 0, void 0, void 0, function* () {
             const makeMockLambdaListFunctionsError = () => ({
                 listFunctions: jest.fn().mockImplementation((args) => ({
-                    promise: () => Promise.reject(),
+                    promise: () => Promise.reject('ListFunctionsError'),
                 })),
             });
             const lambda = makeMockLambdaListFunctionsError();
             const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            yield expect(uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'fake-pattern', undefined)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
+            yield expect(uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'fake-pattern', undefined)).rejects.toStrictEqual(new Error('Max retry count exceeded. ListFunctionsError'));
         }));
     });
 });

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

@@ -369,7 +369,7 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                     '0.1',
                 ], context);
                 const output = context.stdout.toString();
-                expect(output).toMatch(/.*Make sure the command is running within your git repository\..*/i);
+                expect(output.replace('\n', '')).toMatch(/.*Error: Couldn't get local git status.*/);
             }));
             test('instrumenting with source code integrations fails if DATADOG_API_KEY is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
                 ;
@@ -853,7 +853,8 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
+${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
 ${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
 Fetching Lambda functions, this might take a while.
 ${chalk_1.bold(chalk_1.yellow('[Warning]'))} The environment, service and version tags have not been configured. Learn more about Datadog unified service tagging: ${chalk_1.underline(chalk_1.blueBright('https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.'))}
@@ -974,7 +975,8 @@ ${chalk_1.yellow('[!]')} Instrumenting functions.
                 const output = context.stdout.toString();
                 expect(code).toBe(0);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
+${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
 ${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
 ${chalk_1.bold(chalk_1.yellow('[Warning]'))} The environment, service and version tags have not been configured. Learn more about Datadog unified service tagging: ${chalk_1.underline(chalk_1.blueBright('https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.'))}
 ${chalk_1.bold(chalk_1.yellow('[Warning]'))} Instrument your ${chalk_1.hex('#FF9900').bold('Lambda')} functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`${chalk_1.bold('uninstrument')}\` with the same arguments to revert the changes.\n
@@ -1047,7 +1049,7 @@ ${chalk_1.yellow('[!]')} Instrumenting functions.
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!
+"${chalk_1.bold(chalk_1.yellow('[!]'))} No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.
 ${chalk_1.red('[Error]')} Unexpected error
 "
 `);
@@ -1066,7 +1068,8 @@ ${chalk_1.red('[Error]')} Unexpected error
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
+"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
+${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.
 ${chalk_1.red('[Error]')} Unexpected error
 "
 `);
@@ -1087,7 +1090,8 @@ ${chalk_1.red('[Error]')} Unexpected error
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"Fetching Lambda functions, this might take a while.
+"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
+Fetching Lambda functions, this might take a while.
 ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified region.
 "
 `);
@@ -1102,7 +1106,7 @@ ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified re
                 };
                 fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
                 aws_sdk_1.Lambda.mockImplementation(() => ({
-                    listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('Lambda failed') })),
+                    listFunctions: jest.fn().mockImplementation(() => ({ promise: () => Promise.reject('ListFunctionsError') })),
                 }));
                 const cli = fixtures_1.makeCli();
                 const context = fixtures_1.createMockContext();
@@ -1110,8 +1114,9 @@ ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified re
                 const output = context.stdout.toString();
                 expect(code).toBe(1);
                 expect(output).toMatchInlineSnapshot(`
-"Fetching Lambda functions, this might take a while.
-${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded.
+"${chalk_1.bold(chalk_1.yellow('[!]'))} Configure AWS region.
+Fetching Lambda functions, this might take a while.
+${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded. ListFunctionsError
 "
 `);
             }));

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

@@ -80,25 +80,21 @@ describe('prompt', () => {
             inquirer_1.prompt.mockImplementation(() => Promise.resolve({
                 [constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]: fixtures_1.mockAwsAccessKeyId,
                 [constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]: fixtures_1.mockAwsSecretAccessKey,
-                [constants_1.AWS_DEFAULT_REGION_ENV_VAR]: 'sa-east-1',
             }));
             yield prompt_1.requestAWSCredentials();
             expect(process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]).toBe(fixtures_1.mockAwsAccessKeyId);
             expect(process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]).toBe(fixtures_1.mockAwsSecretAccessKey);
-            expect(process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR]).toBe('sa-east-1');
         }));
         test('sets the AWS credentials with session token as environment variables', () => __awaiter(void 0, void 0, void 0, function* () {
             ;
             inquirer_1.prompt.mockImplementation(() => Promise.resolve({
                 [constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]: fixtures_1.mockAwsAccessKeyId,
                 [constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]: fixtures_1.mockAwsSecretAccessKey,
-                [constants_1.AWS_DEFAULT_REGION_ENV_VAR]: 'sa-east-1',
                 [constants_1.AWS_SESSION_TOKEN_ENV_VAR]: 'some-session-token',
             }));
             yield prompt_1.requestAWSCredentials();
             expect(process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR]).toBe(fixtures_1.mockAwsAccessKeyId);
             expect(process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR]).toBe(fixtures_1.mockAwsSecretAccessKey);
-            expect(process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR]).toBe('sa-east-1');
             expect(process.env[constants_1.AWS_SESSION_TOKEN_ENV_VAR]).toBe('some-session-token');
         }));
         test('throws error when something unexpected happens while prompting', () => __awaiter(void 0, void 0, void 0, function* () {