@datadog/datadog-ci-plugin-lambda 4.0.1 → 4.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.d.ts +2 -2
- package/dist/constants.js +3 -3
- package/dist/constants.js.map +1 -1
- package/dist/functions/commons.d.ts +1 -0
- package/dist/functions/commons.js +29 -1
- package/dist/functions/commons.js.map +1 -1
- package/dist/functions/instrument.js +10 -5
- package/dist/functions/instrument.js.map +1 -1
- package/dist/functions/uninstrument.js +2 -1
- package/dist/functions/uninstrument.js.map +1 -1
- package/dist/tags.js +4 -5
- package/dist/tags.js.map +1 -1
- package/package.json +2 -2
package/dist/constants.d.ts
CHANGED
|
@@ -42,7 +42,6 @@ export declare const NODE_HANDLER_LOCATION = "/opt/nodejs/node_modules/datadog-l
|
|
|
42
42
|
export declare const DEFAULT_LAYER_AWS_ACCOUNT = "464622532012";
|
|
43
43
|
export declare const GOVCLOUD_LAYER_AWS_ACCOUNT = "002406178527";
|
|
44
44
|
export declare const SUBSCRIPTION_FILTER_NAME = "datadog-ci-filter";
|
|
45
|
-
export declare const TAG_VERSION_NAME = "dd_sls_ci";
|
|
46
45
|
export declare const AWS_LAMBDA_EXEC_WRAPPER_VAR = "AWS_LAMBDA_EXEC_WRAPPER";
|
|
47
46
|
export declare const AWS_LAMBDA_EXEC_WRAPPER = "/opt/datadog_wrapper";
|
|
48
47
|
export declare const CORECLR_ENABLE_PROFILING = "1";
|
|
@@ -57,7 +56,8 @@ export declare const LOG_ENABLED_ENV_VAR = "DD_SERVERLESS_LOGS_ENABLED";
|
|
|
57
56
|
export declare const LAMBDA_HANDLER_ENV_VAR = "DD_LAMBDA_HANDLER";
|
|
58
57
|
export declare const CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = "DD_CAPTURE_LAMBDA_PAYLOAD";
|
|
59
58
|
export declare const APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = "DD_APM_FLUSH_DEADLINE_MILLISECONDS";
|
|
60
|
-
export declare const APPSEC_ENABLED_ENV_VAR = "
|
|
59
|
+
export declare const APPSEC_ENABLED_ENV_VAR = "DD_APPSEC_ENABLED";
|
|
60
|
+
export declare const SERVERLESS_APPSEC_ENABLED_ENV_VAR = "DD_SERVERLESS_APPSEC_ENABLED";
|
|
61
61
|
export declare const ENABLE_PROFILING_ENV_VAR = "CORECLR_ENABLE_PROFILING";
|
|
62
62
|
export declare const PROFILER_ENV_VAR = "CORECLR_PROFILER";
|
|
63
63
|
export declare const PROFILER_PATH_ENV_VAR = "CORECLR_PROFILER_PATH";
|
package/dist/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FRAMEWORK_FILES_MAPPING = exports.DeploymentFrameworks = exports.SKIP_MASKING_LAMBDA_ENV_VARS = exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ARN_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = exports.AWS_SHARED_CREDENTIALS_FILE_ENV_VAR = 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.DD_LAMBDA_FIPS_MODE_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.APPSEC_ENABLED_ENV_VAR = exports.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_ENABLED_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.AWS_LAMBDA_EXEC_WRAPPER = exports.AWS_LAMBDA_EXEC_WRAPPER_VAR = exports.
|
|
3
|
+
exports.FRAMEWORK_FILES_MAPPING = exports.DeploymentFrameworks = exports.SKIP_MASKING_LAMBDA_ENV_VARS = exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ARN_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = exports.AWS_SHARED_CREDENTIALS_FILE_ENV_VAR = 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.DD_LAMBDA_FIPS_MODE_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.SERVERLESS_APPSEC_ENABLED_ENV_VAR = exports.APPSEC_ENABLED_ENV_VAR = exports.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_ENABLED_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.AWS_LAMBDA_EXEC_WRAPPER = exports.AWS_LAMBDA_EXEC_WRAPPER_VAR = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = exports.LAMBDA_FIPS_ENV_VAR = void 0;
|
|
4
4
|
exports.EXPONENTIAL_BACKOFF_RETRY_STRATEGY = exports.LAMBDA_PROJECT_FILES = void 0;
|
|
5
5
|
const constants_1 = require("@datadog/datadog-ci-base/constants");
|
|
6
6
|
const util_retry_1 = require("@smithy/util-retry");
|
|
@@ -80,7 +80,6 @@ exports.NODE_HANDLER_LOCATION = '/opt/nodejs/node_modules/datadog-lambda-js/hand
|
|
|
80
80
|
exports.DEFAULT_LAYER_AWS_ACCOUNT = '464622532012';
|
|
81
81
|
exports.GOVCLOUD_LAYER_AWS_ACCOUNT = '002406178527';
|
|
82
82
|
exports.SUBSCRIPTION_FILTER_NAME = 'datadog-ci-filter';
|
|
83
|
-
exports.TAG_VERSION_NAME = 'dd_sls_ci';
|
|
84
83
|
// Env variables for Univeral instrument lambda exec wrapper
|
|
85
84
|
exports.AWS_LAMBDA_EXEC_WRAPPER_VAR = 'AWS_LAMBDA_EXEC_WRAPPER';
|
|
86
85
|
exports.AWS_LAMBDA_EXEC_WRAPPER = '/opt/datadog_wrapper';
|
|
@@ -98,7 +97,8 @@ exports.LOG_ENABLED_ENV_VAR = 'DD_SERVERLESS_LOGS_ENABLED';
|
|
|
98
97
|
exports.LAMBDA_HANDLER_ENV_VAR = 'DD_LAMBDA_HANDLER';
|
|
99
98
|
exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = 'DD_CAPTURE_LAMBDA_PAYLOAD';
|
|
100
99
|
exports.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = 'DD_APM_FLUSH_DEADLINE_MILLISECONDS';
|
|
101
|
-
exports.APPSEC_ENABLED_ENV_VAR = '
|
|
100
|
+
exports.APPSEC_ENABLED_ENV_VAR = 'DD_APPSEC_ENABLED';
|
|
101
|
+
exports.SERVERLESS_APPSEC_ENABLED_ENV_VAR = 'DD_SERVERLESS_APPSEC_ENABLED';
|
|
102
102
|
exports.ENABLE_PROFILING_ENV_VAR = 'CORECLR_ENABLE_PROFILING';
|
|
103
103
|
exports.PROFILER_ENV_VAR = 'CORECLR_PROFILER';
|
|
104
104
|
exports.PROFILER_PATH_ENV_VAR = 'CORECLR_PROFILER_PATH';
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;AAEA,kEAQ2C;AAC3C,mDAA0D;AAE7C,QAAA,mBAAmB,GAAG,qBAAqB,CAAA;AAE3C,QAAA,8BAA8B,GAAG,mBAAmB,CAAA;AACpD,QAAA,mBAAmB,GAAG,WAAW,CAAA;AACjC,QAAA,YAAY,GAAG;IAC1B,CAAC,2BAAmB,CAAC,EAAE,sCAA8B;IACrD,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,iBAAiB;IAC1B,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,WAAW,EAAE,eAAe;IAC5B,YAAY,EAAE,kBAAkB;IAChC,YAAY,EAAE,kBAAkB;IAChC,YAAY,EAAE,kBAAkB;IAChC,YAAY,EAAE,kBAAkB;IAChC,WAAW,EAAE,kBAAkB;IAC/B,WAAW,EAAE,kBAAkB;IAC/B,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,mBAAmB;IACjC,SAAS,EAAE,iBAAiB;IAC5B,SAAS,EAAE,iBAAiB;CACpB,CAAA;AAEV,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,iDAAM,CAAA;IACN,iDAAM,CAAA;IACN,6CAAI,CAAA;IACJ,6CAAI,CAAA;IACJ,iDAAM,CAAA;IACN,6CAAI,CAAA;AACN,CAAC,EAPW,WAAW,2BAAX,WAAW,QAOtB;AAED,oEAAoE;AACvD,QAAA,cAAc,GAA0C;IACnE,OAAO,EAAE,WAAW,CAAC,MAAM;IAC3B,OAAO,EAAE,WAAW,CAAC,MAAM;IAC3B,MAAM,EAAE,WAAW,CAAC,IAAI;IACxB,MAAM,EAAE,WAAW,CAAC,IAAI;IACxB,MAAM,EAAE,WAAW,CAAC,IAAI;IACxB,WAAW,EAAE,WAAW,CAAC,IAAI;IAC7B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,cAAc,EAAE,WAAW,CAAC,MAAM;IAClC,iBAAiB,EAAE,WAAW,CAAC,MAAM;IACrC,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,YAAY,EAAE,WAAW,CAAC,MAAM;IAChC,YAAY,EAAE,WAAW,CAAC,MAAM;IAChC,YAAY,EAAE,WAAW,CAAC,MAAM;IAChC,YAAY,EAAE,WAAW,CAAC,MAAM;IAChC,SAAS,EAAE,WAAW,CAAC,IAAI;IAC3B,SAAS,EAAE,WAAW,CAAC,IAAI;CAC5B,CAAA;AAGY,QAAA,UAAU,GAAG;IACxB,2BAAmB;IACnB,SAAS;IACT,SAAS;IACT,WAAW;IACX,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,SAAS;IACT,SAAS;CACV,CAAA;AACY,QAAA,kBAAkB,GAAG,OAAO,CAAA;AAC5B,QAAA,gBAAgB,GAAG,MAAM,CAAA;AAEzB,QAAA,uBAAuB,GAAG,gCAAgC,CAAA;AAC1D,QAAA,qBAAqB,GAAG,4DAA4D,CAAA;AAEpF,QAAA,yBAAyB,GAAG,cAAc,CAAA;AAC1C,QAAA,0BAA0B,GAAG,cAAc,CAAA;AAC3C,QAAA,wBAAwB,GAAG,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,6 +118,7 @@ export declare const getRegion: (functionARN: string) => string | undefined;
|
|
|
118
118
|
export declare const isSupportedRuntime: (runtime?: string) => runtime is Runtime;
|
|
119
119
|
export declare const isLayerRuntime: (runtime: string) => runtime is "dotnet6" | "dotnet8" | "java11" | "java17" | "java21" | "java8.al2" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "nodejs22.x" | "python3.10" | "python3.11" | "python3.12" | "python3.13" | "python3.8" | "python3.9" | "ruby3.2" | "ruby3.3" | "extension";
|
|
120
120
|
export declare const sentenceMatchesRegEx: (sentence: string, regex: RegExp) => RegExpMatchArray | null;
|
|
121
|
+
export declare const supportsInTracerAppsec: (runtime: Runtime, layerVersion: number | undefined) => boolean;
|
|
121
122
|
export declare const updateLambdaFunctionConfig: (lambdaClient: LambdaClient, cloudWatchLogsClient: CloudWatchLogsClient, config: FunctionConfiguration) => Promise<void>;
|
|
122
123
|
export declare const updateFunctionConfiguration: (client: LambdaClient, input: UpdateFunctionConfigurationCommandInput) => Promise<void>;
|
|
123
124
|
export declare const handleLambdaFunctionUpdates: (configGroups: InstrumentedConfigurationGroup[], stdout: Writable) => Promise<void>;
|
|
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.maskConfig = exports.willUpdateFunctionConfigs = exports.handleLambdaFunctionUpdates = exports.updateFunctionConfiguration = exports.updateLambdaFunctionConfig = exports.sentenceMatchesRegEx = exports.isLayerRuntime = exports.isSupportedRuntime = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.checkRuntimeTypesAreUniform = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.getAWSCredentials = exports.getAWSProfileCredentials = exports.getAWSFileCredentialsParams = exports.findLatestLayerVersion = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
|
|
38
|
+
exports.maskConfig = exports.willUpdateFunctionConfigs = exports.handleLambdaFunctionUpdates = exports.updateFunctionConfiguration = exports.updateLambdaFunctionConfig = exports.supportsInTracerAppsec = exports.sentenceMatchesRegEx = exports.isLayerRuntime = exports.isSupportedRuntime = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.checkRuntimeTypesAreUniform = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.getAWSCredentials = exports.getAWSProfileCredentials = exports.getAWSFileCredentialsParams = exports.findLatestLayerVersion = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
|
|
39
39
|
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
40
40
|
const credential_providers_1 = require("@aws-sdk/credential-providers");
|
|
41
41
|
const constants_1 = require("@datadog/datadog-ci-base/constants");
|
|
@@ -373,6 +373,34 @@ const isLayerRuntime = (runtime) => constants_2.LAYER_LOOKUP[runtime] !== undefi
|
|
|
373
373
|
exports.isLayerRuntime = isLayerRuntime;
|
|
374
374
|
const sentenceMatchesRegEx = (sentence, regex) => sentence.match(regex);
|
|
375
375
|
exports.sentenceMatchesRegEx = sentenceMatchesRegEx;
|
|
376
|
+
const supportsInTracerAppsec = (runtime, layerVersion) => {
|
|
377
|
+
if (layerVersion === undefined || !(0, exports.isLayerRuntime)(runtime)) {
|
|
378
|
+
return false;
|
|
379
|
+
}
|
|
380
|
+
switch (runtime) {
|
|
381
|
+
case 'python3.10':
|
|
382
|
+
case 'python3.11':
|
|
383
|
+
case 'python3.12':
|
|
384
|
+
case 'python3.13':
|
|
385
|
+
case 'python3.8':
|
|
386
|
+
case 'python3.9':
|
|
387
|
+
return layerVersion >= 114;
|
|
388
|
+
case 'dotnet6':
|
|
389
|
+
case 'dotnet8':
|
|
390
|
+
case 'java11':
|
|
391
|
+
case 'java17':
|
|
392
|
+
case 'java21':
|
|
393
|
+
case 'java8.al2':
|
|
394
|
+
case 'nodejs16.x':
|
|
395
|
+
case 'nodejs18.x':
|
|
396
|
+
case 'nodejs20.x':
|
|
397
|
+
case 'nodejs22.x':
|
|
398
|
+
case 'ruby3.2':
|
|
399
|
+
case 'ruby3.3':
|
|
400
|
+
return false;
|
|
401
|
+
}
|
|
402
|
+
};
|
|
403
|
+
exports.supportsInTracerAppsec = supportsInTracerAppsec;
|
|
376
404
|
const updateLambdaFunctionConfig = (lambdaClient, cloudWatchLogsClient, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
377
405
|
if (config.updateFunctionConfigurationCommandInput !== undefined) {
|
|
378
406
|
yield (0, exports.updateFunctionConfiguration)(lambdaClient, config.updateFunctionConfigurationCommandInput);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons.js","sourceRoot":"","sources":["../../src/functions/commons.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"commons.js","sourceRoot":"","sources":["../../src/functions/commons.ts"],"names":[],"mappings":"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"}
|
|
@@ -137,7 +137,6 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
137
137
|
}
|
|
138
138
|
const environmentVarsTupleArray = [
|
|
139
139
|
['apmFlushDeadline', constants_2.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR],
|
|
140
|
-
['appsecEnabled', constants_2.APPSEC_ENABLED_ENV_VAR],
|
|
141
140
|
['captureLambdaPayload', constants_2.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR],
|
|
142
141
|
['environment', constants_1.ENVIRONMENT_ENV_VAR],
|
|
143
142
|
['extraTags', constants_1.DD_TAGS_ENV_VAR],
|
|
@@ -172,10 +171,6 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
172
171
|
delete newEnvVars[constants_1.DD_LOG_LEVEL_ENV_VAR];
|
|
173
172
|
}
|
|
174
173
|
}
|
|
175
|
-
// Enable ASM
|
|
176
|
-
if (settings['appsecEnabled'] === true) {
|
|
177
|
-
newEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] = constants_2.AWS_LAMBDA_EXEC_WRAPPER;
|
|
178
|
-
}
|
|
179
174
|
// Enable LLMObs
|
|
180
175
|
if (settings['llmobsMlApp'] !== undefined) {
|
|
181
176
|
newEnvVars[constants_1.DD_LLMOBS_ENABLED_ENV_VAR] = 'true';
|
|
@@ -202,6 +197,16 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
202
197
|
}
|
|
203
198
|
layerARNs = (0, commons_1.addLayerArn)(fullLambdaLibraryLayerARN, lambdaLibraryLayerName, layerARNs);
|
|
204
199
|
}
|
|
200
|
+
// Enable App and API Protection
|
|
201
|
+
if (settings['appsecEnabled'] === true) {
|
|
202
|
+
if ((0, commons_1.supportsInTracerAppsec)(runtime, layerOrTraceVersion)) {
|
|
203
|
+
newEnvVars[constants_2.APPSEC_ENABLED_ENV_VAR] = 'true';
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
newEnvVars[constants_2.SERVERLESS_APPSEC_ENABLED_ENV_VAR] = 'true';
|
|
207
|
+
newEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] = constants_2.AWS_LAMBDA_EXEC_WRAPPER;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
205
210
|
const lambdaExtensionLayerArn = (0, commons_1.getLayerArn)(config, constants_2.EXTENSION_LAYER_KEY, region, settings);
|
|
206
211
|
let fullExtensionLayerARN;
|
|
207
212
|
let extensionVersion;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/functions/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,kEAc2C;AAC3C,4EAA8E;AAE9E,
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/functions/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,7 +90,7 @@ const calculateUpdateRequest = (config, runtime) => {
|
|
|
90
90
|
// Remove AWS_LAMBDA_EXEC_WRAPPER for .NET and Java or if ASM is enabled
|
|
91
91
|
if (runtimeType === constants_2.RuntimeType.DOTNET ||
|
|
92
92
|
runtimeType === constants_2.RuntimeType.JAVA ||
|
|
93
|
-
oldEnvVars[constants_2.
|
|
93
|
+
oldEnvVars[constants_2.SERVERLESS_APPSEC_ENABLED_ENV_VAR] === 'true') {
|
|
94
94
|
if (oldEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] === constants_2.AWS_LAMBDA_EXEC_WRAPPER) {
|
|
95
95
|
needsUpdate = true;
|
|
96
96
|
delete oldEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR];
|
|
@@ -107,6 +107,7 @@ const calculateUpdateRequest = (config, runtime) => {
|
|
|
107
107
|
constants_1.SITE_ENV_VAR,
|
|
108
108
|
constants_2.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR,
|
|
109
109
|
constants_2.APPSEC_ENABLED_ENV_VAR,
|
|
110
|
+
constants_2.SERVERLESS_APPSEC_ENABLED_ENV_VAR,
|
|
110
111
|
constants_2.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR,
|
|
111
112
|
constants_1.ENVIRONMENT_ENV_VAR,
|
|
112
113
|
constants_1.DD_TAGS_ENV_VAR,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../src/functions/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,kEAY2C;AAE3C,
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../src/functions/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,kEAY2C;AAE3C,4CAyBqB;AAErB,0CAA0D;AAC1D,kCAAiD;AAEjD,uCAAoH;AAE7G,MAAM,gCAAgC,GAAG,CAC9C,YAA0B,EAC1B,oBAA0C,EAC1C,YAAsB,EACtB,YAAgC,EACE,EAAE;IACpC,MAAM,qBAAqB,GAAG,MAAM,IAAA,kCAAwB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAA;IAExF,MAAM,OAAO,GAA4B,EAAE,CAAA;IAC3C,KAAK,MAAM,MAAM,IAAI,qBAAqB,EAAE;QAC1C,MAAM,cAAc,GAAG,MAAM,IAAA,uCAA+B,EAC1D,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,YAAY,CACb,CAAA;QAED,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;KAC7B;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA,CAAA;AArBY,QAAA,gCAAgC,oCAqB5C;AAEM,MAAM,+BAA+B,GAAG,CAC7C,YAA0B,EAC1B,oBAA0C,EAC1C,MAA8B,EAC9B,YAAgC,EACA,EAAE;IAClC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAY,CAAA;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;IAC9B,IAAI,CAAC,IAAA,4BAAkB,EAAC,OAAO,CAAC,EAAE;QAChC,MAAM,KAAK,CAAC,uBAAuB,WAAW,aAAa,OAAO,gBAAgB,CAAC,CAAA;KACpF;IAED,MAAM,aAAa,GAAG,IAAA,8BAAsB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7D,IAAI,qBAAwD,CAAA;IAE5D,IAAI,YAAY,EAAE;QAChB,MAAM,YAAY,GAAG,eAAe,MAAM,CAAC,YAAY,EAAE,CAAA;QACzD,qBAAqB,GAAG,MAAM,IAAA,yCAA8B,EAAC,oBAAoB,EAAE,YAAY,EAAE,YAAY,CAAC,CAAA;KAC/G;IAED,MAAM,gBAAgB,GAAiC,MAAM,IAAA,gCAAyB,EAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IAEjH,OAAO;QACL,WAAW;QACX,YAAY,EAAE,MAAM;QACpB,qBAAqB;QACrB,gBAAgB;QAChB,uCAAuC,EAAE,aAAa;KACvD,CAAA;AACH,CAAC,CAAA,CAAA;AA7BY,QAAA,+BAA+B,mCA6B3C;AAEM,MAAM,yCAAyC,GAAG,CACvD,YAA0B,EAC1B,oBAA0C,EAC1C,OAAe,EACf,YAAgC,EACE,EAAE;IACpC,MAAM,gBAAgB,GAAG,MAAM,IAAA,2CAAiC,EAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACvF,MAAM,iBAAiB,GAA4B,EAAE,CAAA;IAErD,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE;QACrC,MAAM,cAAc,GAAG,MAAM,IAAA,uCAA+B,EAC1D,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,YAAY,CACb,CAAA;QACD,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;KACvC;IAED,OAAO,iBAAiB,CAAA;AAC1B,CAAC,CAAA,CAAA;AApBY,QAAA,yCAAyC,6CAoBrD;AAEM,MAAM,sBAAsB,GAAG,CACpC,MAA8B,EAC9B,OAAgB,EACgC,EAAE;;IAClD,MAAM,UAAU,qBAA+B,MAAA,MAAM,CAAC,WAAW,0CAAE,SAAS,CAAC,CAAA;IAC7E,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAA;IAEtC,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,aAAa,GAAuC;QACxD,YAAY,EAAE,WAAW;KAC1B,CAAA;IACD,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,MAAM,WAAW,GAAG,0BAAc,CAAC,OAAO,CAAC,CAAA;IAC3C,4BAA4B;IAC5B,IAAI,WAAW,KAAK,uBAAW,CAAC,MAAM,EAAE;QACtC,MAAM,eAAe,GAAG,mCAAuB,CAAA;QAC/C,IAAI,MAAM,CAAC,OAAO,KAAK,eAAe,EAAE;YACtC,WAAW,GAAG,IAAI,CAAA;YAClB,aAAa,CAAC,OAAO,GAAG,UAAU,CAAC,kCAAsB,CAAC,CAAA;YAC1D,OAAO,UAAU,CAAC,kCAAsB,CAAC,CAAA;SAC1C;KACF;IAED,0BAA0B;IAC1B,IAAI,WAAW,KAAK,uBAAW,CAAC,IAAI,EAAE;QACpC,MAAM,eAAe,GAAG,iCAAqB,CAAA;QAC7C,IAAI,MAAM,CAAC,OAAO,KAAK,eAAe,EAAE;YACtC,WAAW,GAAG,IAAI,CAAA;YAClB,aAAa,CAAC,OAAO,GAAG,UAAU,CAAC,kCAAsB,CAAC,CAAA;YAC1D,OAAO,UAAU,CAAC,kCAAsB,CAAC,CAAA;SAC1C;KACF;IAED,wEAAwE;IACxE,IACE,WAAW,KAAK,uBAAW,CAAC,MAAM;QAClC,WAAW,KAAK,uBAAW,CAAC,IAAI;QAChC,UAAU,CAAC,6CAAiC,CAAC,KAAK,MAAM,EACxD;QACA,IAAI,UAAU,CAAC,uCAA2B,CAAC,KAAK,mCAAuB,EAAE;YACvE,WAAW,GAAG,IAAI,CAAA;YAClB,OAAO,UAAU,CAAC,uCAA2B,CAAC,CAAA;SAC/C;KACF;IAED;;;OAGG;IACH,MAAM,oBAAoB,GAAG;QAC3B,2BAAe;QACf,sCAA0B;QAC1B,+BAAmB;QACnB,wBAAY;QACZ,mDAAuC;QACvC,kCAAsB;QACtB,6CAAiC;QACjC,0CAA8B;QAC9B,+BAAmB;QACnB,2BAAe;QACf,gCAAoB;QACpB,qCAAyB;QACzB,gCAAoB;QACpB,+BAAmB;QACnB,2BAAe;QACf,oCAAwB;QACxB,2BAAe;QACf,oCAAwB;QACxB,4BAAgB;QAChB,iCAAqB;QACrB,sCAA0B;QAC1B,qCAAyB;QACzB,oCAAwB;QACxB,+CAAmC;QACnC,uCAA2B;KAC5B,CAAA;IACD,+BAA+B;IAC/B,KAAK,MAAM,cAAc,IAAI,oBAAoB,EAAE;QACjD,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE;YAC9B,WAAW,GAAG,IAAI,CAAA;YAClB,OAAO,UAAU,CAAC,cAAc,CAAC,CAAA;SAClC;KACF;IAED,aAAa,CAAC,WAAW,GAAG;QAC1B,SAAS,EAAE,UAAU;KACtB,CAAA;IAED,gBAAgB;IAChB,IAAI,iBAAiB,GAAG,KAAK,CAAA;IAC7B,MAAM,sBAAsB,GAAG,wBAAY,CAAC,OAAmB,CAAC,CAAA;IAChE,MAAM,iBAAiB,GAAG,IAAA,mBAAS,EAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC;SACpC,MAAM,CACL,CAAC,KAAK,EAAE,EAAE,eAAC,OAAA,CAAC,CAAA,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAA,IAAI,CAAC,CAAA,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,CAAC,0CAA8B,CAAC,CAAA,CAAA,EAAA,CAChH;SACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,GAAG,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAA;IAElC,IAAI,iBAAiB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,iBAAiB,GAAG,IAAI,CAAA;KACzB;IACD,IAAI,iBAAiB,EAAE;QACrB,WAAW,GAAG,IAAI,CAAA;QAClB,aAAa,CAAC,MAAM,GAAG,SAAS,CAAA;KACjC;IAED,OAAO,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAA;AAChD,CAAC,CAAA;AA/GY,QAAA,sBAAsB,0BA+GlC"}
|
package/dist/tags.js
CHANGED
|
@@ -11,8 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.hasVersionTag = exports.calculateTagRemoveRequest = exports.calculateTagUpdateRequest = exports.untagResource = exports.tagResource = exports.applyTagConfig = void 0;
|
|
13
13
|
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
14
|
-
const
|
|
15
|
-
const constants_1 = require("./constants");
|
|
14
|
+
const tags_1 = require("@datadog/datadog-ci-base/helpers/tags");
|
|
16
15
|
const applyTagConfig = (lambdaClient, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
16
|
const { tagResourceCommandInput, untagResourceCommandInput } = config;
|
|
18
17
|
if (tagResourceCommandInput !== undefined) {
|
|
@@ -40,7 +39,7 @@ const calculateTagUpdateRequest = (lambdaClient, functionARN) => __awaiter(void
|
|
|
40
39
|
config.tagResourceCommandInput = {
|
|
41
40
|
Resource: functionARN,
|
|
42
41
|
Tags: {
|
|
43
|
-
[
|
|
42
|
+
[tags_1.SERVERLESS_CLI_VERSION_TAG_NAME]: tags_1.SERVERLESS_CLI_VERSION_TAG_VALUE,
|
|
44
43
|
},
|
|
45
44
|
};
|
|
46
45
|
return config;
|
|
@@ -54,7 +53,7 @@ const calculateTagRemoveRequest = (lambdaClient, functionARN) => __awaiter(void
|
|
|
54
53
|
if (versionTagPresent) {
|
|
55
54
|
config.untagResourceCommandInput = {
|
|
56
55
|
Resource: functionARN,
|
|
57
|
-
TagKeys: [
|
|
56
|
+
TagKeys: [tags_1.SERVERLESS_CLI_VERSION_TAG_NAME],
|
|
58
57
|
};
|
|
59
58
|
return config;
|
|
60
59
|
}
|
|
@@ -68,7 +67,7 @@ const hasVersionTag = (client, functionARN) => __awaiter(void 0, void 0, void 0,
|
|
|
68
67
|
const command = new client_lambda_1.ListTagsCommand(input);
|
|
69
68
|
const response = yield client.send(command);
|
|
70
69
|
const { Tags } = response;
|
|
71
|
-
return Tags !== undefined && Tags[
|
|
70
|
+
return Tags !== undefined && Tags[tags_1.SERVERLESS_CLI_VERSION_TAG_NAME] === tags_1.SERVERLESS_CLI_VERSION_TAG_VALUE;
|
|
72
71
|
});
|
|
73
72
|
exports.hasVersionTag = hasVersionTag;
|
|
74
73
|
//# sourceMappingURL=tags.js.map
|
package/dist/tags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../src/tags.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAQ+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../src/tags.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAQ+B;AAC/B,gEAAuH;AAIhH,MAAM,cAAc,GAAG,CAAO,YAA0B,EAAE,MAAwB,EAAiB,EAAE;IAC1G,MAAM,EAAC,uBAAuB,EAAE,yBAAyB,EAAC,GAAG,MAAM,CAAA;IACnE,IAAI,uBAAuB,KAAK,SAAS,EAAE;QACzC,MAAM,IAAA,mBAAW,EAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;KACzD;IACD,IAAI,yBAAyB,KAAK,SAAS,EAAE;QAC3C,MAAM,IAAA,qBAAa,EAAC,YAAY,EAAE,yBAAyB,CAAC,CAAA;KAC7D;AACH,CAAC,CAAA,CAAA;AARY,QAAA,cAAc,kBAQ1B;AAEM,MAAM,WAAW,GAAG,CAAO,MAAoB,EAAE,KAA8B,EAAiB,EAAE;IACvG,MAAM,OAAO,GAAG,IAAI,kCAAkB,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC5B,CAAC,CAAA,CAAA;AAHY,QAAA,WAAW,eAGvB;AAEM,MAAM,aAAa,GAAG,CAAO,MAAoB,EAAE,KAAgC,EAAiB,EAAE;IAC3G,MAAM,OAAO,GAAG,IAAI,oCAAoB,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC5B,CAAC,CAAA,CAAA;AAHY,QAAA,aAAa,iBAGzB;AAEM,MAAM,yBAAyB,GAAG,CACvC,YAA0B,EAC1B,WAAmB,EACoB,EAAE;IACzC,MAAM,MAAM,GAAqB,EAAE,CAAA;IAEnC,MAAM,iBAAiB,GAAG,MAAM,IAAA,qBAAa,EAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IAExE,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,CAAC,uBAAuB,GAAG;YAC/B,QAAQ,EAAE,WAAW;YACrB,IAAI,EAAE;gBACJ,CAAC,sCAA+B,CAAC,EAAE,uCAAgC;aACpE;SACF,CAAA;QAED,OAAO,MAAM,CAAA;KACd;IAED,OAAM;AACR,CAAC,CAAA,CAAA;AApBY,QAAA,yBAAyB,6BAoBrC;AAEM,MAAM,yBAAyB,GAAG,CACvC,YAA0B,EAC1B,WAAmB,EACoB,EAAE;IACzC,MAAM,MAAM,GAAqB,EAAE,CAAA;IACnC,MAAM,iBAAiB,GAAG,MAAM,IAAA,qBAAa,EAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IACxE,IAAI,iBAAiB,EAAE;QACrB,MAAM,CAAC,yBAAyB,GAAG;YACjC,QAAQ,EAAE,WAAW;YACrB,OAAO,EAAE,CAAC,sCAA+B,CAAC;SAC3C,CAAA;QAED,OAAO,MAAM,CAAA;KACd;IAED,OAAM;AACR,CAAC,CAAA,CAAA;AAhBY,QAAA,yBAAyB,6BAgBrC;AAEM,MAAM,aAAa,GAAG,CAAO,MAAoB,EAAE,WAAmB,EAAoB,EAAE;IACjG,MAAM,KAAK,GAAyB;QAClC,QAAQ,EAAE,WAAW;KACtB,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,+BAAe,CAAC,KAAK,CAAC,CAAA;IAC1C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAA;IAEvB,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,sCAA+B,CAAC,KAAK,uCAAgC,CAAA;AACzG,CAAC,CAAA,CAAA;AATY,QAAA,aAAa,iBASzB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/datadog-ci-plugin-lambda",
|
|
3
|
-
"version": "4.0
|
|
3
|
+
"version": "4.1.0",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"description": "Datadog CI plugin for `lambda` commands",
|
|
6
6
|
"keywords": [
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"prepack": "yarn package:clean-dist"
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
38
|
-
"@datadog/datadog-ci-base": "4.0
|
|
38
|
+
"@datadog/datadog-ci-base": "4.1.0"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@aws-sdk/client-cloudwatch-logs": "^3.709.0",
|