@datadog/datadog-ci 0.17.12 → 0.17.13

package/dist/commands/lambda/functions/commons.d.ts

@@ -32,6 +32,19 @@ export declare const coerceBoolean: (fallback: boolean, ...values: any[]) => boo
 export declare const collectFunctionsByRegion: (functions: string[], defaultRegion: string | undefined) => {
     [key: string]: string[];
 };
+/**
+ * Given a layer runtime, return its latest version.
+ *
+ * @param runtime the runtime of the layer.
+ * @param region the region where the layer is stored.
+ * @returns the latest version of the layer to find.
+ */
+export declare const findLatestLayerVersion: (runtime: Runtime, region: string) => Promise<number>;
+export declare const isMissingAWSCredentials: () => boolean;
+export declare const isMissingDatadogSiteEnvVar: () => boolean;
+export declare const isMissingAnyDatadogApiKeyEnvVar: () => boolean;
+export declare const isMissingDatadogEnvVars: () => boolean;
+export declare const getAllLambdaFunctionConfigs: (lambda: Lambda) => Promise<Lambda.FunctionConfiguration[]>;
 /**
  * Given a Lambda instance and a regular expression,
  * returns all the Function Configurations that match.
@@ -61,6 +74,7 @@ export declare const getLambdaFunctionConfigs: (lambda: Lambda, functionARNs: st
  * @returns the ARN of a **Specific Runtime Layer** with the correct region, account, architecture, and name.
  */
 export declare const getLayerArn: (config: Lambda.FunctionConfiguration, runtime: Runtime, region: string, settings?: InstrumentationSettings | undefined) => string;
+export declare const getLayerNameWithVersion: (layerArn: string) => string | undefined;
 export declare const getLayers: (config: Lambda.FunctionConfiguration) => string[];
 /**
  * Call the aws-sdk Lambda api to get a Function given
@@ -99,3 +113,4 @@ export declare const isLambdaActive: (lambda: Lambda, config: Lambda.FunctionCon
 export declare const isSupportedRuntime: (runtime?: string | undefined) => runtime is Runtime;
 export declare const sentenceMatchesRegEx: (sentence: string, regex: RegExp) => RegExpMatchArray | null;
 export declare const updateLambdaFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, configs: FunctionConfiguration[]) => Promise<void>;
+export declare const willUpdateFunctionConfigs: (configs: FunctionConfiguration[]) => boolean;

package/dist/commands/lambda/functions/commons.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLambdaFunctionConfigs = exports.sentenceMatchesRegEx = exports.isSupportedRuntime = exports.isLambdaActive = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
+exports.willUpdateFunctionConfigs = exports.updateLambdaFunctionConfigs = exports.sentenceMatchesRegEx = exports.isSupportedRuntime = exports.isLambdaActive = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.isMissingDatadogSiteEnvVar = exports.isMissingAWSCredentials = exports.findLatestLayerVersion = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
+const aws_sdk_1 = require("aws-sdk");
 const constants_1 = require("../constants");
 const loggroup_1 = require("../loggroup");
 const tags_1 = require("../tags");
@@ -91,6 +92,87 @@ const collectFunctionsByRegion = (functions, defaultRegion) => {
     return groups;
 };
 exports.collectFunctionsByRegion = collectFunctionsByRegion;
+/**
+ * Given a layer runtime, return its latest version.
+ *
+ * @param runtime the runtime of the layer.
+ * @param region the region where the layer is stored.
+ * @returns the latest version of the layer to find.
+ */
+const findLatestLayerVersion = (runtime, region) => __awaiter(void 0, void 0, void 0, function* () {
+    let latestVersion = 0;
+    let searchStep = latestVersion > 0 ? 1 : 100;
+    let layerVersion = latestVersion + searchStep;
+    const account = region.startsWith('us-gov') ? constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT : constants_1.DEFAULT_LAYER_AWS_ACCOUNT;
+    const layerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
+    let foundLatestVersion = false;
+    const lambda = new aws_sdk_1.Lambda({ region });
+    while (!foundLatestVersion) {
+        try {
+            // Search next version
+            yield lambda
+                .getLayerVersion({
+                LayerName: `arn:aws:lambda:${region}:${account}:layer:${layerName}`,
+                VersionNumber: layerVersion,
+            })
+                .promise();
+            latestVersion = layerVersion;
+            // Increase layer version
+            layerVersion += searchStep;
+        }
+        catch (e) {
+            // Search step is too big, reset target to previous version
+            // with a smaller search step
+            if (searchStep > 1) {
+                layerVersion -= searchStep;
+                searchStep /= 10;
+                layerVersion += searchStep;
+            }
+            else {
+                // Search step is 1, current version was not found.
+                // It is likely that the last checked is the latest.
+                // Check the next version to be certain, since
+                // current version could've been deleted by accident.
+                try {
+                    layerVersion += searchStep;
+                    yield lambda
+                        .getLayerVersion({
+                        LayerName: `arn:aws:lambda:${region}:${account}:layer:${layerName}`,
+                        VersionNumber: layerVersion,
+                    })
+                        .promise();
+                    latestVersion = layerVersion;
+                    // Continue the search if the next version does exist (unlikely event)
+                    layerVersion += searchStep;
+                }
+                catch (e) {
+                    // The next version doesn't exist either, so the previous version is indeed the latest
+                    foundLatestVersion = true;
+                }
+            }
+        }
+    }
+    return latestVersion;
+});
+exports.findLatestLayerVersion = findLatestLayerVersion;
+const isMissingAWSCredentials = () => process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] === undefined || process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] === undefined;
+exports.isMissingAWSCredentials = isMissingAWSCredentials;
+const isMissingDatadogSiteEnvVar = () => {
+    const site = process.env[constants_1.CI_SITE_ENV_VAR];
+    if (site !== undefined) {
+        return !constants_1.SITES.includes(site);
+    }
+    return true;
+};
+exports.isMissingDatadogSiteEnvVar = isMissingDatadogSiteEnvVar;
+const isMissingAnyDatadogApiKeyEnvVar = () => !(process.env[constants_1.CI_API_KEY_ENV_VAR] ||
+    process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] ||
+    process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR]);
+exports.isMissingAnyDatadogApiKeyEnvVar = isMissingAnyDatadogApiKeyEnvVar;
+const isMissingDatadogEnvVars = () => exports.isMissingDatadogSiteEnvVar() || exports.isMissingAnyDatadogApiKeyEnvVar();
+exports.isMissingDatadogEnvVars = isMissingDatadogEnvVars;
+const getAllLambdaFunctionConfigs = (lambda) => __awaiter(void 0, void 0, void 0, function* () { return exports.getLambdaFunctionConfigsFromRegex(lambda, '.'); });
+exports.getAllLambdaFunctionConfigs = getAllLambdaFunctionConfigs;
 /**
  * Given a Lambda instance and a regular expression,
  * returns all the Function Configurations that match.
@@ -163,7 +245,12 @@ const getLayerArn = (config, runtime, region, settings) => {
     return `arn:aws:lambda:${region}:${account}:layer:${layerName}`;
 };
 exports.getLayerArn = getLayerArn;
-const getLayers = (config) => { var _a; return ((_a = config.Layers) !== null && _a !== void 0 ? _a : []).map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; }); };
+const getLayerNameWithVersion = (layerArn) => {
+    const [, , , , , , name, version] = layerArn.split(':');
+    return name && version ? `${name}:${version}` : undefined;
+};
+exports.getLayerNameWithVersion = getLayerNameWithVersion;
+const getLayers = (config) => { var _a; return ((_a = config.Layers) !== null && _a !== void 0 ? _a : []).map((layer) => layer.Arn); };
 exports.getLayers = getLayers;
 /**
  * Call the aws-sdk Lambda api to get a Function given
@@ -250,6 +337,22 @@ const updateLambdaFunctionConfigs = (lambda, cloudWatch, configs) => __awaiter(v
     yield Promise.all(results);
 });
 exports.updateLambdaFunctionConfigs = updateLambdaFunctionConfigs;
+const willUpdateFunctionConfigs = (configs) => {
+    var _a, _b, _c;
+    let willUpdate = false;
+    for (const config of configs) {
+        if (config.updateRequest !== undefined ||
+            ((_a = config.logGroupConfiguration) === null || _a === void 0 ? void 0 : _a.createLogGroupRequest) !== undefined ||
+            ((_b = config.logGroupConfiguration) === null || _b === void 0 ? void 0 : _b.deleteSubscriptionFilterRequest) !== undefined ||
+            ((_c = config.logGroupConfiguration) === null || _c === void 0 ? void 0 : _c.subscriptionFilterRequest) !== undefined ||
+            (config === null || config === void 0 ? void 0 : config.tagConfiguration) !== undefined) {
+            willUpdate = true;
+            break;
+        }
+    }
+    return willUpdate;
+};
+exports.willUpdateFunctionConfigs = willUpdateFunctionConfigs;
 /**
  * Waits for n ms
  *

package/dist/commands/lambda/functions/instrument.d.ts

@@ -4,4 +4,4 @@ import { FunctionConfiguration, InstrumentationSettings } from '../interfaces';
 export declare const getInstrumentedFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, region: string, functionARNs: string[], settings: InstrumentationSettings) => Promise<FunctionConfiguration[]>;
 export declare const getInstrumentedFunctionConfig: (lambda: Lambda, cloudWatch: CloudWatchLogs, config: Lambda.FunctionConfiguration, region: string, settings: InstrumentationSettings) => Promise<FunctionConfiguration>;
 export declare const getInstrumentedFunctionConfigsFromRegEx: (lambda: Lambda, cloudWatch: CloudWatchLogs, region: string, pattern: string, settings: InstrumentationSettings) => Promise<FunctionConfiguration[]>;
-export declare const calculateUpdateRequest: (config: Lambda.FunctionConfiguration, settings: InstrumentationSettings, region: string, runtime: Runtime) => Lambda.UpdateFunctionConfigurationRequest | undefined;
+export declare const calculateUpdateRequest: (config: Lambda.FunctionConfiguration, settings: InstrumentationSettings, region: string, runtime: Runtime) => Promise<Lambda.UpdateFunctionConfigurationRequest | undefined>;

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

@@ -31,7 +31,7 @@ const getInstrumentedFunctionConfig = (lambda, cloudWatch, config, region, setti
         throw Error(`Can't instrument ${functionARN}, runtime ${runtime} not supported`);
     }
     yield commons_1.isLambdaActive(lambda, config, functionARN);
-    const updateRequest = exports.calculateUpdateRequest(config, settings, region, runtime);
+    const updateRequest = yield exports.calculateUpdateRequest(config, settings, region, runtime);
     let logGroupConfiguration;
     if (settings.forwarderARN !== undefined) {
         const logGroupName = `/aws/lambda/${config.FunctionName}`;
@@ -57,7 +57,7 @@ const getInstrumentedFunctionConfigsFromRegEx = (lambda, cloudWatch, region, pat
     return functionsToUpdate;
 });
 exports.getInstrumentedFunctionConfigsFromRegEx = getInstrumentedFunctionConfigsFromRegEx;
-const calculateUpdateRequest = (config, settings, region, runtime) => {
+const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d;
     const oldEnvVars = Object.assign({}, (_a = config.Environment) === null || _a === void 0 ? void 0 : _a.Variables);
     const changedEnvVars = {};
@@ -116,6 +116,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         changedEnvVars[constants_1.SITE_ENV_VAR] = 'datadoghq.com';
     }
     const environmentVarsTupleArray = [
+        ['captureLambdaPayload', constants_1.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR],
         ['environment', constants_1.ENVIRONMENT_ENV_VAR],
         ['extraTags', constants_1.EXTRA_TAGS_ENV_VAR],
         ['mergeXrayTraces', constants_1.MERGE_XRAY_TRACES_ENV_VAR],
@@ -129,6 +130,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
             changedEnvVars[environmentVar] = settings[key].toString();
         }
     }
+    // Skip adding DD_FLUSH_TO_LOGS when using Extension
     const isUsingExtension = settings.extensionVersion !== undefined;
     if (!isUsingExtension &&
         settings.flushMetricsToLogs !== undefined &&
@@ -153,13 +155,21 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
     const lambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
     const lambraLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
     let fullLambdaLibraryLayerARN;
-    if (settings.layerVersion !== undefined) {
-        fullLambdaLibraryLayerARN = `${lambdaLibraryLayerArn}:${settings.layerVersion}`;
+    if (settings.layerVersion !== undefined || settings.interactive) {
+        let layerVersion = settings.layerVersion;
+        if (settings.interactive && !settings.layerVersion) {
+            layerVersion = yield commons_1.findLatestLayerVersion(config.Runtime, region);
+        }
+        fullLambdaLibraryLayerARN = `${lambdaLibraryLayerArn}:${layerVersion}`;
     }
     const lambdaExtensionLayerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region, settings);
     let fullExtensionLayerARN;
-    if (settings.extensionVersion !== undefined) {
-        fullExtensionLayerARN = `${lambdaExtensionLayerArn}:${settings.extensionVersion}`;
+    if (settings.extensionVersion !== undefined || settings.interactive) {
+        let extensionVersion = settings.extensionVersion;
+        if (settings.interactive && !settings.extensionVersion) {
+            extensionVersion = yield commons_1.findLatestLayerVersion(constants_1.EXTENSION_LAYER_KEY, region);
+        }
+        fullExtensionLayerARN = `${lambdaExtensionLayerArn}:${extensionVersion}`;
     }
     let layerARNs = commons_1.getLayers(config);
     const originalLayerARNs = layerARNs;
@@ -182,5 +192,5 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         }
     });
     return needsUpdate ? updateRequest : undefined;
-};
+});
 exports.calculateUpdateRequest = calculateUpdateRequest;

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

@@ -83,6 +83,7 @@ const calculateUpdateRequest = (config, runtime) => {
         constants_1.API_KEY_SECRET_ARN_ENV_VAR,
         constants_1.KMS_API_KEY_ENV_VAR,
         constants_1.SITE_ENV_VAR,
+        constants_1.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR,
         constants_1.ENVIRONMENT_ENV_VAR,
         constants_1.EXTRA_TAGS_ENV_VAR,
         constants_1.FLUSH_TO_LOG_ENV_VAR,

package/dist/commands/lambda/instrument.d.ts

@@ -1,5 +1,6 @@
 import { Command } from 'clipanion';
 export declare class InstrumentCommand extends Command {
+    private captureLambdaPayload?;
     private config;
     private configPath?;
     private dryRun;
@@ -9,6 +10,7 @@ export declare class InstrumentCommand extends Command {
     private flushMetricsToLogs?;
     private forwarder?;
     private functions;
+    private interactive;
     private layerAWSAccount?;
     private layerVersion?;
     private logLevel?;

package/dist/commands/lambda/instrument.js

@@ -19,74 +19,116 @@ const upload_1 = require("../git-metadata/upload");
 const constants_1 = require("./constants");
 const commons_1 = require("./functions/commons");
 const instrument_1 = require("./functions/instrument");
+const prompt_1 = require("./prompt");
 class InstrumentCommand extends clipanion_1.Command {
     constructor() {
         super(...arguments);
         this.config = {
             functions: [],
-            region: process.env.AWS_DEFAULT_REGION,
+            region: process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR],
             tracing: 'true',
         };
         this.dryRun = false;
         this.functions = [];
+        this.interactive = false;
         this.sourceCodeIntegration = false;
     }
     execute() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const lambdaConfig = { lambda: this.config };
             this.config = (yield utils_1.parseConfigFile(lambdaConfig, this.configPath)).lambda;
+            let hasSpecifiedFunctions = this.functions.length !== 0 || this.config.functions.length !== 0;
+            if (this.interactive) {
+                try {
+                    if (commons_1.isMissingAWSCredentials()) {
+                        this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[!]'))} No existing AWS credentials found, let's set them up!\n`);
+                        yield prompt_1.requestAWSCredentials();
+                    }
+                    if (commons_1.isMissingDatadogEnvVars()) {
+                        this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[!]'))} Configure Datadog settings.\n`);
+                        yield prompt_1.requestDatadogEnvVars();
+                    }
+                }
+                catch (e) {
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} ${e}\n`);
+                    return 1;
+                }
+                const region = (_b = (_a = this.region) !== null && _a !== void 0 ? _a : this.config.region) !== null && _b !== void 0 ? _b : process.env[constants_1.AWS_DEFAULT_REGION_ENV_VAR];
+                this.region = region;
+                // If user doesn't specify functions, allow them
+                // to select from all of the functions from the
+                // requested region.
+                if (!hasSpecifiedFunctions) {
+                    try {
+                        const lambda = new aws_sdk_1.Lambda({ region });
+                        this.context.stdout.write('Fetching Lambda functions, this might take a while.\n');
+                        const functionNames = (_c = (yield commons_1.getAllLambdaFunctionConfigs(lambda)).map((config) => config.FunctionName).sort()) !== null && _c !== void 0 ? _c : [];
+                        if (functionNames.length === 0) {
+                            this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified region.\n`);
+                            return 1;
+                        }
+                        const functions = yield prompt_1.requestFunctionSelection(functionNames);
+                        this.functions = functions;
+                    }
+                    catch (err) {
+                        this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. ${err}\n`);
+                        return 1;
+                    }
+                }
+            }
             const settings = this.getSettings();
             if (settings === undefined) {
                 return 1;
             }
-            const hasSpecifiedFuntions = this.functions.length !== 0 || this.config.functions.length !== 0;
+            hasSpecifiedFunctions = this.functions.length !== 0 || this.config.functions.length !== 0;
             const hasSpecifiedRegExPattern = this.regExPattern !== undefined && this.regExPattern !== '';
-            if (!hasSpecifiedFuntions && !hasSpecifiedRegExPattern) {
-                this.context.stdout.write('No functions specified for instrumentation.\n');
+            if (!hasSpecifiedFunctions && !hasSpecifiedRegExPattern) {
+                this.context.stdout.write(`${chalk_1.red('[Error]')} No functions specified for instrumentation.\n`);
                 return 1;
             }
             if (settings.extensionVersion && settings.forwarderARN) {
-                this.context.stdout.write('"extensionVersion" and "forwarder" should not be used at the same time.\n');
+                this.context.stdout.write(`${chalk_1.red('[Error]')} "extensionVersion" and "forwarder" should not be used at the same time.\n`);
                 return 1;
             }
             if (this.sourceCodeIntegration) {
                 if (!process.env.DATADOG_API_KEY) {
-                    this.context.stdout.write('Missing DATADOG_API_KEY in your environment\n');
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} Missing DATADOG_API_KEY in your environment\n`);
                     return 1;
                 }
                 try {
                     yield this.getGitDataAndUpload(settings);
                 }
                 catch (err) {
-                    this.context.stdout.write(`${err}\n`);
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} ${err}\n`);
                     return 1;
                 }
             }
             const configGroups = [];
             if (hasSpecifiedRegExPattern) {
-                if (hasSpecifiedFuntions) {
+                if (hasSpecifiedFunctions) {
                     const usedCommand = this.functions.length !== 0 ? '"--functions"' : 'Functions in config file';
-                    this.context.stdout.write(`${usedCommand} and "--functions-regex" should not be used at the same time.\n`);
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} ${usedCommand} and "--functions-regex" should not be used at the same time.\n`);
                     return 1;
                 }
                 if (this.regExPattern.match(':')) {
-                    this.context.stdout.write(`"--functions-regex" isn't meant to be used with ARNs.\n`);
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} "--functions-regex" isn't meant to be used with ARNs.\n`);
                     return 1;
                 }
                 const region = this.region || this.config.region;
                 if (!region) {
-                    this.context.stdout.write('No default region specified. Use `-r`, `--region`.');
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} No default region specified. Use \`-r\`, \`--region\`.\n`);
                     return 1;
                 }
                 try {
                     const cloudWatchLogs = new aws_sdk_1.CloudWatchLogs({ region });
                     const lambda = new aws_sdk_1.Lambda({ region });
-                    this.context.stdout.write('Fetching lambda functions, this might take a while.\n');
+                    this.context.stdout.write('Fetching Lambda functions, this might take a while.\n');
                     const configs = yield instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatchLogs, region, this.regExPattern, settings);
                     configGroups.push({ configs, lambda, cloudWatchLogs, region: region });
                 }
                 catch (err) {
-                    this.context.stdout.write(`Couldn't fetch lambda functions. ${err}\n`);
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. ${err}\n`);
                     return 1;
                 }
             }
@@ -96,7 +138,7 @@ class InstrumentCommand extends clipanion_1.Command {
                     functionGroups = commons_1.collectFunctionsByRegion(this.functions.length !== 0 ? this.functions : this.config.functions, this.region || this.config.region);
                 }
                 catch (err) {
-                    this.context.stdout.write(`Couldn't group functions. ${err}`);
+                    this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't group functions. ${err}`);
                     return 1;
                 }
                 for (const [region, functionList] of Object.entries(functionGroups)) {
@@ -107,7 +149,7 @@ class InstrumentCommand extends clipanion_1.Command {
                         configGroups.push({ configs, lambda, cloudWatchLogs, region });
                     }
                     catch (err) {
-                        this.context.stdout.write(`Couldn't fetch lambda functions. ${err}\n`);
+                        this.context.stdout.write(`${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. ${err}\n`);
                         return 1;
                     }
                 }
@@ -117,12 +159,21 @@ class InstrumentCommand extends clipanion_1.Command {
             if (this.dryRun || configList.length === 0) {
                 return 0;
             }
+            const willUpdate = commons_1.willUpdateFunctionConfigs(configList);
+            if (this.interactive && willUpdate) {
+                this.context.stdout.write(`${chalk_1.yellow('[!]')} Confirmation needed.\n`);
+                const isConfirmed = yield prompt_1.requestChangesConfirmation('Do you want to apply the changes?');
+                if (!isConfirmed) {
+                    return 0;
+                }
+                this.context.stdout.write(`${chalk_1.yellow('[!]')} Instrumenting functions.\n`);
+            }
             const promises = Object.values(configGroups).map((group) => commons_1.updateLambdaFunctionConfigs(group.lambda, group.cloudWatchLogs, group.configs));
             try {
                 yield Promise.all(promises);
             }
             catch (err) {
-                this.context.stdout.write(`Failure during update. ${err}\n`);
+                this.context.stdout.write(`${chalk_1.red('[Error]')} Failure during update. ${err}\n`);
                 return 1;
             }
             return 0;
@@ -170,7 +221,7 @@ class InstrumentCommand extends clipanion_1.Command {
         });
     }
     getSettings() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const layerVersionStr = (_a = this.layerVersion) !== null && _a !== void 0 ? _a : this.config.layerVersion;
         const extensionVersionStr = (_b = this.extensionVersion) !== null && _b !== void 0 ? _b : this.config.extensionVersion;
         const layerAWSAccount = (_c = this.layerAWSAccount) !== null && _c !== void 0 ? _c : this.config.layerAWSAccount;
@@ -192,9 +243,10 @@ class InstrumentCommand extends clipanion_1.Command {
             return;
         }
         const stringBooleansMap = {
-            flushMetricsToLogs: (_e = this.flushMetricsToLogs) !== null && _e !== void 0 ? _e : this.config.flushMetricsToLogs,
-            mergeXrayTraces: (_f = this.mergeXrayTraces) !== null && _f !== void 0 ? _f : this.config.mergeXrayTraces,
-            tracing: (_g = this.tracing) !== null && _g !== void 0 ? _g : this.config.tracing,
+            captureLambdaPayload: (_e = this.captureLambdaPayload) !== null && _e !== void 0 ? _e : this.config.captureLambdaPayload,
+            flushMetricsToLogs: (_f = this.flushMetricsToLogs) !== null && _f !== void 0 ? _f : this.config.flushMetricsToLogs,
+            mergeXrayTraces: (_g = this.mergeXrayTraces) !== null && _g !== void 0 ? _g : this.config.mergeXrayTraces,
+            tracing: (_h = this.tracing) !== null && _h !== void 0 ? _h : this.config.tracing,
         };
         for (const [stringBoolean, value] of Object.entries(stringBooleansMap)) {
             if (!['true', 'false', undefined].includes(value === null || value === void 0 ? void 0 : value.toString().toLowerCase())) {
@@ -202,13 +254,15 @@ class InstrumentCommand extends clipanion_1.Command {
                 return;
             }
         }
+        const captureLambdaPayload = commons_1.coerceBoolean(false, this.captureLambdaPayload, this.config.captureLambdaPayload);
         const flushMetricsToLogs = commons_1.coerceBoolean(true, this.flushMetricsToLogs, this.config.flushMetricsToLogs);
         const mergeXrayTraces = commons_1.coerceBoolean(false, this.mergeXrayTraces, this.config.mergeXrayTraces);
         const tracingEnabled = commons_1.coerceBoolean(true, this.tracing, this.config.tracing);
-        const logLevel = (_h = this.logLevel) !== null && _h !== void 0 ? _h : this.config.logLevel;
-        const service = (_j = this.service) !== null && _j !== void 0 ? _j : this.config.service;
-        const environment = (_k = this.environment) !== null && _k !== void 0 ? _k : this.config.environment;
-        const version = (_l = this.version) !== null && _l !== void 0 ? _l : this.config.version;
+        const interactive = commons_1.coerceBoolean(false, this.interactive, this.config.interactive);
+        const logLevel = (_j = this.logLevel) !== null && _j !== void 0 ? _j : this.config.logLevel;
+        const service = (_k = this.service) !== null && _k !== void 0 ? _k : this.config.service;
+        const environment = (_l = this.environment) !== null && _l !== void 0 ? _l : this.config.environment;
+        const version = (_m = this.version) !== null && _m !== void 0 ? _m : this.config.version;
         const tagsMap = {
             environment,
             service,
@@ -225,17 +279,19 @@ class InstrumentCommand extends clipanion_1.Command {
             const plural = tagsMissing.length > 1;
             this.context.stdout.write(`${chalk_1.bold(chalk_1.yellow('[Warning]'))} The ${tags} tag${plural ? 's have' : ' has'} not been configured. Learn more about Datadog unified service tagging: ${chalk_1.underline(chalk_1.blueBright('https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/#serverless-environment.'))}\n`);
         }
-        const extraTags = (_o = (_m = this.extraTags) === null || _m === void 0 ? void 0 : _m.toLowerCase()) !== null && _o !== void 0 ? _o : (_p = this.config.extraTags) === null || _p === void 0 ? void 0 : _p.toLowerCase();
+        const extraTags = (_p = (_o = this.extraTags) === null || _o === void 0 ? void 0 : _o.toLowerCase()) !== null && _p !== void 0 ? _p : (_q = this.config.extraTags) === null || _q === void 0 ? void 0 : _q.toLowerCase();
         if (extraTags && !commons_1.sentenceMatchesRegEx(extraTags, constants_1.EXTRA_TAGS_REG_EXP)) {
             this.context.stdout.write('Extra tags do not comply with the <key>:<value> array.\n');
             return;
         }
         return {
+            captureLambdaPayload,
             environment,
             extensionVersion,
             extraTags,
             flushMetricsToLogs,
             forwarderARN,
+            interactive,
             layerAWSAccount,
             layerVersion,
             logLevel,
@@ -246,20 +302,9 @@ class InstrumentCommand extends clipanion_1.Command {
         };
     }
     printPlannedActions(configs) {
-        var _a, _b, _c;
         const prefix = this.dryRun ? chalk_1.bold(chalk_1.cyan('[Dry Run] ')) : '';
-        let anyUpdates = false;
-        for (const config of configs) {
-            if (config.updateRequest !== undefined ||
-                ((_a = config.logGroupConfiguration) === null || _a === void 0 ? void 0 : _a.createLogGroupRequest) !== undefined ||
-                ((_b = config.logGroupConfiguration) === null || _b === void 0 ? void 0 : _b.deleteSubscriptionFilterRequest) !== undefined ||
-                ((_c = config.logGroupConfiguration) === null || _c === void 0 ? void 0 : _c.subscriptionFilterRequest) !== undefined ||
-                (config === null || config === void 0 ? void 0 : config.tagConfiguration) !== undefined) {
-                anyUpdates = true;
-                break;
-            }
-        }
-        if (!anyUpdates) {
+        const willUpdate = commons_1.willUpdateFunctionConfigs(configs);
+        if (!willUpdate) {
             this.context.stdout.write(`\n${prefix}No updates will be applied\n`);
             return;
         }
@@ -267,6 +312,12 @@ class InstrumentCommand extends clipanion_1.Command {
         this.context.stdout.write(`\n${chalk_1.bold(chalk_1.yellow('[!]'))} Functions to be updated:\n`);
         for (const config of configs) {
             this.context.stdout.write(`\t- ${chalk_1.bold(config.functionARN)}\n`);
+            // Later, we should inform which layer is the latest.
+            if (this.interactive) {
+                if (!this.extensionVersion || !this.extensionVersion) {
+                    this.context.stdout.write(`\t${chalk_1.bold(chalk_1.yellow('[Warning]'))} At least one latest layer version is being used. Ensure to lock in versions for production applications using \`--layerVersion\` and \`--extensionVersion\`.\n`);
+                }
+            }
         }
         this.context.stdout.write(`\n${prefix}Will apply the following updates:\n`);
         for (const config of configs) {
@@ -302,20 +353,22 @@ class InstrumentCommand extends clipanion_1.Command {
 exports.InstrumentCommand = InstrumentCommand;
 InstrumentCommand.addPath('lambda', 'instrument');
 InstrumentCommand.addOption('functions', clipanion_1.Command.Array('-f,--function'));
-InstrumentCommand.addOption('regExPattern', clipanion_1.Command.String('--functions-regex'));
+InstrumentCommand.addOption('regExPattern', clipanion_1.Command.String('--functions-regex,--functionsRegex'));
 InstrumentCommand.addOption('region', clipanion_1.Command.String('-r,--region'));
-InstrumentCommand.addOption('extensionVersion', clipanion_1.Command.String('-e,--extensionVersion'));
-InstrumentCommand.addOption('layerVersion', clipanion_1.Command.String('-v,--layerVersion'));
-InstrumentCommand.addOption('layerAWSAccount', clipanion_1.Command.String('-a,--layerAccount', { hidden: true }));
+InstrumentCommand.addOption('extensionVersion', clipanion_1.Command.String('-e,--extension-version,--extensionVersion'));
+InstrumentCommand.addOption('layerVersion', clipanion_1.Command.String('-v,--layer-version,--layerVersion'));
+InstrumentCommand.addOption('layerAWSAccount', clipanion_1.Command.String('-a,--layer-account,--layerAccount', { hidden: true }));
 InstrumentCommand.addOption('tracing', clipanion_1.Command.String('--tracing'));
-InstrumentCommand.addOption('mergeXrayTraces', clipanion_1.Command.String('--mergeXrayTraces'));
-InstrumentCommand.addOption('flushMetricsToLogs', clipanion_1.Command.String('--flushMetricsToLogs'));
+InstrumentCommand.addOption('mergeXrayTraces', clipanion_1.Command.String('--merge-xray-traces,--mergeXrayTraces'));
+InstrumentCommand.addOption('flushMetricsToLogs', clipanion_1.Command.String('--flush-metrics-to-logs,--flushMetricsToLogs'));
 InstrumentCommand.addOption('dryRun', clipanion_1.Command.Boolean('-d,--dry'));
 InstrumentCommand.addOption('configPath', clipanion_1.Command.String('--config'));
 InstrumentCommand.addOption('forwarder', clipanion_1.Command.String('--forwarder'));
-InstrumentCommand.addOption('logLevel', clipanion_1.Command.String('--logLevel'));
+InstrumentCommand.addOption('logLevel', clipanion_1.Command.String('--log-level,--logLevel'));
 InstrumentCommand.addOption('service', clipanion_1.Command.String('--service'));
 InstrumentCommand.addOption('environment', clipanion_1.Command.String('--env'));
 InstrumentCommand.addOption('version', clipanion_1.Command.String('--version'));
-InstrumentCommand.addOption('extraTags', clipanion_1.Command.String('--extra-tags'));
-InstrumentCommand.addOption('sourceCodeIntegration', clipanion_1.Command.Boolean('-s,--source-code-integration'));
+InstrumentCommand.addOption('extraTags', clipanion_1.Command.String('--extra-tags,--extraTags'));
+InstrumentCommand.addOption('sourceCodeIntegration', clipanion_1.Command.Boolean('-s,--source-code-integration,--sourceCodeIntegration'));
+InstrumentCommand.addOption('interactive', clipanion_1.Command.Boolean('-i,--interactive'));
+InstrumentCommand.addOption('captureLambdaPayload', clipanion_1.Command.String('--capture-lambda-payload,--captureLambdaPayload'));

package/dist/commands/lambda/interfaces.d.ts

@@ -4,12 +4,14 @@ import { CloudWatchLogs, Lambda } from 'aws-sdk';
  * the CLI in order to instrument properly.
  */
 export interface LambdaConfigOptions {
+    captureLambdaPayload?: string;
     environment?: string;
     extensionVersion?: string;
     extraTags?: string;
     flushMetricsToLogs?: string;
     forwarder?: string;
     functions: string[];
+    interactive?: boolean;
     layerAWSAccount?: string;
     layerVersion?: string;
     logLevel?: string;
@@ -36,9 +38,11 @@ export interface FunctionConfiguration {
  * lambda to be instrumented.
  */
 export interface InstrumentationSettings extends InstrumentationTags {
+    captureLambdaPayload?: boolean;
     extensionVersion?: number;
     flushMetricsToLogs: boolean;
     forwarderARN?: string;
+    interactive?: boolean;
     layerAWSAccount?: string;
     layerVersion?: number;
     logLevel?: string;

package/dist/commands/lambda/prompt.d.ts

@@ -0,0 +1,9 @@
+import { CheckboxQuestion, ConfirmQuestion, InputQuestion, ListQuestion } from 'inquirer';
+export declare const datadogApiKeyTypeQuestion: (datadogSite: string) => ListQuestion;
+export declare const datadogEnvVarsQuestions: (datadogApiKeyType: Record<string, any>) => InputQuestion;
+export declare const confirmationQuestion: (message: string) => ConfirmQuestion;
+export declare const functionSelectionQuestion: (functionNames: string[]) => CheckboxQuestion;
+export declare const requestAWSCredentials: () => Promise<void>;
+export declare const requestDatadogEnvVars: () => Promise<void>;
+export declare const requestChangesConfirmation: (message: string) => Promise<any>;
+export declare const requestFunctionSelection: (functionNames: string[]) => Promise<any>;