@datadog/datadog-ci-base 4.4.0 → 5.0.0

package/dist/commands/dsyms/upload.js

@@ -0,0 +1,338 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DsymsUploadCommand = void 0;
+const fs_1 = require("fs");
+const chalk_1 = __importDefault(require("chalk"));
+const clipanion_1 = require("clipanion");
+const upath_1 = __importDefault(require("upath"));
+const datadog_ci_base_1 = require("@datadog/datadog-ci-base");
+const constants_1 = require("@datadog/datadog-ci-base/constants");
+const apikey_1 = require("@datadog/datadog-ci-base/helpers/apikey");
+const concurrency_1 = require("@datadog/datadog-ci-base/helpers/concurrency");
+const env_1 = require("@datadog/datadog-ci-base/helpers/env");
+const errors_1 = require("@datadog/datadog-ci-base/helpers/errors");
+const fips_1 = require("@datadog/datadog-ci-base/helpers/fips");
+const glob_1 = require("@datadog/datadog-ci-base/helpers/glob");
+const metrics_1 = require("@datadog/datadog-ci-base/helpers/metrics");
+const upload_1 = require("@datadog/datadog-ci-base/helpers/upload");
+const utils_1 = require("@datadog/datadog-ci-base/helpers/utils");
+const validation = __importStar(require("@datadog/datadog-ci-base/helpers/validation"));
+const validation_1 = require("@datadog/datadog-ci-base/helpers/validation");
+const version_1 = require("@datadog/datadog-ci-base/version");
+const interfaces_1 = require("./interfaces");
+const renderer_1 = require("./renderer");
+const utils_2 = require("./utils");
+class DsymsUploadCommand extends datadog_ci_base_1.BaseCommand {
+    constructor() {
+        var _a, _b;
+        super(...arguments);
+        this.basePath = clipanion_1.Option.String({ required: true });
+        this.configPath = clipanion_1.Option.String('--config');
+        this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
+        this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
+        this.cliVersion = version_1.cliVersion;
+        this.fips = clipanion_1.Option.Boolean('--fips', false);
+        this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
+        this.fipsConfig = {
+            fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
+            fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
+        };
+        this.config = {
+            datadogSite: 'datadoghq.com',
+        };
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
+            this.basePath = upath_1.default.normalize(this.basePath);
+            this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.basePath, this.maxConcurrency, this.dryRun));
+            yield this.loadConfig();
+            const { metricsLogger, apiKeyValidator } = this.createServices();
+            const initialTime = Date.now();
+            try {
+                const tmpDirectory = yield (0, utils_2.createUniqueTmpDirectory)();
+                try {
+                    const results = yield this.processAndUploadDsyms(tmpDirectory, metricsLogger, apiKeyValidator);
+                    const totalTime = (Date.now() - initialTime) / 1000;
+                    this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(results, totalTime, this.dryRun));
+                    metricsLogger.logger.gauge('duration', totalTime);
+                    return 0;
+                }
+                finally {
+                    yield (0, utils_2.deleteDirectory)(tmpDirectory);
+                }
+            }
+            catch (error) {
+                if (error instanceof errors_1.InvalidConfigurationError) {
+                    this.context.stdout.write((0, renderer_1.renderConfigurationError)(error));
+                    return 1;
+                }
+                throw error;
+            }
+            finally {
+                try {
+                    yield metricsLogger.flush();
+                }
+                catch (err) {
+                    this.context.stdout.write(`WARN: ${err}\n`);
+                }
+            }
+        });
+    }
+    loadConfig() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
+                apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
+                datadogSite: process.env.DATADOG_SITE || process.env.DD_SITE,
+            }, {
+                configPath: this.configPath,
+                defaultConfigPaths: ['datadog-ci.json', '../datadog-ci.json'],
+                configFromFileCallback: (configFromFile) => {
+                    (0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY || process.env.DD_API_KEY, configFromFile.apiKey, this.context.stdout);
+                },
+            });
+        });
+    }
+    createServices() {
+        const metricsLogger = (0, metrics_1.getMetricsLogger)({
+            apiKey: this.config.apiKey,
+            datadogSite: this.config.datadogSite,
+            defaultTags: [`cli_version:${this.cliVersion}`],
+            prefix: 'datadog.ci.dsyms.',
+        });
+        const apiKeyValidator = (0, apikey_1.newApiKeyValidator)({
+            apiKey: this.config.apiKey,
+            datadogSite: this.config.datadogSite,
+            metricsLogger: metricsLogger.logger,
+        });
+        return { metricsLogger, apiKeyValidator };
+    }
+    processAndUploadDsyms(tmpDirectory, metricsLogger, apiKeyValidator) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const intermediateDirectory = (0, utils_1.buildPath)(tmpDirectory, 'datadog-ci', 'dsyms', 'intermediate');
+            const uploadDirectory = (0, utils_1.buildPath)(tmpDirectory, 'datadog-ci', 'dsyms', 'upload');
+            this.context.stdout.write((0, renderer_1.renderCommandDetail)(intermediateDirectory, uploadDirectory));
+            const searchDirectory = yield this.prepareSearchDirectory(tmpDirectory);
+            const dsyms = yield this.findDsyms(searchDirectory);
+            const thinDsyms = yield this.processDsyms(dsyms, intermediateDirectory);
+            const compressedDsyms = yield this.compressDsyms(thinDsyms, uploadDirectory);
+            const requestBuilder = this.createRequestBuilder();
+            const uploadFunction = this.createUploadFunction(requestBuilder, metricsLogger, apiKeyValidator);
+            return (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, compressedDsyms, uploadFunction);
+        });
+    }
+    prepareSearchDirectory(tmpDirectory) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (yield (0, utils_2.isZipFile)(this.basePath)) {
+                yield (0, utils_2.unzipArchiveToDirectory)(this.basePath, tmpDirectory);
+                return tmpDirectory;
+            }
+            return this.basePath;
+        });
+    }
+    findDsyms(directoryPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dsymPaths = (0, glob_1.globSync)((0, utils_1.buildPath)(directoryPath, '**/*.dSYM'));
+            const results = yield Promise.all(dsymPaths.map((bundle) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const { stdout } = yield (0, utils_2.executeDwarfdump)(bundle);
+                    const dwarf = this.parseDwarfdumpOutput(stdout);
+                    return [{ bundle, dwarf }];
+                }
+                catch (_a) {
+                    this.context.stdout.write((0, renderer_1.renderInvalidDsymWarning)(bundle));
+                    return [];
+                }
+            })));
+            return results.flat();
+        });
+    }
+    /**
+     * Parses the output of `dwarfdump --uuid` command (ref.: https://www.unix.com/man-page/osx/1/dwarfdump/).
+     * It returns one or many DWARF UUID and arch read from the output.
+     *
+     * Example `dwarfdump --uuid` output:
+     * ```
+     * $ dwarfdump --uuid DDTest.framework.dSYM
+     * UUID: C8469F85-B060-3085-B69D-E46C645560EA (armv7) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
+     * UUID: 06EE3D68-D605-3E92-B92D-2F48C02A505E (arm64) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
+     * ```
+     */
+    parseDwarfdumpOutput(output) {
+        const lineRegexp = /UUID: ([0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}) \(([a-z0-9_]+)\) (.+)/;
+        return output
+            .split('\n')
+            .map((line) => {
+            const match = line.match(lineRegexp);
+            return match ? [{ uuid: match[1], arch: match[2], object: match[3] }] : [];
+        })
+            .flat();
+    }
+    /**
+     * It takes `N` dSYMs and returns `N` or more dSYMs. If a dSYM includes more than one arch slice,
+     * it will be thinned by extracting each arch to a new dSYM in `output`.
+     */
+    processDsyms(dsyms, output) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield fs_1.promises.mkdir(output, { recursive: true });
+            const results = yield Promise.all(dsyms.map((dsym) => __awaiter(this, void 0, void 0, function* () {
+                // Reduce dSYMs size by extracting single UUIDs and arch slices from fat dSYMs to separate
+                // single-arch dSYMs in intermediate location. This is to avoid exceeding intake limit whenever possible.
+                return dsym.dwarf.length > 1 ? this.thinDsym(dsym, output) : [dsym];
+            })));
+            return results.flat();
+        });
+    }
+    /**
+     * It takes fat dSYM as input and returns multiple dSYMs by extracting **each arch**
+     * to separate dSYM file. New files are saved to `output` and named by their object uuid (`<uuid>.dSYM`).
+     *
+     * For example, given `<source path>/Foo.dSYM/Contents/Resources/DWARF/Foo` dSYM with two arch slices: `arm64` (uuid1)
+     * and `x86_64` (uuid2), it will:
+     * - create `<intermediate path>/<uuid1>.dSYM/Contents/Resources/DWARF/Foo` for `arm64`,
+     * - create `<intermediate path>/<uuid2>.dSYM/Contents/Resources/DWARF/Foo` for `x86_64`.
+     */
+    thinDsym(dsym, output) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield Promise.all(dsym.dwarf.map((dwarf) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const bundle = (0, utils_1.buildPath)(output, `${dwarf.uuid}.dSYM`);
+                    const object = (0, utils_1.buildPath)(bundle, upath_1.default.relative(dsym.bundle, dwarf.object));
+                    yield fs_1.promises.mkdir(upath_1.default.dirname(object), { recursive: true });
+                    try {
+                        // Attempt to extract the single arch object file.
+                        // We could use the `lipo -archs` command to get the list of archs,
+                        // but it's more straightforward to just attempt to extract
+                        // the single arch.
+                        yield (0, utils_2.executeLipo)(dwarf.object, dwarf.arch, object);
+                    }
+                    catch (_a) {
+                        // The thinning using `lipo` failed, meaning the dSYM is already
+                        // a single arch dSYM. Copy the object file to the new dSYM.
+                        yield fs_1.promises.copyFile(dwarf.object, object);
+                    }
+                    yield this.copyInfoPlist(dsym.bundle, bundle);
+                    return [{ bundle, dwarf: [Object.assign(Object.assign({}, dwarf), { object })] }];
+                }
+                catch (error) {
+                    this.context.stdout.write((0, renderer_1.renderDSYMSlimmingFailure)(dsym, dwarf, error));
+                    return [];
+                }
+            })));
+            return results.flat();
+        });
+    }
+    copyInfoPlist(src, dst) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const infoPlistPaths = (0, glob_1.globSync)((0, utils_1.buildPath)(src, '**/Info.plist'));
+            if (infoPlistPaths.length === 0) {
+                return;
+            }
+            const infoPlistPath = infoPlistPaths[0];
+            const newInfoPlistPath = (0, utils_1.buildPath)(dst, upath_1.default.relative(src, infoPlistPath));
+            yield fs_1.promises.mkdir(upath_1.default.dirname(newInfoPlistPath), { recursive: true });
+            yield fs_1.promises.copyFile(infoPlistPath, newInfoPlistPath);
+        });
+    }
+    compressDsyms(dsyms, output) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield fs_1.promises.mkdir(output, { recursive: true });
+            return Promise.all(dsyms.map((dsym) => __awaiter(this, void 0, void 0, function* () {
+                const archivePath = (0, utils_1.buildPath)(output, `${dsym.dwarf[0].uuid}.zip`);
+                yield (0, utils_2.zipDirectoryToArchive)(dsym.bundle, archivePath);
+                return new interfaces_1.CompressedDsym(archivePath, dsym);
+            })));
+        });
+    }
+    createRequestBuilder() {
+        if (!this.config.apiKey) {
+            throw new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} or ${chalk_1.default.bold('DD_API_KEY')} in your environment.`);
+        }
+        return (0, utils_1.getRequestBuilder)({
+            apiKey: this.config.apiKey,
+            baseUrl: (0, utils_2.getBaseIntakeUrl)(this.config.datadogSite),
+            headers: new Map([
+                ['DD-EVP-ORIGIN', 'datadog-ci_dsyms'],
+                ['DD-EVP-ORIGIN-VERSION', this.cliVersion],
+            ]),
+            overrideUrl: 'api/v2/srcmap',
+        });
+    }
+    createUploadFunction(requestBuilder, metricsLogger, apiKeyValidator) {
+        return (dsym) => __awaiter(this, void 0, void 0, function* () {
+            const payload = dsym.asMultipartPayload();
+            if (this.dryRun) {
+                this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(dsym)}`);
+                return upload_1.UploadStatus.Success;
+            }
+            return (0, upload_1.upload)(requestBuilder)(payload, {
+                apiKeyValidator,
+                onError: (e) => {
+                    this.context.stdout.write((0, renderer_1.renderFailedUpload)(dsym, e.message));
+                    metricsLogger.logger.increment('failed', 1);
+                },
+                onRetry: (e, attempts) => {
+                    this.context.stdout.write((0, renderer_1.renderRetriedUpload)(dsym, e.message, attempts));
+                    metricsLogger.logger.increment('retries', 1);
+                },
+                onUpload: () => {
+                    this.context.stdout.write((0, renderer_1.renderUpload)(dsym));
+                },
+                retries: 5,
+            });
+        });
+    }
+}
+exports.DsymsUploadCommand = DsymsUploadCommand;
+DsymsUploadCommand.paths = [['dsyms', 'upload']];
+DsymsUploadCommand.usage = clipanion_1.Command.Usage({
+    category: 'RUM',
+    description: 'Upload dSYM files to Datadog.',
+    details: `
+      This command will upload all dSYM files to Datadog in order to symbolicate crash reports received by Datadog.\n
+      See README for details.
+    `,
+    examples: [
+        ['Upload all dSYM files in Derived Data path', 'datadog-ci dsyms upload ~/Library/Developer/Xcode/DerivedData'],
+        [
+            'Upload all dSYM files in a zip file (this is usually the case if your app has Bitcode enabled)',
+            'datadog-ci dsyms upload /path/to/folder/my_file.zip',
+        ],
+    ],
+});
+//# sourceMappingURL=upload.js.map

package/dist/commands/dsyms/upload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":"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"}

package/dist/commands/dsyms/utils.d.ts

@@ -0,0 +1,15 @@
+export declare const isZipFile: (filepath: string) => Promise<boolean>;
+export declare const createUniqueTmpDirectory: () => Promise<string>;
+export declare const deleteDirectory: (directoryPath: string) => Promise<void>;
+export declare const zipDirectoryToArchive: (directoryPath: string, archivePath: string) => Promise<void>;
+export declare const unzipArchiveToDirectory: (archivePath: string, directoryPath: string) => Promise<void>;
+export declare const executeDwarfdump: (dSYMPath: string) => Promise<{
+    stderr: string;
+    stdout: string;
+}>;
+export declare const executeLipo: (objectPath: string, arch: string, newObjectPath: string) => Promise<{
+    stderr: string;
+    stdout: string;
+}>;
+export declare const getBaseIntakeUrl: (datadogSite?: string) => string;
+export declare const pluralize: (nb: number, singular: string, plural: string) => string;

package/dist/commands/dsyms/utils.js

@@ -0,0 +1,74 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluralize = exports.getBaseIntakeUrl = exports.executeLipo = exports.executeDwarfdump = exports.unzipArchiveToDirectory = exports.zipDirectoryToArchive = exports.deleteDirectory = exports.createUniqueTmpDirectory = exports.isZipFile = void 0;
+const promises_1 = __importDefault(require("fs/promises"));
+const os_1 = require("os");
+const upath_1 = __importDefault(require("upath"));
+const utils_1 = require("@datadog/datadog-ci-base/helpers/utils");
+const isZipFile = (filepath) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const stats = yield promises_1.default.stat(filepath);
+        return stats.size !== 0 && upath_1.default.extname(filepath) === '.zip';
+    }
+    catch (error) {
+        // Log to console "file exists yet empty" ?
+        return false;
+    }
+});
+exports.isZipFile = isZipFile;
+const createUniqueTmpDirectory = () => __awaiter(void 0, void 0, void 0, function* () {
+    const uniqueValue = Math.random() * Number.MAX_SAFE_INTEGER;
+    const directoryPath = (0, utils_1.buildPath)((0, os_1.tmpdir)(), uniqueValue.toString());
+    yield promises_1.default.mkdir(directoryPath, { recursive: true });
+    return directoryPath;
+});
+exports.createUniqueTmpDirectory = createUniqueTmpDirectory;
+const deleteDirectory = (directoryPath) => __awaiter(void 0, void 0, void 0, function* () {
+    yield promises_1.default.rm(directoryPath, { recursive: true });
+});
+exports.deleteDirectory = deleteDirectory;
+const zipDirectoryToArchive = (directoryPath, archivePath) => __awaiter(void 0, void 0, void 0, function* () {
+    const cwd = upath_1.default.dirname(directoryPath);
+    const directoryName = upath_1.default.basename(directoryPath);
+    yield (0, utils_1.execute)(`zip -r '${archivePath}' '${directoryName}'`, cwd);
+});
+exports.zipDirectoryToArchive = zipDirectoryToArchive;
+const unzipArchiveToDirectory = (archivePath, directoryPath) => __awaiter(void 0, void 0, void 0, function* () {
+    yield promises_1.default.mkdir(directoryPath, { recursive: true });
+    yield (0, utils_1.execute)(`unzip -o '${archivePath}' -d '${directoryPath}'`);
+});
+exports.unzipArchiveToDirectory = unzipArchiveToDirectory;
+const executeDwarfdump = (dSYMPath) => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.execute)(`dwarfdump --uuid '${dSYMPath}'`); });
+exports.executeDwarfdump = executeDwarfdump;
+const executeLipo = (objectPath, arch, newObjectPath) => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.execute)(`lipo '${objectPath}' -thin ${arch} -output '${newObjectPath}'`); });
+exports.executeLipo = executeLipo;
+const getBaseIntakeUrl = (datadogSite) => {
+    if (process.env.DATADOG_DSYM_INTAKE_URL) {
+        return process.env.DATADOG_DSYM_INTAKE_URL;
+    }
+    else if (datadogSite) {
+        return 'https://sourcemap-intake.' + datadogSite;
+    }
+    return 'https://sourcemap-intake.datadoghq.com';
+};
+exports.getBaseIntakeUrl = getBaseIntakeUrl;
+const pluralize = (nb, singular, plural) => {
+    if (nb >= 2) {
+        return `${nb} ${plural}`;
+    }
+    return `${nb} ${singular}`;
+};
+exports.pluralize = pluralize;
+//# sourceMappingURL=utils.js.map

package/dist/commands/dsyms/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/dsyms/utils.ts"],"names":[],"mappings":"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"}

package/dist/commands/lambda/instrument.js

@@ -12,7 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LambdaInstrumentCommand = void 0;
 const clipanion_1 = require("clipanion");
 const plugin_1 = require("../../helpers/plugin");
+const lambda_layer_versions_1 = require("../../helpers/serverless/lambda-layer-versions");
 const __1 = require("../..");
+const LAYER_VERSIONS_HELP_STRING = Object.entries(lambda_layer_versions_1.LAMBDA_LAYER_VERSIONS)
+    .filter(([key, _]) => key !== 'extension')
+    .map(([key, value]) => `${key} - ${value}`)
+    .join(', ');
 class LambdaInstrumentCommand extends __1.BaseCommand {
     constructor() {
         super(...arguments);
@@ -35,7 +40,7 @@ class LambdaInstrumentCommand extends __1.BaseCommand {
             description: `Use --env to separate out your staging, development, and production environments. Learn more about the env tag here: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-env-tag`,
         });
         this.extensionVersion = clipanion_1.Option.String('-e,--extension-version,--extensionVersion', {
-            description: `Version of the Datadog Lambda Extension layer to apply. When extension-version is set, make sure to export DATADOG_API_KEY (or if encrypted, DATADOG_KMS_API_KEY or DATADOG_API_KEY_SECRET_ARN) in your environment as well. While using extension-version, leave out forwarder. Learn more about the Lambda Extension here: https://docs.datadoghq.com/serverless/libraries_integrations/extension`,
+            description: `Version of the Datadog Lambda Extension layer to apply. Defaults to 'latest'. Setting this to 'latest' will use version ${lambda_layer_versions_1.LAMBDA_LAYER_VERSIONS['extension']}. When using the extension, make sure to export DATADOG_API_KEY (or if encrypted, DATADOG_KMS_API_KEY or DATADOG_API_KEY_SECRET_ARN) in your environment as well. Mutually exclusive with the forwarder. Set to 'none' to explicitly disable adding the extension layer. Learn more about the Lambda Extension here: https://docs.datadoghq.com/serverless/libraries_integrations/extension`,
         });
         this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags', {
             description: `Add custom tags to your Lambda function in Datadog. Must be a list of <key>:<value> separated by commas such as: layer:api,team:intake`,
@@ -54,7 +59,7 @@ class LambdaInstrumentCommand extends __1.BaseCommand {
         });
         this.layerAWSAccount = clipanion_1.Option.String('-a,--layer-account,--layerAccount', { hidden: true });
         this.layerVersion = clipanion_1.Option.String('-v,--layer-version,--layerVersion', {
-            description: `Version of the Datadog Lambda Library layer to apply. This varies between runtimes.`,
+            description: `Version of the Datadog Lambda Library layer to apply. Defaults to 'latest'. Setting this to 'latest' will use one of the following versions based on your runtime: ${LAYER_VERSIONS_HELP_STRING}. Setting to 'none' will disable adding the language layer.`,
         });
         this.logging = clipanion_1.Option.String('--logging', {
             description: `Whether to collect logs using the Lambda Extension. Defaults to 'true'`,

package/dist/commands/lambda/instrument.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,6BAAiC;AAEjC,MAAa,uBAAwB,SAAQ,eAAW;IAAxD;;QAQY,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE;YACjE,WAAW,EAAE,oSAAoS;SAClT,CAAC,CAAA;QACQ,kBAAa,GAAG,kBAAM,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE;YAC1D,WAAW,EAAE,qFAAqF;SACnG,CAAC,CAAA;QACQ,yBAAoB,GAAG,kBAAM,CAAC,MAAM,CAAC,iDAAiD,EAAE;YAChG,WAAW,EAAE,mGAAmG;SACjH,CAAC,CAAA;QACQ,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,EAAE;YAC/C,WAAW,EAAE,gCAAgC;SAC9C,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,EAAE;YAC7D,WAAW,EAAE,6CAA6C;SAC3D,CAAC,CAAA;QACQ,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YAC7C,WAAW,EAAE,4MAA4M;SAC1N,CAAC,CAAA;QACQ,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,2CAA2C,EAAE;YACtF,WAAW,EAAE,qYAAqY;SACnZ,CAAC,CAAA;QACQ,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,0BAA0B,EAAE;YAC9D,WAAW,EAAE,wIAAwI;SACtJ,CAAC,CAAA;QACQ,uBAAkB,GAAG,kBAAM,CAAC,MAAM,CAAC,8CAA8C,EAAE;YAC3F,WAAW,EAAE,0UAA0U;SACxV,CAAC,CAAA;QACQ,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YACjD,WAAW,EAAE,2HAA2H;SACzI,CAAC,CAAA;QACQ,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,EAAE;YACtD,WAAW,EAAE,kHAAkH;SAChI,CAAC,CAAA;QACQ,gBAAW,GAAG,kBAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE,KAAK,EAAE;YAChE,WAAW,EAAE,wNAAwN;SACtO,CAAC,CAAA;QACQ,oBAAe,GAAG,kBAAM,CAAC,MAAM,CAAC,mCAAmC,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;QACpF,iBAAY,GAAG,kBAAM,CAAC,MAAM,CAAC,mCAAmC,EAAE;YAC1E,WAAW,EAAE,qFAAqF;SACnG,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7C,WAAW,EAAE,wEAAwE;SACtF,CAAC,CAAA;QACQ,aAAQ,GAAG,kBAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE;YAC3D,WAAW,EAAE,4HAA4H;SAC1I,CAAC,CAAA;QACQ,oBAAe,GAAG,kBAAM,CAAC,MAAM,CAAC,uCAAuC,EAAE;YACjF,WAAW,EAAE,gHAAgH;SAC9H,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7C,WAAW,EAAE,uMAAuM;SACrN,CAAC,CAAA;QACQ,iBAAY,GAAG,kBAAM,CAAC,MAAM,CAAC,oCAAoC,EAAE;YAC3E,WAAW,EAAE,wDAAwD;SACtE,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC9C,WAAW,EAAE,6FAA6F;SAC3G,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7C,WAAW,EAAE,2MAA2M;SACzN,CAAC,CAAA;QACQ,0BAAqB,GAAG,kBAAM,CAAC,OAAO,CAAC,sDAAsD,EAAE,IAAI,EAAE;YAC7G,WAAW,EAAE,4UAA4U;SAC1V,CAAC,CAAA;QACQ,sBAAiB,GAAG,kBAAM,CAAC,OAAO,CAAC,8CAA8C,EAAE,IAAI,EAAE;YACjG,WAAW,EAAE,wMAAwM;SACtN,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7C,WAAW,EAAE,uEAAuE;SACrF,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7C,WAAW,EAAE,wNAAwN;SACtO,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,EAAE;YAC3C,WAAW,EAAE,qIAAqI;SACnJ,CAAC,CAAA;QAEQ,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;QAC9D,eAAU,GAAG,kBAAM,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE;YAC5D,WAAW,EAAE,4JAA4J;SAC1K,CAAC,CAAA;IAKJ,CAAC;IAHc,OAAO;;YAClB,OAAO,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;;AA7FH,0DA8FC;AA7Fe,6BAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,AAA7B,CAA6B;AAElC,6BAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,4CAA4C;CAC1D,CAAC,AAHiB,CAGjB"}
+{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/instrument.ts"],"names":[],"mappings":"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"}

package/dist/commands/plugin/check.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginCheckCommand = void 0;
 const clipanion_1 = require("clipanion");
+const message_box_1 = require("../../helpers/message-box");
 const plugin_1 = require("../../helpers/plugin");
 const __1 = require("../..");
 class PluginCheckCommand extends __1.BaseCommand {
@@ -22,6 +23,13 @@ class PluginCheckCommand extends __1.BaseCommand {
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
+            const packageName = (0, plugin_1.scopeToPackageName)(this.packageOrScope);
+            if (this.context.builtinPlugins.includes(packageName)) {
+                console.log();
+                (0, message_box_1.messageBox)('Built-in plugin 🔌', 'green', [`The plugin ${packageName} is built-in!`]);
+                console.log();
+                return 0;
+            }
             const succeeded = yield (0, plugin_1.checkPlugin)(this.packageOrScope, this.command);
             return succeeded ? 0 : 1;
         });

package/dist/commands/plugin/check.js.map

@@ -1 +1 @@
-{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../src/commands/plugin/check.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAgD;AAEhD,6BAAiC;AAEjC,MAAa,kBAAmB,SAAQ,eAAW;IAAnD;;QAaE,aAAa;QACN,mBAAc,GAAG,kBAAM,CAAC,MAAM,EAAE,CAAA;QAChC,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAA;IAOnD,CAAC;IALc,OAAO;;YAClB,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtE,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;KAAA;;AArBH,gDAsBC;AArBe,wBAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,AAAxB,CAAwB;AAE7B,wBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,sDAAsD;IACnE,QAAQ,EAAE;QACR,CAAC,8CAA8C,EAAE,+DAA+D,CAAC;QACjH,CAAC,uCAAuC,EAAE,oCAAoC,CAAC;QAC/E,CAAC,+DAA+D,EAAE,8CAA8C,CAAC;KAClH;CACF,CAAC,AARiB,CAQjB"}
+{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../src/commands/plugin/check.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,2DAAoD;AACpD,iDAAoE;AAEpE,6BAAiC;AAEjC,MAAa,kBAAmB,SAAQ,eAAW;IAAnD;;QAaE,aAAa;QACN,mBAAc,GAAG,kBAAM,CAAC,MAAM,EAAE,CAAA;QAChC,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAA;IAiBnD,CAAC;IAfc,OAAO;;YAClB,MAAM,WAAW,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YAE3D,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBACrD,OAAO,CAAC,GAAG,EAAE,CAAA;gBACb,IAAA,wBAAU,EAAC,oBAAoB,EAAE,OAAO,EAAE,CAAC,cAAc,WAAW,eAAe,CAAC,CAAC,CAAA;gBACrF,OAAO,CAAC,GAAG,EAAE,CAAA;gBAEb,OAAO,CAAC,CAAA;aACT;YAED,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtE,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;KAAA;;AA/BH,gDAgCC;AA/Be,wBAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,AAAxB,CAAwB;AAE7B,wBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,sDAAsD;IACnE,QAAQ,EAAE;QACR,CAAC,8CAA8C,EAAE,+DAA+D,CAAC;QACjH,CAAC,uCAAuC,EAAE,oCAAoC,CAAC;QAC/E,CAAC,+DAA+D,EAAE,8CAA8C,CAAC;KAClH;CACF,CAAC,AARiB,CAQjB"}

package/dist/commands/plugin/install.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginInstallCommand = void 0;
 const clipanion_1 = require("clipanion");
+const message_box_1 = require("../../helpers/message-box");
 const plugin_1 = require("../../helpers/plugin");
 const __1 = require("../..");
 class PluginInstallCommand extends __1.BaseCommand {
@@ -21,7 +22,14 @@ class PluginInstallCommand extends __1.BaseCommand {
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
-            const succeeded = yield (0, plugin_1.installPlugin)(this.packageOrScope);
+            const packageName = (0, plugin_1.scopeToPackageName)(this.packageOrScope);
+            if (this.context.builtinPlugins.includes(packageName)) {
+                console.log();
+                (0, message_box_1.messageBox)('Built-in plugin 🔌', 'green', [`The plugin ${packageName} is already built-in!`]);
+                console.log();
+                return 0;
+            }
+            const succeeded = yield (0, plugin_1.installPlugin)(packageName);
             return succeeded ? 0 : 1;
         });
     }

package/dist/commands/plugin/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/plugin/install.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAkD;AAElD,6BAAiC;AAEjC,MAAa,oBAAqB,SAAQ,eAAW;IAArD;;QAeE,aAAa;QACN,mBAAc,GAAG,kBAAM,CAAC,MAAM,EAAE,CAAA;IAOzC,CAAC;IALc,OAAO;;YAClB,MAAM,SAAS,GAAG,MAAM,IAAA,sBAAa,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YAE1D,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;KAAA;;AAtBH,oDAuBC;AAtBe,0BAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,AAA1B,CAA0B;AAE/B,0BAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,8BAA8B;IAC3C,QAAQ,EAAE;QACR;YACE,gDAAgD;YAChD,iEAAiE;SAClE;QACD,CAAC,yCAAyC,EAAE,sCAAsC,CAAC;KACpF;CACF,CAAC,AAViB,CAUjB"}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/plugin/install.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,2DAAoD;AACpD,iDAAsE;AAEtE,6BAAiC;AAEjC,MAAa,oBAAqB,SAAQ,eAAW;IAArD;;QAeE,aAAa;QACN,mBAAc,GAAG,kBAAM,CAAC,MAAM,EAAE,CAAA;IAiBzC,CAAC;IAfc,OAAO;;YAClB,MAAM,WAAW,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YAE3D,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBACrD,OAAO,CAAC,GAAG,EAAE,CAAA;gBACb,IAAA,wBAAU,EAAC,oBAAoB,EAAE,OAAO,EAAE,CAAC,cAAc,WAAW,uBAAuB,CAAC,CAAC,CAAA;gBAC7F,OAAO,CAAC,GAAG,EAAE,CAAA;gBAEb,OAAO,CAAC,CAAA;aACT;YAED,MAAM,SAAS,GAAG,MAAM,IAAA,sBAAa,EAAC,WAAW,CAAC,CAAA;YAElD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;KAAA;;AAhCH,oDAiCC;AAhCe,0BAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,AAA1B,CAA0B;AAE/B,0BAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,8BAA8B;IAC3C,QAAQ,EAAE;QACR;YACE,gDAAgD;YAChD,iEAAiE;SAClE;QACD,CAAC,yCAAyC,EAAE,sCAAsC,CAAC;KACpF;CACF,CAAC,AAViB,CAUjB"}

package/dist/commands/plugin/list.d.ts

@@ -3,6 +3,7 @@ export declare class PluginListCommand extends BaseCommand {
     static paths: string[][];
     static usage: import("clipanion").Usage;
     json: boolean | undefined;
+    all: boolean | undefined;
     private logger;
     execute(): Promise<number>;
 }

package/dist/commands/plugin/list.js

@@ -23,6 +23,7 @@ class PluginListCommand extends __1.BaseCommand {
         super(...arguments);
         // Positional
         this.json = clipanion_1.Option.Boolean('--json', { required: false });
+        this.all = clipanion_1.Option.Boolean('-a,--all', { required: false });
         this.logger = new logger_1.Logger((s) => {
             this.context.stdout.write(s);
         }, logger_1.LogLevel.INFO);
@@ -31,21 +32,26 @@ class PluginListCommand extends __1.BaseCommand {
         return __awaiter(this, void 0, void 0, function* () {
             const allPlugins = (0, plugin_1.listAllPlugins)();
             const builtinPlugins = new Set(this.context.builtinPlugins);
-            const installablePlugins = allPlugins.filter((plugin) => !builtinPlugins.has(plugin));
+            const installablePlugins = allPlugins.filter((name) => !builtinPlugins.has(name));
+            const plugins = this.all
+                ? [
+                    ...installablePlugins.map((name) => ({ name, isBuiltin: false })),
+                    ...Array.from(builtinPlugins).map((name) => ({ name, isBuiltin: true })),
+                ]
+                : installablePlugins.map((name) => ({ name, isBuiltin: false }));
             if (this.json) {
-                this.logger.info(JSON.stringify(installablePlugins.map((plugin) => ({
-                    name: plugin,
-                    scope: getScope(plugin),
+                this.logger.info(JSON.stringify(plugins.map(({ name, isBuiltin }) => ({
+                    name,
+                    scope: getScope(name),
+                    isBuiltin,
                 }))));
                 return 0;
             }
-            if (installablePlugins.length === 0) {
-                this.logger.info('All plugins are currently built-in. We will start splitting them in next major release.');
-                return 0;
-            }
             this.logger.info(`The following plugins are available:\n`);
-            this.logger.info(installablePlugins
-                .map((plugin) => ` - ${chalk_1.default.bold.magenta(plugin)} (install with ${chalk_1.default.bold.cyan(`datadog-ci plugin install ${getScope(plugin)}`)})`)
+            this.logger.info(plugins
+                .map(({ name, isBuiltin }) => isBuiltin
+                ? ` - ${chalk_1.default.bold('(built-in)')} ${chalk_1.default.magenta(name)}`
+                : ` - ${chalk_1.default.bold.magenta(name)} (install with ${chalk_1.default.bold.cyan(`datadog-ci plugin install ${getScope(name)}`)})`)
                 .join('\n'));
             return 0;
         });
@@ -58,10 +64,11 @@ PluginListCommand.usage = clipanion_1.Command.Usage({
     description: 'List the available plugins.',
     details: `
       This command lists the plugins that can be installed with the \`datadog-ci plugin install\` command.
-
-      All other plugins are **built-in** and are not listed here.
     `,
-    examples: [['List the available plugins', 'datadog-ci plugin list']],
+    examples: [
+        ['List the available plugins', 'datadog-ci plugin list'],
+        ['List all plugins, including built-in plugins', 'datadog-ci plugin list --all'],
+    ],
 });
 const getScope = (plugin) => plugin.replace('@datadog/datadog-ci-plugin-', '');
 //# sourceMappingURL=list.js.map