@datadog/datadog-ci 0.17.9 → 0.17.13

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

@@ -9,107 +9,61 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateUpdateRequest = exports.getExtensionArn = exports.getLayerArn = exports.getLambdaConfigsFromRegEx = exports.getFunctionConfig = exports.getFunctionConfigs = void 0;
+exports.calculateUpdateRequest = exports.getInstrumentedFunctionConfigsFromRegEx = exports.getInstrumentedFunctionConfig = exports.getInstrumentedFunctionConfigs = void 0;
 const constants_1 = require("../constants");
 const loggroup_1 = require("../loggroup");
 const tags_1 = require("../tags");
 const commons_1 = require("./commons");
-const getFunctionConfigs = (lambda, cloudWatch, region, functionARNs, settings) => __awaiter(void 0, void 0, void 0, function* () {
+const getInstrumentedFunctionConfigs = (lambda, cloudWatch, region, functionARNs, settings) => __awaiter(void 0, void 0, void 0, function* () {
     const lambdaFunctionConfigs = yield commons_1.getLambdaFunctionConfigs(lambda, functionARNs);
     const configs = [];
     for (const config of lambdaFunctionConfigs) {
-        const functionConfig = yield exports.getFunctionConfig(lambda, cloudWatch, config, region, settings);
+        const functionConfig = yield exports.getInstrumentedFunctionConfig(lambda, cloudWatch, config, region, settings);
         configs.push(functionConfig);
     }
     return configs;
 });
-exports.getFunctionConfigs = getFunctionConfigs;
-const getFunctionConfig = (lambda, cloudWatch, config, region, settings) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getInstrumentedFunctionConfigs = getInstrumentedFunctionConfigs;
+const getInstrumentedFunctionConfig = (lambda, cloudWatch, config, region, settings) => __awaiter(void 0, void 0, void 0, function* () {
     const functionARN = config.FunctionArn;
     const runtime = config.Runtime;
     if (!commons_1.isSupportedRuntime(runtime)) {
         throw Error(`Can't instrument ${functionARN}, runtime ${runtime} not supported`);
     }
     yield commons_1.isLambdaActive(lambda, config, functionARN);
-    const lambdaLibraryLayerArn = exports.getLayerArn(runtime, settings, region);
-    const lambdaExtensionLayerArn = exports.getExtensionArn(settings, region);
-    const updateRequest = exports.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
+    const updateRequest = yield exports.calculateUpdateRequest(config, settings, region, runtime);
     let logGroupConfiguration;
     if (settings.forwarderARN !== undefined) {
-        const arn = `/aws/lambda/${config.FunctionName}`;
-        logGroupConfiguration = yield loggroup_1.calculateLogGroupUpdateRequest(cloudWatch, arn, settings.forwarderARN);
+        const logGroupName = `/aws/lambda/${config.FunctionName}`;
+        logGroupConfiguration = yield loggroup_1.calculateLogGroupUpdateRequest(cloudWatch, logGroupName, settings.forwarderARN);
     }
     const tagConfiguration = yield tags_1.calculateTagUpdateRequest(lambda, functionARN);
     return {
         functionARN,
         lambdaConfig: config,
-        lambdaLibraryLayerArn,
         logGroupConfiguration,
         tagConfiguration,
         updateRequest,
     };
 });
-exports.getFunctionConfig = getFunctionConfig;
-const getLambdaConfigsFromRegEx = (lambda, cloudWatch, region, pattern, settings) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const regEx = new RegExp(pattern);
-    const matchedFunctions = [];
-    let retryCount = 0;
-    let listFunctionsResponse;
-    let nextMarker;
-    while (true) {
-        try {
-            listFunctionsResponse = yield lambda.listFunctions({ Marker: nextMarker }).promise();
-            (_a = listFunctionsResponse.Functions) === null || _a === void 0 ? void 0 : _a.map((fn) => { var _a; return ((_a = fn.FunctionName) === null || _a === void 0 ? void 0 : _a.match(regEx)) && matchedFunctions.push(fn); });
-            nextMarker = listFunctionsResponse.NextMarker;
-            if (!nextMarker) {
-                break;
-            }
-            retryCount = 0;
-        }
-        catch (e) {
-            retryCount++;
-            if (retryCount > constants_1.LIST_FUNCTIONS_MAX_RETRY_COUNT) {
-                throw Error('Max retry count exceeded.');
-            }
-        }
-    }
+exports.getInstrumentedFunctionConfig = getInstrumentedFunctionConfig;
+const getInstrumentedFunctionConfigsFromRegEx = (lambda, cloudWatch, region, pattern, settings) => __awaiter(void 0, void 0, void 0, function* () {
+    const matchedFunctions = yield commons_1.getLambdaFunctionConfigsFromRegex(lambda, pattern);
     const functionsToUpdate = [];
     for (const config of matchedFunctions) {
-        const functionConfig = yield exports.getFunctionConfig(lambda, cloudWatch, config, region, settings);
+        const functionConfig = yield exports.getInstrumentedFunctionConfig(lambda, cloudWatch, config, region, settings);
         functionsToUpdate.push(functionConfig);
     }
     return functionsToUpdate;
 });
-exports.getLambdaConfigsFromRegEx = getLambdaConfigsFromRegEx;
-const getLayerArn = (runtime, settings, region) => {
-    var _a;
-    const layerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
-    const account = (_a = settings.layerAWSAccount) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_LAYER_AWS_ACCOUNT;
-    const isGovCloud = region.startsWith('us-gov');
-    if (isGovCloud) {
-        return `arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:${layerName}`;
-    }
-    return `arn:aws:lambda:${region}:${account}:layer:${layerName}`;
-};
-exports.getLayerArn = getLayerArn;
-const getExtensionArn = (settings, region) => {
-    var _a;
-    const layerName = constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME;
-    const account = (_a = settings.layerAWSAccount) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_LAYER_AWS_ACCOUNT;
-    const isGovCloud = region.startsWith('us-gov');
-    if (isGovCloud) {
-        return `arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:${layerName}`;
-    }
-    return `arn:aws:lambda:${region}:${account}:layer:${layerName}`;
-};
-exports.getExtensionArn = getExtensionArn;
-const calculateUpdateRequest = (config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime) => {
-    var _a, _b, _c, _d, _e;
+exports.getInstrumentedFunctionConfigsFromRegEx = getInstrumentedFunctionConfigsFromRegEx;
+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 = {};
     const functionARN = config.FunctionArn;
     const apiKey = process.env[constants_1.CI_API_KEY_ENV_VAR];
+    const apiKeySecretArn = process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR];
     const apiKmsKey = process.env[constants_1.CI_KMS_API_KEY_ENV_VAR];
     const site = process.env[constants_1.CI_SITE_ENV_VAR];
     if (functionARN === undefined) {
@@ -130,22 +84,31 @@ const calculateUpdateRequest = (config, settings, lambdaLibraryLayerArn, lambdaE
         needsUpdate = true;
         changedEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR] = (_b = config.Handler) !== null && _b !== void 0 ? _b : '';
     }
-    if (apiKey !== undefined && oldEnvVars[constants_1.API_KEY_ENV_VAR] !== apiKey) {
-        needsUpdate = true;
-        changedEnvVars[constants_1.API_KEY_ENV_VAR] = apiKey;
-    }
+    // KMS > Secrets Manager > API Key
     if (apiKmsKey !== undefined && oldEnvVars[constants_1.KMS_API_KEY_ENV_VAR] !== apiKmsKey) {
         needsUpdate = true;
         changedEnvVars[constants_1.KMS_API_KEY_ENV_VAR] = apiKmsKey;
     }
+    else if (apiKeySecretArn !== undefined && oldEnvVars[constants_1.API_KEY_SECRET_ARN_ENV_VAR] !== apiKeySecretArn) {
+        const isNode = constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.NODE;
+        const isSendingSynchronousMetrics = settings.extensionVersion === undefined && !settings.flushMetricsToLogs;
+        if (isSendingSynchronousMetrics && isNode) {
+            throw new Error('`apiKeySecretArn` is not supported for Node runtimes when using Synchronous Metrics. Use either `apiKey` or `apiKmsKey`.');
+        }
+        needsUpdate = true;
+        changedEnvVars[constants_1.API_KEY_SECRET_ARN_ENV_VAR] = apiKeySecretArn;
+    }
+    else if (apiKey !== undefined && oldEnvVars[constants_1.API_KEY_ENV_VAR] !== apiKey) {
+        needsUpdate = true;
+        changedEnvVars[constants_1.API_KEY_ENV_VAR] = apiKey;
+    }
     if (site !== undefined && oldEnvVars[constants_1.SITE_ENV_VAR] !== site) {
-        const siteList = ['datadoghq.com', 'datadoghq.eu', 'us3.datadoghq.com', 'ddog-gov.com'];
-        if (siteList.includes(site.toLowerCase())) {
+        if (constants_1.SITES.includes(site.toLowerCase())) {
             needsUpdate = true;
             changedEnvVars[constants_1.SITE_ENV_VAR] = site;
         }
         else {
-            throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, or ddog-gov.com.');
+            throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, or ddog-gov.com.');
         }
     }
     if (site === undefined && oldEnvVars[constants_1.SITE_ENV_VAR] === undefined) {
@@ -153,9 +116,9 @@ const calculateUpdateRequest = (config, settings, lambdaLibraryLayerArn, lambdaE
         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],
-        ['flushMetricsToLogs', constants_1.FLUSH_TO_LOG_ENV_VAR],
         ['mergeXrayTraces', constants_1.MERGE_XRAY_TRACES_ENV_VAR],
         ['service', constants_1.SERVICE_ENV_VAR],
         ['tracingEnabled', constants_1.TRACE_ENABLED_ENV_VAR],
@@ -167,6 +130,14 @@ const calculateUpdateRequest = (config, settings, lambdaLibraryLayerArn, lambdaE
             changedEnvVars[environmentVar] = settings[key].toString();
         }
     }
+    // Skip adding DD_FLUSH_TO_LOGS when using Extension
+    const isUsingExtension = settings.extensionVersion !== undefined;
+    if (!isUsingExtension &&
+        settings.flushMetricsToLogs !== undefined &&
+        oldEnvVars[constants_1.FLUSH_TO_LOG_ENV_VAR] !== ((_d = settings.flushMetricsToLogs) === null || _d === void 0 ? void 0 : _d.toString())) {
+        needsUpdate = true;
+        changedEnvVars[constants_1.FLUSH_TO_LOG_ENV_VAR] = settings.flushMetricsToLogs.toString();
+    }
     const newEnvVars = Object.assign(Object.assign({}, oldEnvVars), changedEnvVars);
     if (newEnvVars[constants_1.LOG_LEVEL_ENV_VAR] !== settings.logLevel) {
         needsUpdate = true;
@@ -181,19 +152,30 @@ const calculateUpdateRequest = (config, settings, lambdaLibraryLayerArn, lambdaE
         Variables: newEnvVars,
     };
     // Update Layers
+    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 = ((_d = config.Layers) !== null && _d !== void 0 ? _d : []).map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; });
-    const originalLayerARNs = ((_e = config.Layers) !== null && _e !== void 0 ? _e : []).map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; });
+    let layerARNs = commons_1.getLayers(config);
+    const originalLayerARNs = layerARNs;
     let needsLayerUpdate = false;
-    layerARNs = commons_1.addLayerARN(fullLambdaLibraryLayerARN, lambdaLibraryLayerArn, layerARNs);
-    layerARNs = commons_1.addLayerARN(fullExtensionLayerARN, lambdaExtensionLayerArn, layerARNs);
+    layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerARN, lambraLibraryLayerName, layerARNs);
+    layerARNs = commons_1.addLayerArn(fullExtensionLayerARN, constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME, layerARNs);
     if (originalLayerARNs.sort().join(',') !== layerARNs.sort().join(',')) {
         needsLayerUpdate = true;
     }
@@ -204,10 +186,11 @@ const calculateUpdateRequest = (config, settings, lambdaLibraryLayerArn, lambdaE
     layerARNs.forEach((layerARN) => {
         if (layerARN.includes(constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME) &&
             newEnvVars[constants_1.API_KEY_ENV_VAR] === undefined &&
+            newEnvVars[constants_1.API_KEY_SECRET_ARN_ENV_VAR] === undefined &&
             newEnvVars[constants_1.KMS_API_KEY_ENV_VAR] === undefined) {
-            throw new Error(`When 'extensionLayer' is set, ${constants_1.CI_API_KEY_ENV_VAR} or ${constants_1.CI_KMS_API_KEY_ENV_VAR} must also be set`);
+            throw new Error(`When 'extensionLayer' is set, ${constants_1.CI_API_KEY_ENV_VAR}, ${constants_1.CI_KMS_API_KEY_ENV_VAR}, or ${constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR} must also be set`);
         }
     });
     return needsUpdate ? updateRequest : undefined;
-};
+});
 exports.calculateUpdateRequest = calculateUpdateRequest;

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

@@ -1,6 +1,7 @@
 import { CloudWatchLogs, Lambda } from 'aws-sdk';
 import { Runtime } from '../constants';
 import { FunctionConfiguration } from '../interfaces';
-export declare const getFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, functionARNs: string[], forwarderARN: string | undefined) => Promise<FunctionConfiguration[]>;
-export declare const getFunctionConfig: (lambda: Lambda, cloudWatch: CloudWatchLogs, config: Lambda.FunctionConfiguration, forwarderARN: string | undefined) => Promise<FunctionConfiguration>;
+export declare const getUninstrumentedFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, functionARNs: string[], forwarderARN: string | undefined) => Promise<FunctionConfiguration[]>;
+export declare const getUninstrumentedFunctionConfig: (lambda: Lambda, cloudWatch: CloudWatchLogs, config: Lambda.FunctionConfiguration, forwarderARN: string | undefined) => Promise<FunctionConfiguration>;
+export declare const getUninstrumentedFunctionConfigsFromRegEx: (lambda: Lambda, cloudWatch: CloudWatchLogs, pattern: string, forwarderArn: string | undefined) => Promise<FunctionConfiguration[]>;
 export declare const calculateUpdateRequest: (config: Lambda.FunctionConfiguration, runtime: Runtime) => Lambda.UpdateFunctionConfigurationRequest | undefined;

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

@@ -9,22 +9,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateUpdateRequest = exports.getFunctionConfig = exports.getFunctionConfigs = void 0;
+exports.calculateUpdateRequest = exports.getUninstrumentedFunctionConfigsFromRegEx = exports.getUninstrumentedFunctionConfig = exports.getUninstrumentedFunctionConfigs = void 0;
 const constants_1 = require("../constants");
 const loggroup_1 = require("../loggroup");
 const tags_1 = require("../tags");
 const commons_1 = require("./commons");
-const getFunctionConfigs = (lambda, cloudWatch, functionARNs, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
+const getUninstrumentedFunctionConfigs = (lambda, cloudWatch, functionARNs, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
     const lambdaFunctionConfigs = yield commons_1.getLambdaFunctionConfigs(lambda, functionARNs);
     const configs = [];
     for (const config of lambdaFunctionConfigs) {
-        const functionConfig = yield exports.getFunctionConfig(lambda, cloudWatch, config, forwarderARN);
+        const functionConfig = yield exports.getUninstrumentedFunctionConfig(lambda, cloudWatch, config, forwarderARN);
         configs.push(functionConfig);
     }
     return configs;
 });
-exports.getFunctionConfigs = getFunctionConfigs;
-const getFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getUninstrumentedFunctionConfigs = getUninstrumentedFunctionConfigs;
+const getUninstrumentedFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
     const functionARN = config.FunctionArn;
     const runtime = config.Runtime;
     if (!commons_1.isSupportedRuntime(runtime)) {
@@ -33,8 +33,8 @@ const getFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaite
     const updateRequest = exports.calculateUpdateRequest(config, runtime);
     let logGroupConfiguration;
     if (forwarderARN) {
-        const arn = `/aws/lambda/${config.FunctionName}`;
-        logGroupConfiguration = yield loggroup_1.calculateLogGroupRemoveRequest(cloudWatch, arn, forwarderARN);
+        const logGroupName = `/aws/lambda/${config.FunctionName}`;
+        logGroupConfiguration = yield loggroup_1.calculateLogGroupRemoveRequest(cloudWatch, logGroupName, forwarderARN);
     }
     const tagConfiguration = yield tags_1.calculateTagRemoveRequest(lambda, functionARN);
     return {
@@ -45,9 +45,19 @@ const getFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaite
         updateRequest,
     };
 });
-exports.getFunctionConfig = getFunctionConfig;
+exports.getUninstrumentedFunctionConfig = getUninstrumentedFunctionConfig;
+const getUninstrumentedFunctionConfigsFromRegEx = (lambda, cloudWatch, pattern, forwarderArn) => __awaiter(void 0, void 0, void 0, function* () {
+    const matchedFunctions = yield commons_1.getLambdaFunctionConfigsFromRegex(lambda, pattern);
+    const functionsToUpdate = [];
+    for (const config of matchedFunctions) {
+        const functionConfig = yield exports.getUninstrumentedFunctionConfig(lambda, cloudWatch, config, forwarderArn);
+        functionsToUpdate.push(functionConfig);
+    }
+    return functionsToUpdate;
+});
+exports.getUninstrumentedFunctionConfigsFromRegEx = getUninstrumentedFunctionConfigsFromRegEx;
 const calculateUpdateRequest = (config, runtime) => {
-    var _a, _b, _c;
+    var _a, _b;
     const oldEnvVars = Object.assign({}, (_a = config.Environment) === null || _a === void 0 ? void 0 : _a.Variables);
     const functionARN = config.FunctionArn;
     if (functionARN === undefined) {
@@ -70,8 +80,10 @@ const calculateUpdateRequest = (config, runtime) => {
      */
     const environmentVarsArray = [
         constants_1.API_KEY_ENV_VAR,
+        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,
@@ -94,8 +106,8 @@ const calculateUpdateRequest = (config, runtime) => {
     // Remove Layers
     let needsLayerRemoval = false;
     const lambdaLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
-    const originalLayerARNs = ((_b = config.Layers) !== null && _b !== void 0 ? _b : []).map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; });
-    const layerARNs = ((_c = config.Layers) !== null && _c !== void 0 ? _c : [])
+    const originalLayerARNs = commons_1.getLayers(config);
+    const layerARNs = ((_b = config.Layers) !== null && _b !== void 0 ? _b : [])
         .filter((layer) => { var _a, _b; return !((_a = layer.Arn) === null || _a === void 0 ? void 0 : _a.includes(lambdaLibraryLayerName)) && !((_b = layer.Arn) === null || _b === void 0 ? void 0 : _b.includes(constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME)); })
         .map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; });
     if (originalLayerARNs.sort().join(',') !== layerARNs.sort().join(',')) {

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?;
@@ -20,7 +22,6 @@ export declare class InstrumentCommand extends Command {
     private tracing?;
     private version?;
     execute(): Promise<1 | 0>;
-    private convertStringBooleanToBoolean;
     private getCurrentGitStatus;
     private getGitDataAndUpload;
     private getSettings;