@datadog/datadog-ci 0.17.9 → 0.17.13

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

@@ -1,30 +1,41 @@
+export declare const DD_LAMBDA_EXTENSION_LAYER_NAME = "Datadog-Extension";
+export declare const EXTENSION_LAYER_KEY = "extension";
 export declare const RUNTIME_LAYER_LOOKUP: {
-    readonly 'nodejs10.x': "Datadog-Node10-x";
+    readonly extension: "Datadog-Extension";
     readonly 'nodejs12.x': "Datadog-Node12-x";
     readonly 'nodejs14.x': "Datadog-Node14-x";
-    readonly 'python2.7': "Datadog-Python27";
     readonly 'python3.6': "Datadog-Python36";
     readonly 'python3.7': "Datadog-Python37";
     readonly 'python3.8': "Datadog-Python38";
     readonly 'python3.9': "Datadog-Python39";
 };
-export declare type Runtime = keyof typeof RUNTIME_LAYER_LOOKUP;
+export declare type Runtime = Exclude<keyof typeof RUNTIME_LAYER_LOOKUP, typeof EXTENSION_LAYER_KEY>;
+export declare const ARM_RUNTIMES: string[];
+export declare const ARM64_ARCHITECTURE = "arm64";
+export declare const ARM_LAYER_SUFFIX = "-ARM";
+export declare enum RuntimeType {
+    NODE = 0,
+    PYTHON = 1
+}
+export declare const RUNTIME_LOOKUP: {
+    [key: string]: RuntimeType;
+};
 export declare const HANDLER_LOCATION: {
-    'nodejs10.x': string;
     'nodejs12.x': string;
     'nodejs14.x': string;
-    'python2.7': string;
     'python3.6': string;
     'python3.7': string;
     'python3.8': string;
     'python3.9': string;
 };
+export declare const SITES: string[];
+export declare const AWS_REGIONS: string[];
 export declare const DEFAULT_LAYER_AWS_ACCOUNT = "464622532012";
 export declare const GOVCLOUD_LAYER_AWS_ACCOUNT = "002406178527";
 export declare const SUBSCRIPTION_FILTER_NAME = "datadog-ci-filter";
 export declare const TAG_VERSION_NAME = "dd_sls_ci";
-export declare const DD_LAMBDA_EXTENSION_LAYER_NAME = "Datadog-Extension";
 export declare const API_KEY_ENV_VAR = "DD_API_KEY";
+export declare const API_KEY_SECRET_ARN_ENV_VAR = "DD_API_KEY_SECRET_ARN";
 export declare const KMS_API_KEY_ENV_VAR = "DD_KMS_API_KEY";
 export declare const SITE_ENV_VAR = "DD_SITE";
 export declare const TRACE_ENABLED_ENV_VAR = "DD_TRACE_ENABLED";
@@ -36,9 +47,19 @@ export declare const SERVICE_ENV_VAR = "DD_SERVICE";
 export declare const VERSION_ENV_VAR = "DD_VERSION";
 export declare const ENVIRONMENT_ENV_VAR = "DD_ENV";
 export declare const EXTRA_TAGS_ENV_VAR = "DD_TAGS";
+export declare const CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = "DD_CAPTURE_LAMBDA_PAYLOAD";
 export declare const CI_SITE_ENV_VAR = "DATADOG_SITE";
 export declare const CI_API_KEY_ENV_VAR = "DATADOG_API_KEY";
+export declare const CI_API_KEY_SECRET_ARN_ENV_VAR = "DATADOG_API_KEY_SECRET_ARN";
 export declare const CI_KMS_API_KEY_ENV_VAR = "DATADOG_KMS_API_KEY";
+export declare const AWS_ACCESS_KEY_ID_ENV_VAR = "AWS_ACCESS_KEY_ID";
+export declare const AWS_SECRET_ACCESS_KEY_ENV_VAR = "AWS_SECRET_ACCESS_KEY";
+export declare const AWS_DEFAULT_REGION_ENV_VAR = "AWS_DEFAULT_REGION";
+export declare const AWS_SESSION_TOKEN_ENV_VAR = "AWS_SESSION_TOKEN";
 export declare const LIST_FUNCTIONS_MAX_RETRY_COUNT = 2;
 export declare const MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;
 export declare const EXTRA_TAGS_REG_EXP: RegExp;
+export declare const AWS_ACCESS_KEY_ID_REG_EXP: RegExp;
+export declare const AWS_SECRET_ACCESS_KEY_REG_EXP: RegExp;
+export declare const DATADOG_API_KEY_REG_EXP: RegExp;
+export declare const DATADOG_APP_KEY_REG_EXP: RegExp;

package/dist/commands/lambda/constants.js

@@ -1,35 +1,82 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_ENV_VAR = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.HANDLER_LOCATION = exports.RUNTIME_LAYER_LOOKUP = void 0;
+exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.API_KEY_ENV_VAR = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.AWS_REGIONS = exports.SITES = exports.HANDLER_LOCATION = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_RUNTIMES = exports.RUNTIME_LAYER_LOOKUP = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
+exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
+exports.EXTENSION_LAYER_KEY = 'extension';
 exports.RUNTIME_LAYER_LOOKUP = {
-    'nodejs10.x': 'Datadog-Node10-x',
+    [exports.EXTENSION_LAYER_KEY]: exports.DD_LAMBDA_EXTENSION_LAYER_NAME,
     'nodejs12.x': 'Datadog-Node12-x',
     'nodejs14.x': 'Datadog-Node14-x',
-    'python2.7': 'Datadog-Python27',
     'python3.6': 'Datadog-Python36',
     'python3.7': 'Datadog-Python37',
     'python3.8': 'Datadog-Python38',
     'python3.9': 'Datadog-Python39',
 };
+exports.ARM_RUNTIMES = [exports.EXTENSION_LAYER_KEY, 'python3.8', 'python3.9'];
+exports.ARM64_ARCHITECTURE = 'arm64';
+exports.ARM_LAYER_SUFFIX = '-ARM';
+var RuntimeType;
+(function (RuntimeType) {
+    RuntimeType[RuntimeType["NODE"] = 0] = "NODE";
+    RuntimeType[RuntimeType["PYTHON"] = 1] = "PYTHON";
+})(RuntimeType = exports.RuntimeType || (exports.RuntimeType = {}));
+exports.RUNTIME_LOOKUP = {
+    'nodejs12.x': RuntimeType.NODE,
+    'nodejs14.x': RuntimeType.NODE,
+    'python3.6': RuntimeType.PYTHON,
+    'python3.7': RuntimeType.PYTHON,
+    'python3.8': RuntimeType.PYTHON,
+    'python3.9': RuntimeType.PYTHON,
+};
 const PYTHON_HANDLER_LOCATION = 'datadog_lambda.handler.handler';
 const NODE_HANDLER_LOCATION = '/opt/nodejs/node_modules/datadog-lambda-js/handler.handler';
 exports.HANDLER_LOCATION = {
-    'nodejs10.x': NODE_HANDLER_LOCATION,
     'nodejs12.x': NODE_HANDLER_LOCATION,
     'nodejs14.x': NODE_HANDLER_LOCATION,
-    'python2.7': PYTHON_HANDLER_LOCATION,
     'python3.6': PYTHON_HANDLER_LOCATION,
     'python3.7': PYTHON_HANDLER_LOCATION,
     'python3.8': PYTHON_HANDLER_LOCATION,
     'python3.9': PYTHON_HANDLER_LOCATION,
 };
+exports.SITES = [
+    'datadoghq.com',
+    'datadoghq.eu',
+    'us3.datadoghq.com',
+    'us5.datadoghq.com',
+    'ddog-gov.com',
+];
+exports.AWS_REGIONS = [
+    'us-east-1',
+    'us-east-2',
+    'us-west-1',
+    'us-west-2',
+    'af-south-1',
+    'ap-east-1',
+    'ap-south-1',
+    'ap-northeast-3',
+    'ap-northeast-2',
+    'ap-southeast-1',
+    'ap-southeast-2',
+    'ap-northeast-1',
+    'ca-central-1',
+    'eu-central-1',
+    'eu-west-1',
+    'eu-west-2',
+    'eu-south-1',
+    'eu-west-3',
+    'eu-north-1',
+    'me-south-1',
+    'sa-east-1',
+    'us-gov-east-1',
+    'us-gov-west-1',
+];
 exports.DEFAULT_LAYER_AWS_ACCOUNT = '464622532012';
 exports.GOVCLOUD_LAYER_AWS_ACCOUNT = '002406178527';
 exports.SUBSCRIPTION_FILTER_NAME = 'datadog-ci-filter';
 exports.TAG_VERSION_NAME = 'dd_sls_ci';
-exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
 // Environment variables used in the Lambda environment
 exports.API_KEY_ENV_VAR = 'DD_API_KEY';
+exports.API_KEY_SECRET_ARN_ENV_VAR = 'DD_API_KEY_SECRET_ARN';
 exports.KMS_API_KEY_ENV_VAR = 'DD_KMS_API_KEY';
 exports.SITE_ENV_VAR = 'DD_SITE';
 exports.TRACE_ENABLED_ENV_VAR = 'DD_TRACE_ENABLED';
@@ -41,10 +88,16 @@ exports.SERVICE_ENV_VAR = 'DD_SERVICE';
 exports.VERSION_ENV_VAR = 'DD_VERSION';
 exports.ENVIRONMENT_ENV_VAR = 'DD_ENV';
 exports.EXTRA_TAGS_ENV_VAR = 'DD_TAGS';
+exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = 'DD_CAPTURE_LAMBDA_PAYLOAD';
 // Environment variables used by Datadog CI
 exports.CI_SITE_ENV_VAR = 'DATADOG_SITE';
 exports.CI_API_KEY_ENV_VAR = 'DATADOG_API_KEY';
+exports.CI_API_KEY_SECRET_ARN_ENV_VAR = 'DATADOG_API_KEY_SECRET_ARN';
 exports.CI_KMS_API_KEY_ENV_VAR = 'DATADOG_KMS_API_KEY';
+exports.AWS_ACCESS_KEY_ID_ENV_VAR = 'AWS_ACCESS_KEY_ID';
+exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = 'AWS_SECRET_ACCESS_KEY';
+exports.AWS_DEFAULT_REGION_ENV_VAR = 'AWS_DEFAULT_REGION';
+exports.AWS_SESSION_TOKEN_ENV_VAR = 'AWS_SESSION_TOKEN';
 exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = 2;
 exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;
 // DD_TAGS Regular Expression
@@ -52,3 +105,7 @@ exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;
 // matches a list of <key>:<value> separated by commas
 // such as: layer:api,team:intake
 exports.EXTRA_TAGS_REG_EXP = /^(([a-zA-Z]+)\w+:[\w\-/\.]+)+((\,)([a-zA-Z]+)\w+:[\w\-/\.]+)*$/g;
+exports.AWS_ACCESS_KEY_ID_REG_EXP = /(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])/g;
+exports.AWS_SECRET_ACCESS_KEY_REG_EXP = /(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])/g;
+exports.DATADOG_API_KEY_REG_EXP = /(?<![a-f0-9])[a-f0-9]{32}(?![a-f0-9])/g;
+exports.DATADOG_APP_KEY_REG_EXP = /(?<![a-f0-9])[a-f0-9]{40}(?![a-f0-9])/g;

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

@@ -1,5 +1,6 @@
 import { CloudWatchLogs, Lambda } from 'aws-sdk';
-import { FunctionConfiguration } from '../interfaces';
+import { Runtime } from '../constants';
+import { FunctionConfiguration, InstrumentationSettings } from '../interfaces';
 /**
  * Returns an array of merged layer ARNs if given a Full Layer ARN,
  * if not, it justs returns the layer ARNs provided.
@@ -9,9 +10,18 @@ import { FunctionConfiguration } from '../interfaces';
  * @param layerARNs an array of layer ARNs.
  * @returns an array of layer ARNs.
  */
-export declare const addLayerARN: (fullLayerARN: string | undefined, partialLayerARN: string, layerARNs: string[]) => string[];
+export declare const addLayerArn: (fullLayerArn: string | undefined, previousLayerName: string, layerARNs: string[]) => string[];
 /**
- * Returns an arrayed grouped functions by its region, it
+ * Returns a coerced boolean given string booleans or booleans in
+ * an spread array. Every other value will be ignored.
+ *
+ * @param fallback default value if none of the provided `values` comply.
+ * @param values an spread array of string booleans or booleans.
+ * @returns a coerced boolean.
+ */
+export declare const coerceBoolean: (fallback: boolean, ...values: any[]) => boolean;
+/**
+ * Returns an array of functions grouped by its region, it
  * throws an error if there are functions without a region.
  *
  * @param functions an array of strings comprised by
@@ -22,6 +32,28 @@ export declare const addLayerARN: (fullLayerARN: string | undefined, partialLaye
 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.
+ *
+ * @param lambda an instance of Lambda from aws-sdk.
+ * @param pattern a regular expression
+ * @returns an array of Lambda FunctionConfiguration's that match the pattern above.
+ */
+export declare const getLambdaFunctionConfigsFromRegex: (lambda: Lambda, pattern: string) => Promise<Lambda.FunctionConfiguration[]>;
 /**
  * Given a Lambda instance and an array of Lambda names,
  * return all the Lambda Function Configurations.
@@ -32,6 +64,18 @@ export declare const collectFunctionsByRegion: (functions: string[], defaultRegi
  * @returns an array of Lambda FunctionConfiguration's.
  */
 export declare const getLambdaFunctionConfigs: (lambda: Lambda, functionARNs: string[]) => Promise<Lambda.FunctionConfiguration[]>;
+/**
+ * Returns the correct ARN of a **Specific Runtime Layer** given its configuration, region,
+ * and settings (optional).
+ *
+ * @param config a Lambda FunctionConfiguration.
+ * @param region a region where the layer is hosted.
+ * @param settings instrumentation settings, mainly used to change the AWS account that contains the Layer.
+ * @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
  * an ARN and then return its Configuration.
@@ -66,6 +110,7 @@ export declare const isLambdaActive: (lambda: Lambda, config: Lambda.FunctionCon
  * @param runtime a string representing a Lambda FunctionConfiguration Runtime.
  * @returns if a runtime is supported.
  */
-export declare const isSupportedRuntime: (runtime?: string | undefined) => runtime is "nodejs10.x" | "nodejs12.x" | "nodejs14.x" | "python2.7" | "python3.6" | "python3.7" | "python3.8" | "python3.9";
+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.getLambdaFunctionConfigs = exports.collectFunctionsByRegion = 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");
@@ -22,18 +23,46 @@ const tags_1 = require("../tags");
  * @param layerARNs an array of layer ARNs.
  * @returns an array of layer ARNs.
  */
-const addLayerARN = (fullLayerARN, partialLayerARN, layerARNs) => {
-    if (fullLayerARN) {
-        if (!layerARNs.includes(fullLayerARN)) {
+const addLayerArn = (fullLayerArn, previousLayerName, layerARNs) => {
+    if (fullLayerArn) {
+        if (!layerARNs.includes(fullLayerArn)) {
             // Remove any other versions of the layer
-            layerARNs = [...layerARNs.filter((l) => !l.startsWith(partialLayerARN)), fullLayerARN];
+            layerARNs = [...layerARNs.filter((layer) => !layer.includes(previousLayerName)), fullLayerArn];
         }
     }
     return layerARNs;
 };
-exports.addLayerARN = addLayerARN;
+exports.addLayerArn = addLayerArn;
 /**
- * Returns an arrayed grouped functions by its region, it
+ * Returns a coerced boolean given string booleans or booleans in
+ * an spread array. Every other value will be ignored.
+ *
+ * @param fallback default value if none of the provided `values` comply.
+ * @param values an spread array of string booleans or booleans.
+ * @returns a coerced boolean.
+ */
+const coerceBoolean = (fallback, ...values) => {
+    for (const value of values) {
+        switch (typeof value) {
+            case 'boolean':
+                return value;
+            case 'string':
+                if (value.toString().toLowerCase() === 'true') {
+                    return true;
+                }
+                else if (value.toString().toLowerCase() === 'false') {
+                    return false;
+                }
+                break;
+            default:
+                continue;
+        }
+    }
+    return fallback;
+};
+exports.coerceBoolean = coerceBoolean;
+/**
+ * Returns an array of functions grouped by its region, it
  * throws an error if there are functions without a region.
  *
  * @param functions an array of strings comprised by
@@ -63,6 +92,122 @@ 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.
+ *
+ * @param lambda an instance of Lambda from aws-sdk.
+ * @param pattern a regular expression
+ * @returns an array of Lambda FunctionConfiguration's that match the pattern above.
+ */
+const getLambdaFunctionConfigsFromRegex = (lambda, pattern) => __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.');
+            }
+        }
+    }
+    return matchedFunctions;
+});
+exports.getLambdaFunctionConfigsFromRegex = getLambdaFunctionConfigsFromRegex;
 /**
  * Given a Lambda instance and an array of Lambda names,
  * return all the Lambda Function Configurations.
@@ -77,6 +222,36 @@ const getLambdaFunctionConfigs = (lambda, functionARNs) => {
     return Promise.all(promises);
 };
 exports.getLambdaFunctionConfigs = getLambdaFunctionConfigs;
+/**
+ * Returns the correct ARN of a **Specific Runtime Layer** given its configuration, region,
+ * and settings (optional).
+ *
+ * @param config a Lambda FunctionConfiguration.
+ * @param region a region where the layer is hosted.
+ * @param settings instrumentation settings, mainly used to change the AWS account that contains the Layer.
+ * @returns the ARN of a **Specific Runtime Layer** with the correct region, account, architecture, and name.
+ */
+const getLayerArn = (config, runtime, region, settings) => {
+    var _a, _b;
+    let layerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
+    if (constants_1.ARM_RUNTIMES.includes(runtime) && ((_a = config.Architectures) === null || _a === void 0 ? void 0 : _a.includes(constants_1.ARM64_ARCHITECTURE))) {
+        layerName += constants_1.ARM_LAYER_SUFFIX;
+    }
+    const account = (_b = settings === null || settings === void 0 ? void 0 : settings.layerAWSAccount) !== null && _b !== void 0 ? _b : 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 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
  * an ARN and then return its Configuration.
@@ -162,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

@@ -1,16 +1,7 @@
 import { CloudWatchLogs, Lambda } from 'aws-sdk';
 import { Runtime } from '../constants';
-import { FunctionConfiguration, InstrumentationSettings, LogGroupConfiguration, TagConfiguration } from '../interfaces';
-export declare const getFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, region: string, functionARNs: string[], settings: InstrumentationSettings) => Promise<FunctionConfiguration[]>;
-export declare const getFunctionConfig: (lambda: Lambda, cloudWatch: CloudWatchLogs, config: Lambda.FunctionConfiguration, region: string, settings: InstrumentationSettings) => Promise<{
-    functionARN: string;
-    lambdaConfig: Lambda.FunctionConfiguration;
-    lambdaLibraryLayerArn: string;
-    logGroupConfiguration: LogGroupConfiguration | undefined;
-    tagConfiguration: TagConfiguration | undefined;
-    updateRequest: Lambda.UpdateFunctionConfigurationRequest | undefined;
-}>;
-export declare const getLambdaConfigsFromRegEx: (lambda: Lambda, cloudWatch: CloudWatchLogs, region: string, pattern: string, settings: InstrumentationSettings) => Promise<FunctionConfiguration[]>;
-export declare const getLayerArn: (runtime: Runtime, settings: InstrumentationSettings, region: string) => string;
-export declare const getExtensionArn: (settings: InstrumentationSettings, region: string) => string;
-export declare const calculateUpdateRequest: (config: Lambda.FunctionConfiguration, settings: InstrumentationSettings, lambdaLibraryLayerArn: string, lambdaExtensionLayerArn: string, runtime: Runtime) => Lambda.UpdateFunctionConfigurationRequest | undefined;
+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) => Promise<Lambda.UpdateFunctionConfigurationRequest | undefined>;