@sylvesterllc/aws-constructs 1.1.25 → 1.1.27
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/config/microServiceConfig.js +2 -2
- package/dist/resources/lambda/create-basic-lambda-helper.js +112 -23
- package/dist/resources/lambda/create-basic-lambda.js +112 -23
- package/package.json +1 -1
- package/src/config/microServiceConfig.ts +1 -1
- package/src/resources/lambda/create-basic-lambda-helper.ts +152 -26
- package/src/resources/lambda/create-basic-lambda.ts +153 -26
|
@@ -9,7 +9,7 @@ exports.config = {
|
|
|
9
9
|
name: `${process.env.APP_NAME}`,
|
|
10
10
|
accountNumber: process.env.CDK_DEFAULT_ACCOUNT || "",
|
|
11
11
|
region: process.env.CDK_DEFAULT_REGION || "us-east-1",
|
|
12
|
-
stackRuntime: aws_lambda_1.Runtime.
|
|
12
|
+
stackRuntime: aws_lambda_1.Runtime.NODEJS_LATEST,
|
|
13
13
|
},
|
|
14
14
|
API: {
|
|
15
15
|
Name: `${process.env.APP_NAME}-auth-api`,
|
|
@@ -79,4 +79,4 @@ exports.config = {
|
|
|
79
79
|
FQDN: ''
|
|
80
80
|
}
|
|
81
81
|
};
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWljcm9TZXJ2aWNlQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9taWNyb1NlcnZpY2VDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkRBQXNGO0FBQ3RGLHVEQUFpRDtBQUNqRCwyQ0FBd0M7QUFHM0IsUUFBQSxNQUFNLEdBQWU7SUFDOUIsT0FBTyxFQUFFO1FBQ0wsSUFBSSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUU7UUFDL0IsYUFBYSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLElBQUksRUFBRTtRQUNwRCxNQUFNLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsSUFBSSxXQUFXO1FBQ3JELFlBQVksRUFBRSxvQkFBTyxDQUFDLGFBQWE7S0FDdEM7SUFDRCxHQUFHLEVBQUU7UUFDRCxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsV0FBVztRQUN4QyxXQUFXLEVBQUUsb0JBQW9CO1FBQ2pDLFlBQVksRUFBRSxlQUFlO0tBQ2hDO0lBQ0QsU0FBUyxFQUFFO1FBQ1AsTUFBTSxFQUFFO1lBQ0o7Z0JBQ0ksSUFBSSxFQUFFLGdCQUFnQjtnQkFDdEIsUUFBUSxFQUFFLDBDQUEwQztnQkFDcEQsT0FBTyxFQUFFLE1BQU07Z0JBQ2YsVUFBVSxFQUFFO29CQUNSLEtBQUssRUFBRSx5QkFBeUI7b0JBQ2hDLE1BQU0sRUFBRSxNQUFNO2lCQUNqQjthQUVKO1lBQ0Q7Z0JBQ0ksSUFBSSxFQUFFLGlCQUFpQjtnQkFDdkIsUUFBUSxFQUFFLDJDQUEyQztnQkFDckQsT0FBTyxFQUFFLE1BQU07Z0JBQ2YsVUFBVSxFQUFFO29CQUNSLEtBQUssRUFBRSwwQkFBMEI7b0JBQ2pDLE1BQU0sRUFBRSxNQUFNO29CQUNkLE9BQU8sRUFBRSxDQUFDO2lCQUNiO2FBQ0o7U0FDSjtRQUVELE1BQU0sRUFBRTtZQUNKLE1BQU0sRUFBRTtnQkFDSjtvQkFDSSxTQUFTLEVBQUUsR0FBRyxxQkFBUyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO29CQUNqRSxVQUFVLEVBQUU7d0JBQ1IsSUFBSSxFQUFFLElBQUk7d0JBQ1YsSUFBSSxFQUFFLDRCQUFhLENBQUMsTUFBTTtxQkFDN0I7b0JBQ0QsV0FBVyxFQUFFLDBCQUFXLENBQUMsZUFBZTtvQkFDeEMsT0FBTyxFQUFFO3dCQUNMOzRCQUNJLFNBQVMsRUFBRSxxQkFBUyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxJQUFJOzRCQUNsRixZQUFZLEVBQUU7Z0NBQ1YsSUFBSSxFQUFFLFdBQVc7Z0NBQ2pCLElBQUksRUFBRSw0QkFBYSxDQUFDLE1BQU07NkJBQzdCOzRCQUNELGNBQWMsRUFBRSw2QkFBYyxDQUFDLEdBQUc7eUJBQ3JDO3dCQUNEOzRCQUNJLFNBQVMsRUFBRSxxQkFBUyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJOzRCQUM3RSxZQUFZLEVBQUU7Z0NBQ1YsSUFBSSxFQUFFLFVBQVU7Z0NBQ2hCLElBQUksRUFBRSw0QkFBYSxDQUFDLE1BQU07NkJBQzdCOzRCQUNELGNBQWMsRUFBRSw2QkFBYyxDQUFDLEdBQUc7eUJBQ3JDO3FCQUNKO2lCQUNKO2FBQ0o7U0FDSjtLQUVKO0lBQ0QsR0FBRyxFQUFFO1FBQ0QsUUFBUSxFQUFFLEVBQUU7UUFDWixNQUFNLEVBQUUsRUFBRTtRQUNWLHFCQUFxQixFQUFFLFVBQVU7UUFDakMscUJBQXFCLEVBQUUsVUFBVTtRQUNqQyxTQUFTLEVBQUUsSUFBSTtRQUNmLFFBQVEsRUFBRSxFQUFFO1FBQ1osSUFBSSxFQUFFLEVBQUU7S0FFWDtDQUNKLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBdHRyaWJ1dGVUeXBlLCBCaWxsaW5nTW9kZSwgUHJvamVjdGlvblR5cGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWR5bmFtb2RiXCI7XHJcbmltcG9ydCB7IFJ1bnRpbWUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWxhbWJkYVwiO1xyXG5pbXBvcnQgeyBDT05TVEFOVFMgfSBmcm9tIFwiLi9Db25zdGFudHNcIjtcclxuaW1wb3J0IHsgSUFwcENvbmZpZyB9IGZyb20gXCIuL2N1c3RvbUNvbmZpZ3MvSUFwcENvbmZpZ1wiO1xyXG5cclxuZXhwb3J0IGNvbnN0IGNvbmZpZzogSUFwcENvbmZpZyA9IHtcclxuICAgIEdMT0JBTFM6IHtcclxuICAgICAgICBuYW1lOiBgJHtwcm9jZXNzLmVudi5BUFBfTkFNRX1gLFxyXG4gICAgICAgIGFjY291bnROdW1iZXI6IHByb2Nlc3MuZW52LkNES19ERUZBVUxUX0FDQ09VTlQgfHwgXCJcIixcclxuICAgICAgICByZWdpb246IHByb2Nlc3MuZW52LkNES19ERUZBVUxUX1JFR0lPTiB8fCBcInVzLWVhc3QtMVwiLFxyXG4gICAgICAgIHN0YWNrUnVudGltZTogUnVudGltZS5OT0RFSlNfTEFURVNULFxyXG4gICAgfSxcclxuICAgIEFQSToge1xyXG4gICAgICAgIE5hbWU6IGAke3Byb2Nlc3MuZW52LkFQUF9OQU1FfS1hdXRoLWFwaWAsXHJcbiAgICAgICAgRGVzY3JpcHRpb246ICdUaGlzIGlzIG15IG5ldyBBUEknLFxyXG4gICAgICAgIERvbWFpblByZWZpeDogJ215LWN1c3RvbS1hcGknXHJcbiAgICB9LFxyXG4gICAgUkVTT1VSQ0VTOiB7XHJcbiAgICAgICAgTEFNQkRBOiBbXHJcbiAgICAgICAgICAgIHtcclxuICAgICAgICAgICAgICAgIG5hbWU6IGBjcmVhdGUtYWNjb3VudGAsXHJcbiAgICAgICAgICAgICAgICBjb2RlUGF0aDogJy4vbGFtYmRhLWZ1bmN0aW9ucy9hdXRoL2NyZWF0ZUFjY291bnQudHMnLFxyXG4gICAgICAgICAgICAgICAgaGFuZGxlcjogJ21haW4nLFxyXG4gICAgICAgICAgICAgICAgYXBpR2F0ZXdheToge1xyXG4gICAgICAgICAgICAgICAgICAgIHJvdXRlOiAnL2FjY291bnQvY3JlYXRlLWFjY291bnQnLFxyXG4gICAgICAgICAgICAgICAgICAgIG1ldGhvZDogJ3Bvc3QnLCAgICAgICAgICAgICAgICAgICAgXHJcbiAgICAgICAgICAgICAgICB9LFxyXG5cclxuICAgICAgICAgICAgfSxcclxuICAgICAgICAgICAge1xyXG4gICAgICAgICAgICAgICAgbmFtZTogYGNoYW5nZS1wYXNzd29yZGAsXHJcbiAgICAgICAgICAgICAgICBjb2RlUGF0aDogJy4vbGFtYmRhLWZ1bmN0aW9ucy9hdXRoL2NoYW5nZVBhc3N3b3JkLnRzJyxcclxuICAgICAgICAgICAgICAgIGhhbmRsZXI6ICdtYWluJyxcclxuICAgICAgICAgICAgICAgIGFwaUdhdGV3YXk6IHtcclxuICAgICAgICAgICAgICAgICAgICByb3V0ZTogJy9hY2NvdW50L2NoYW5nZS1wYXNzd29yZCcsXHJcbiAgICAgICAgICAgICAgICAgICAgbWV0aG9kOiAncG9zdCcsXHJcbiAgICAgICAgICAgICAgICAgICAgdmVyc2lvbjogMlxyXG4gICAgICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICB9LFxyXG4gICAgICAgIF0sXHJcbiAgICAgICAgXHJcbiAgICAgICAgRFlOQU1POiB7XHJcbiAgICAgICAgICAgIFRBQkxFUzogW1xyXG4gICAgICAgICAgICAgICAge1xyXG4gICAgICAgICAgICAgICAgICAgIHRhYmxlTmFtZTogYCR7Q09OU1RBTlRTLkRZTkFNT0RCLlRBQkxFUy5BVVRIX0hJU1RPUllfVEFCTEUubmFtZX1gLFxyXG4gICAgICAgICAgICAgICAgICAgIHByaW1hcnlLZXk6IHtcclxuICAgICAgICAgICAgICAgICAgICAgICAgbmFtZTogJ2lkJyxcclxuICAgICAgICAgICAgICAgICAgICAgICAgdHlwZTogQXR0cmlidXRlVHlwZS5TVFJJTkcsXHJcbiAgICAgICAgICAgICAgICAgICAgfSxcclxuICAgICAgICAgICAgICAgICAgICBiaWxsaW5nTW9kZTogQmlsbGluZ01vZGUuUEFZX1BFUl9SRVFVRVNULFxyXG4gICAgICAgICAgICAgICAgICAgIGluZGV4ZXM6IFtcclxuICAgICAgICAgICAgICAgICAgICAgICAge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kZXhOYW1lOiBDT05TVEFOVFMuRFlOQU1PREIuVEFCTEVTLkFVVEhfSElTVE9SWV9UQUJMRS5pbmRleGVzLkF1dGhIaXN0b3J5VFMubmFtZSxcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnRpdGlvbktleToge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU6ICdjcmVhdGVkVFMnLFxyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuTlVNQkVSXHJcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LFxyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJvamVjdGlvblR5cGU6IFByb2plY3Rpb25UeXBlLkFMTFxyXG4gICAgICAgICAgICAgICAgICAgICAgICB9LFxyXG4gICAgICAgICAgICAgICAgICAgICAgICB7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmRleE5hbWU6IENPTlNUQU5UUy5EWU5BTU9EQi5UQUJMRVMuQVVUSF9ISVNUT1JZX1RBQkxFLmluZGV4ZXMuVXNlcm5hbWUubmFtZSxcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnRpdGlvbktleToge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU6ICd1c2VybmFtZScsXHJcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZTogQXR0cmlidXRlVHlwZS5TVFJJTkdcclxuICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sXHJcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm9qZWN0aW9uVHlwZTogUHJvamVjdGlvblR5cGUuQUxMXHJcbiAgICAgICAgICAgICAgICAgICAgICAgIH0sXHJcbiAgICAgICAgICAgICAgICAgICAgXVxyXG4gICAgICAgICAgICAgICAgfSxcclxuICAgICAgICAgICAgXSxcclxuICAgICAgICB9LFxyXG5cclxuICAgIH0sXHJcbiAgICBETlM6IHtcclxuICAgICAgICBab25lTmFtZTogJycsXHJcbiAgICAgICAgWm9uZUlkOiAnJyxcclxuICAgICAgICBab25lTmFtZVdpdGhvdXRQZXJpb2Q6ICdub3QtdXNlZCcsXHJcbiAgICAgICAgWm9uZU5hbWVXaXRob3V0U3VmZml4OiAnbm90LXVzZWQnLFxyXG4gICAgICAgIFpvbmVFeGlzdDogdHJ1ZSxcclxuICAgICAgICBIb3N0TmFtZTogJycsXHJcbiAgICAgICAgRlFETjogJydcclxuXHJcbiAgICB9XHJcbn07ICJdfQ==
|
|
@@ -5,8 +5,79 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
|
5
5
|
const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
|
|
6
6
|
const aws_lambda_nodejs_1 = require("aws-cdk-lib/aws-lambda-nodejs");
|
|
7
7
|
const aws_logs_1 = require("aws-cdk-lib/aws-logs");
|
|
8
|
+
const fs = require("fs");
|
|
8
9
|
const path = require("path");
|
|
9
10
|
const aws_dynamodb_1 = require("aws-cdk-lib/aws-dynamodb");
|
|
11
|
+
const isSubPath = (root, target) => {
|
|
12
|
+
const relative = path.relative(path.resolve(root), path.resolve(target));
|
|
13
|
+
return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
|
|
14
|
+
};
|
|
15
|
+
const LOCK_FILE_NAMES = ["pnpm-lock.yaml", "yarn.lock", "package-lock.json"];
|
|
16
|
+
const resolveProjectRoot = (projectRoot) => {
|
|
17
|
+
if (!projectRoot) {
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
return path.isAbsolute(projectRoot)
|
|
21
|
+
? path.resolve(projectRoot)
|
|
22
|
+
: path.resolve(process.cwd(), projectRoot);
|
|
23
|
+
};
|
|
24
|
+
const findNearestLockFile = (startDir) => {
|
|
25
|
+
let current = path.resolve(startDir);
|
|
26
|
+
const { root } = path.parse(current);
|
|
27
|
+
while (true) {
|
|
28
|
+
for (const candidate of LOCK_FILE_NAMES) {
|
|
29
|
+
const resolvedCandidate = path.join(current, candidate);
|
|
30
|
+
if (fs.existsSync(resolvedCandidate) && fs.statSync(resolvedCandidate).isFile()) {
|
|
31
|
+
return resolvedCandidate;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
if (current === root) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
current = path.dirname(current);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
const findCommonAncestor = (paths) => {
|
|
41
|
+
if (paths.length === 0) {
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
let ancestor = path.resolve(paths[0]);
|
|
45
|
+
for (const currentPath of paths.slice(1)) {
|
|
46
|
+
const target = path.resolve(currentPath);
|
|
47
|
+
const ancestorRoot = path.parse(ancestor).root;
|
|
48
|
+
if (path.parse(ancestor).root.toLowerCase() !== path.parse(target).root.toLowerCase()) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
let candidate = ancestor;
|
|
52
|
+
while (!isSubPath(candidate, target)) {
|
|
53
|
+
if (candidate === ancestorRoot) {
|
|
54
|
+
candidate = ancestorRoot;
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
candidate = path.dirname(candidate);
|
|
58
|
+
}
|
|
59
|
+
ancestor = candidate;
|
|
60
|
+
}
|
|
61
|
+
return ancestor;
|
|
62
|
+
};
|
|
63
|
+
const resolvePath = (inputPath, projectRoot) => {
|
|
64
|
+
if (path.isAbsolute(inputPath)) {
|
|
65
|
+
return path.resolve(inputPath);
|
|
66
|
+
}
|
|
67
|
+
const candidates = [];
|
|
68
|
+
if (projectRoot) {
|
|
69
|
+
candidates.push(path.resolve(projectRoot, inputPath));
|
|
70
|
+
}
|
|
71
|
+
candidates.push(path.resolve(process.cwd(), inputPath));
|
|
72
|
+
if (projectRoot) {
|
|
73
|
+
for (const candidate of candidates) {
|
|
74
|
+
if (isSubPath(projectRoot, candidate)) {
|
|
75
|
+
return candidate;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return candidates[candidates.length - 1];
|
|
80
|
+
};
|
|
10
81
|
const createBasicLambda = (scope, props) => {
|
|
11
82
|
const lambdaProps = createBasicLambdaProps(props);
|
|
12
83
|
let lambdaFunction = new aws_lambda_nodejs_1.NodejsFunction(scope, `${props.appPrefix || ""}${props.functionName}`, lambdaProps);
|
|
@@ -16,26 +87,44 @@ const createBasicLambda = (scope, props) => {
|
|
|
16
87
|
};
|
|
17
88
|
exports.createBasicLambda = createBasicLambda;
|
|
18
89
|
const createBasicLambdaProps = (props) => {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
90
|
+
const resolvedProjectRoot = resolveProjectRoot(props.projectRoot);
|
|
91
|
+
const defaultRelativeEntry = path.join("resources", "lambdas", props.functionName, "main.mts");
|
|
92
|
+
const entryPath = props.codePath ?? defaultRelativeEntry;
|
|
93
|
+
const resolvedEntry = resolvePath(entryPath, resolvedProjectRoot);
|
|
94
|
+
const cwd = path.resolve(process.cwd());
|
|
95
|
+
const entryDir = path.dirname(resolvedEntry);
|
|
96
|
+
let effectiveProjectRoot = resolvedProjectRoot ?? cwd;
|
|
97
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
98
|
+
const ancestor = findCommonAncestor([effectiveProjectRoot, entryDir]);
|
|
99
|
+
if (!ancestor) {
|
|
100
|
+
throw new Error(`Unable to determine a projectRoot that contains both ${effectiveProjectRoot} and ${resolvedEntry}.`);
|
|
101
|
+
}
|
|
102
|
+
effectiveProjectRoot = ancestor;
|
|
26
103
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
resolvedEntry = path.resolve(process.cwd(), props.projectRoot, `resources/lambdas/${props.functionName}/main.mts`);
|
|
104
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
105
|
+
throw new Error(`Resolved lambda entry ${resolvedEntry} must be located within projectRoot ${effectiveProjectRoot}.`);
|
|
30
106
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
107
|
+
let resolvedDepsLockFilePath = props.depsLockFilePath
|
|
108
|
+
? resolvePath(props.depsLockFilePath, resolvedProjectRoot)
|
|
109
|
+
: undefined;
|
|
110
|
+
if (!resolvedDepsLockFilePath) {
|
|
111
|
+
const potentialLockFiles = [
|
|
112
|
+
findNearestLockFile(entryDir),
|
|
113
|
+
findNearestLockFile(cwd),
|
|
114
|
+
effectiveProjectRoot !== cwd ? findNearestLockFile(effectiveProjectRoot) : undefined,
|
|
115
|
+
];
|
|
116
|
+
for (const lockFile of potentialLockFiles) {
|
|
117
|
+
if (lockFile && isSubPath(effectiveProjectRoot, lockFile)) {
|
|
118
|
+
resolvedDepsLockFilePath = lockFile;
|
|
119
|
+
break;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
34
122
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
123
|
+
if (resolvedDepsLockFilePath &&
|
|
124
|
+
!isSubPath(effectiveProjectRoot, resolvedDepsLockFilePath)) {
|
|
125
|
+
throw new Error(`Resolved depsLockFilePath ${resolvedDepsLockFilePath} must be located within projectRoot ${effectiveProjectRoot}.`);
|
|
38
126
|
}
|
|
127
|
+
const environmentVars = props.envs ?? {};
|
|
39
128
|
const lambdaProp = {
|
|
40
129
|
entry: resolvedEntry,
|
|
41
130
|
functionName: `${props.appPrefix ? `${props.appPrefix}-` : ""}${props.functionName}`,
|
|
@@ -45,7 +134,7 @@ const createBasicLambdaProps = (props) => {
|
|
|
45
134
|
timeout: aws_cdk_lib_1.Duration.minutes(props.timeoutInMinutes ? props.timeoutInMinutes : 1),
|
|
46
135
|
memorySize: props.memory,
|
|
47
136
|
environment: {
|
|
48
|
-
...
|
|
137
|
+
...environmentVars,
|
|
49
138
|
},
|
|
50
139
|
bundling: {
|
|
51
140
|
minify: true,
|
|
@@ -53,15 +142,15 @@ const createBasicLambdaProps = (props) => {
|
|
|
53
142
|
sourceMap: true,
|
|
54
143
|
sourceMapMode: aws_lambda_nodejs_1.SourceMapMode.EXTERNAL,
|
|
55
144
|
environment: {
|
|
56
|
-
...
|
|
145
|
+
...environmentVars,
|
|
57
146
|
},
|
|
58
|
-
...(props.projectRoot && { projectRoot: props.projectRoot }),
|
|
59
|
-
...(props.depsLockFilePath && {
|
|
60
|
-
depsLockFilePath: props.depsLockFilePath,
|
|
61
|
-
}),
|
|
62
147
|
},
|
|
63
148
|
role: props.role,
|
|
64
149
|
layers: undefined,
|
|
150
|
+
...(effectiveProjectRoot && { projectRoot: effectiveProjectRoot }),
|
|
151
|
+
...(resolvedDepsLockFilePath && {
|
|
152
|
+
depsLockFilePath: resolvedDepsLockFilePath,
|
|
153
|
+
}),
|
|
65
154
|
};
|
|
66
155
|
return lambdaProp;
|
|
67
156
|
};
|
|
@@ -81,4 +170,4 @@ const addLambdaLayers = (scope, lambda, layerArns) => {
|
|
|
81
170
|
});
|
|
82
171
|
}
|
|
83
172
|
};
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-basic-lambda-helper.js","sourceRoot":"","sources":["../../../src/resources/lambda/create-basic-lambda-helper.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;AAEvC,uDAA+D;AAC/D,qEAIuC;AACvC,mDAAqD;AACrD,6BAA8B;AAG9B,2DAAiD;AAE1C,MAAM,iBAAiB,GAAG,CAC/B,KAAgB,EAChB,KAAkB,EACF,EAAE;IAClB,MAAM,WAAW,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAElD,IAAI,cAAc,GAAG,IAAI,kCAAc,CACrC,KAAK,EACL,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,EAC/C,WAAW,CACZ,CAAC;IAEF,yBAAyB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEzE,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAE7D,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAjBW,QAAA,iBAAiB,qBAiB5B;AAEF,MAAM,sBAAsB,GAAG,CAAC,KAAkB,EAAuB,EAAE;IACzE,IAAI,aAAqB,CAAC;IAE1B,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtD,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC;IACjC,CAAC;SAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QAC/C,qEAAqE;QACrE,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;SAAM,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QAC7B,iDAAiD;QACjD,aAAa,GAAG,IAAI,CAAC,OAAO,CAC1B,OAAO,CAAC,GAAG,EAAE,EACb,KAAK,CAAC,WAAW,EACjB,qBAAqB,KAAK,CAAC,YAAY,WAAW,CACnD,CAAC;IACJ,CAAC;SAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,+BAA+B;QAC/B,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,mCAAmC;QACnC,aAAa,GAAG,IAAI,CAAC,IAAI,CACvB,uBAAuB,KAAK,CAAC,YAAY,WAAW,CACrD,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAwB;QACtC,KAAK,EAAE,aAAa;QACpB,YAAY,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,GAC3D,KAAK,CAAC,YACR,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,YAAY,EAAE,wBAAa,CAAC,SAAS;QACrC,OAAO,EAAE,oBAAO,CAAC,aAAa;QAC9B,OAAO,EAAE,sBAAQ,CAAC,OAAO,CACvB,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CACpD;QACD,UAAU,EAAE,KAAK,CAAC,MAAM;QACxB,WAAW,EAAE;YACX,GAAG,KAAK,CAAC,IAAI;SACd;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,iCAAa,CAAC,QAAQ;YACrC,WAAW,EAAE;gBACX,GAAG,KAAK,CAAC,IAAI;aACd;YACD,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;YAC5D,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI;gBAC5B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;aACzC,CAAC;SACH;QACD,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,SAAS;KAClB,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,KAAgB,EAChB,MAAsB,EACtB,UAAqB,EACrB,EAAE;IACF,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC/B,MAAM,KAAK,GAAG,oBAAK,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,SAAS,QAAQ,EAAE,SAAS,CAAC,CAAC;YAE1E,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CACtB,KAAgB,EAChB,MAAsB,EACtB,SAAoB,EACpB,EAAE;IACF,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,SAAS,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE;YAC7C,MAAM,KAAK,GAAG,yBAAY,CAAC,mBAAmB,CAC5C,KAAK,EACL,gBAAgB,GAAG,EAAE,EACrB,GAAG,CACJ,CAAC;YAEF,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC","sourcesContent":["import { Duration } from \"aws-cdk-lib\";\r\nimport { ServicePrincipal } from \"aws-cdk-lib/aws-iam\";\r\nimport { LayerVersion, Runtime } from \"aws-cdk-lib/aws-lambda\";\r\nimport {\r\n  NodejsFunction,\r\n  NodejsFunctionProps,\r\n  SourceMapMode,\r\n} from \"aws-cdk-lib/aws-lambda-nodejs\";\r\nimport { RetentionDays } from \"aws-cdk-lib/aws-logs\";\r\nimport path = require(\"path\");\r\nimport { LambdaProps } from \"../../interfaces/lambda\";\r\nimport { Construct } from \"constructs\";\r\nimport { Table } from \"aws-cdk-lib/aws-dynamodb\";\r\n\r\nexport const createBasicLambda = (\r\n  scope: Construct,\r\n  props: LambdaProps\r\n): NodejsFunction => {\r\n  const lambdaProps = createBasicLambdaProps(props);\r\n\r\n  let lambdaFunction = new NodejsFunction(\r\n    scope,\r\n    `${props.appPrefix || \"\"}${props.functionName}`,\r\n    lambdaProps\r\n  );\r\n\r\n  grantAccessToDynamoTables(scope, lambdaFunction, props.dynamoTableNames);\r\n\r\n  addLambdaLayers(scope, lambdaFunction, props.lambdaLayerArn);\r\n\r\n  return lambdaFunction;\r\n};\r\n\r\nconst createBasicLambdaProps = (props: LambdaProps): NodejsFunctionProps => {\r\n  let resolvedEntry: string;\r\n\r\n  if (props.codePath && path.isAbsolute(props.codePath)) {\r\n    resolvedEntry = props.codePath;\r\n  } else if (props.codePath && props.projectRoot) {\r\n    // codePath is relative, resolve from current directory + projectRoot\r\n    resolvedEntry = path.resolve(process.cwd(), props.codePath);\r\n  } else if (props.projectRoot) {\r\n    // No codePath, use default path with projectRoot\r\n    resolvedEntry = path.resolve(\r\n      process.cwd(),\r\n      props.projectRoot,\r\n      `resources/lambdas/${props.functionName}/main.mts`\r\n    );\r\n  } else if (props.codePath) {\r\n    // codePath without projectRoot\r\n    resolvedEntry = path.resolve(process.cwd(), props.codePath);\r\n  } else {\r\n    // Default path without projectRoot\r\n    resolvedEntry = path.join(\r\n      `./resources/lambdas/${props.functionName}/main.mts`\r\n    );\r\n  }\r\n\r\n  const lambdaProp: NodejsFunctionProps = {\r\n    entry: resolvedEntry,\r\n    functionName: `${props.appPrefix ? `${props.appPrefix}-` : \"\"}${\r\n      props.functionName\r\n    }`,\r\n    handler: \"main.ts\",\r\n    logRetention: RetentionDays.TWO_WEEKS,\r\n    runtime: Runtime.NODEJS_LATEST,\r\n    timeout: Duration.minutes(\r\n      props.timeoutInMinutes ? props.timeoutInMinutes : 1\r\n    ),\r\n    memorySize: props.memory,\r\n    environment: {\r\n      ...props.envs,\r\n    },\r\n    bundling: {\r\n      minify: true,\r\n      target: `esnext`,\r\n      sourceMap: true,\r\n      sourceMapMode: SourceMapMode.EXTERNAL,\r\n      environment: {\r\n        ...props.envs,\r\n      },\r\n      ...(props.projectRoot && { projectRoot: props.projectRoot }),\r\n      ...(props.depsLockFilePath && {\r\n        depsLockFilePath: props.depsLockFilePath,\r\n      }),\r\n    },\r\n    role: props.role,\r\n    layers: undefined,\r\n  };\r\n\r\n  return lambdaProp;\r\n};\r\n\r\nconst grantAccessToDynamoTables = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  tableNames?: string[]\r\n) => {\r\n  if (tableNames && tableNames.length > 0) {\r\n    tableNames.forEach((tableName) => {\r\n      const table = Table.fromTableName(scope, `${tableName}-table`, tableName);\r\n\r\n      table.grantReadWriteData(lambda);\r\n    });\r\n  }\r\n};\r\n\r\nconst addLambdaLayers = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  layerArns?: string[]\r\n) => {\r\n  if (layerArns && layerArns.length > 0) {\r\n    layerArns.forEach((arn: string, idx: number) => {\r\n      const layer = LayerVersion.fromLayerVersionArn(\r\n        scope,\r\n        `common-layer-${idx}`,\r\n        arn\r\n      );\r\n\r\n      lambda.addLayers(layer);\r\n    });\r\n  }\r\n};\r\n"]}
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-basic-lambda-helper.js","sourceRoot":"","sources":["../../../src/resources/lambda/create-basic-lambda-helper.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration } from \"aws-cdk-lib\";\r\nimport { ServicePrincipal } from \"aws-cdk-lib/aws-iam\";\r\nimport { LayerVersion, Runtime } from \"aws-cdk-lib/aws-lambda\";\r\nimport {\r\n  NodejsFunction,\r\n  NodejsFunctionProps,\r\n  SourceMapMode,\r\n} from \"aws-cdk-lib/aws-lambda-nodejs\";\r\nimport { RetentionDays } from \"aws-cdk-lib/aws-logs\";\r\nimport fs = require(\"fs\");\r\nimport path = require(\"path\");\r\nimport { LambdaProps } from \"../../interfaces/lambda\";\r\nimport { Construct } from \"constructs\";\r\nimport { Table } from \"aws-cdk-lib/aws-dynamodb\";\r\n\r\nconst isSubPath = (root: string, target: string): boolean => {\r\n  const relative = path.relative(path.resolve(root), path.resolve(target));\r\n  return relative === \"\" || (!relative.startsWith(\"..\") && !path.isAbsolute(relative));\r\n};\r\n\r\nconst LOCK_FILE_NAMES = [\"pnpm-lock.yaml\", \"yarn.lock\", \"package-lock.json\"];\r\n\r\nconst resolveProjectRoot = (projectRoot?: string): string | undefined => {\r\n  if (!projectRoot) {\r\n    return undefined;\r\n  }\r\n\r\n  return path.isAbsolute(projectRoot)\r\n    ? path.resolve(projectRoot)\r\n    : path.resolve(process.cwd(), projectRoot);\r\n};\r\n\r\nconst findNearestLockFile = (startDir: string): string | undefined => {\r\n  let current = path.resolve(startDir);\r\n  const { root } = path.parse(current);\r\n\r\n  while (true) {\r\n    for (const candidate of LOCK_FILE_NAMES) {\r\n      const resolvedCandidate = path.join(current, candidate);\r\n      if (fs.existsSync(resolvedCandidate) && fs.statSync(resolvedCandidate).isFile()) {\r\n        return resolvedCandidate;\r\n      }\r\n    }\r\n\r\n    if (current === root) {\r\n      return undefined;\r\n    }\r\n\r\n    current = path.dirname(current);\r\n  }\r\n};\r\n\r\nconst findCommonAncestor = (paths: string[]): string | undefined => {\r\n  if (paths.length === 0) {\r\n    return undefined;\r\n  }\r\n\r\n  let ancestor = path.resolve(paths[0]);\r\n\r\n  for (const currentPath of paths.slice(1)) {\r\n    const target = path.resolve(currentPath);\r\n    const ancestorRoot = path.parse(ancestor).root;\r\n\r\n    if (path.parse(ancestor).root.toLowerCase() !== path.parse(target).root.toLowerCase()) {\r\n      return undefined;\r\n    }\r\n\r\n    let candidate = ancestor;\r\n    while (!isSubPath(candidate, target)) {\r\n      if (candidate === ancestorRoot) {\r\n        candidate = ancestorRoot;\r\n        break;\r\n      }\r\n      candidate = path.dirname(candidate);\r\n    }\r\n\r\n    ancestor = candidate;\r\n  }\r\n\r\n  return ancestor;\r\n};\r\n\r\nconst resolvePath = (inputPath: string, projectRoot?: string): string => {\r\n  if (path.isAbsolute(inputPath)) {\r\n    return path.resolve(inputPath);\r\n  }\r\n\r\n  const candidates: string[] = [];\r\n  if (projectRoot) {\r\n    candidates.push(path.resolve(projectRoot, inputPath));\r\n  }\r\n  candidates.push(path.resolve(process.cwd(), inputPath));\r\n\r\n  if (projectRoot) {\r\n    for (const candidate of candidates) {\r\n      if (isSubPath(projectRoot, candidate)) {\r\n        return candidate;\r\n      }\r\n    }\r\n  }\r\n\r\n  return candidates[candidates.length - 1];\r\n};\r\n\r\nexport const createBasicLambda = (\r\n  scope: Construct,\r\n  props: LambdaProps\r\n): NodejsFunction => {\r\n  const lambdaProps = createBasicLambdaProps(props);\r\n\r\n  let lambdaFunction = new NodejsFunction(\r\n    scope,\r\n    `${props.appPrefix || \"\"}${props.functionName}`,\r\n    lambdaProps\r\n  );\r\n\r\n  grantAccessToDynamoTables(scope, lambdaFunction, props.dynamoTableNames);\r\n\r\n  addLambdaLayers(scope, lambdaFunction, props.lambdaLayerArn);\r\n\r\n  return lambdaFunction;\r\n};\r\n\r\nconst createBasicLambdaProps = (props: LambdaProps): NodejsFunctionProps => {\r\n  const resolvedProjectRoot = resolveProjectRoot(props.projectRoot);\r\n  const defaultRelativeEntry = path.join(\r\n    \"resources\",\r\n    \"lambdas\",\r\n    props.functionName,\r\n    \"main.mts\"\r\n  );\r\n  const entryPath = props.codePath ?? defaultRelativeEntry;\r\n  const resolvedEntry = resolvePath(entryPath, resolvedProjectRoot);\r\n\r\n  const cwd = path.resolve(process.cwd());\r\n  const entryDir = path.dirname(resolvedEntry);\r\n\r\n  let effectiveProjectRoot = resolvedProjectRoot ?? cwd;\r\n  if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {\r\n    const ancestor = findCommonAncestor([effectiveProjectRoot, entryDir]);\r\n    if (!ancestor) {\r\n      throw new Error(\r\n        `Unable to determine a projectRoot that contains both ${effectiveProjectRoot} and ${resolvedEntry}.`\r\n      );\r\n    }\r\n    effectiveProjectRoot = ancestor;\r\n  }\r\n\r\n  if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {\r\n    throw new Error(\r\n      `Resolved lambda entry ${resolvedEntry} must be located within projectRoot ${effectiveProjectRoot}.`\r\n    );\r\n  }\r\n\r\n  let resolvedDepsLockFilePath = props.depsLockFilePath\r\n    ? resolvePath(props.depsLockFilePath, resolvedProjectRoot)\r\n    : undefined;\r\n\r\n  if (!resolvedDepsLockFilePath) {\r\n    const potentialLockFiles = [\r\n      findNearestLockFile(entryDir),\r\n      findNearestLockFile(cwd),\r\n      effectiveProjectRoot !== cwd ? findNearestLockFile(effectiveProjectRoot) : undefined,\r\n    ];\r\n\r\n    for (const lockFile of potentialLockFiles) {\r\n      if (lockFile && isSubPath(effectiveProjectRoot, lockFile)) {\r\n        resolvedDepsLockFilePath = lockFile;\r\n        break;\r\n      }\r\n    }\r\n  }\r\n\r\n  if (\r\n    resolvedDepsLockFilePath &&\r\n    !isSubPath(effectiveProjectRoot, resolvedDepsLockFilePath)\r\n  ) {\r\n    throw new Error(\r\n      `Resolved depsLockFilePath ${resolvedDepsLockFilePath} must be located within projectRoot ${effectiveProjectRoot}.`\r\n    );\r\n  }\r\n\r\n  const environmentVars = props.envs ?? {};\r\n\r\n  const lambdaProp: NodejsFunctionProps = {\r\n    entry: resolvedEntry,\r\n    functionName: `${props.appPrefix ? `${props.appPrefix}-` : \"\"}${\r\n      props.functionName\r\n    }`,\r\n    handler: \"main.ts\",\r\n    logRetention: RetentionDays.TWO_WEEKS,\r\n    runtime: Runtime.NODEJS_LATEST,\r\n    timeout: Duration.minutes(\r\n      props.timeoutInMinutes ? props.timeoutInMinutes : 1\r\n    ),\r\n    memorySize: props.memory,\r\n    environment: {\r\n      ...environmentVars,\r\n    },\r\n    bundling: {\r\n      minify: true,\r\n      target: `esnext`,\r\n      sourceMap: true,\r\n      sourceMapMode: SourceMapMode.EXTERNAL,\r\n      environment: {\r\n        ...environmentVars,\r\n      },\r\n    },\r\n    role: props.role,\r\n    layers: undefined,\r\n    ...(effectiveProjectRoot && { projectRoot: effectiveProjectRoot }),\r\n    ...(resolvedDepsLockFilePath && {\r\n      depsLockFilePath: resolvedDepsLockFilePath,\r\n    }),\r\n  };\r\n\r\n  return lambdaProp;\r\n};\r\n\r\nconst grantAccessToDynamoTables = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  tableNames?: string[]\r\n) => {\r\n  if (tableNames && tableNames.length > 0) {\r\n    tableNames.forEach((tableName) => {\r\n      const table = Table.fromTableName(scope, `${tableName}-table`, tableName);\r\n\r\n      table.grantReadWriteData(lambda);\r\n    });\r\n  }\r\n};\r\n\r\nconst addLambdaLayers = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  layerArns?: string[]\r\n) => {\r\n  if (layerArns && layerArns.length > 0) {\r\n    layerArns.forEach((arn: string, idx: number) => {\r\n      const layer = LayerVersion.fromLayerVersionArn(\r\n        scope,\r\n        `common-layer-${idx}`,\r\n        arn\r\n      );\r\n\r\n      lambda.addLayers(layer);\r\n    });\r\n  }\r\n};\r\n"]}
|
|
@@ -6,11 +6,82 @@ const aws_iam_1 = require("aws-cdk-lib/aws-iam");
|
|
|
6
6
|
const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
|
|
7
7
|
const aws_lambda_nodejs_1 = require("aws-cdk-lib/aws-lambda-nodejs");
|
|
8
8
|
const aws_logs_1 = require("aws-cdk-lib/aws-logs");
|
|
9
|
+
const fs = require("fs");
|
|
9
10
|
const path = require("path");
|
|
10
11
|
const aws_service_principal_constants_1 = require("../../constants/aws-service-principal-constants");
|
|
11
12
|
const aws_events_1 = require("aws-cdk-lib/aws-events");
|
|
12
13
|
const aws_events_targets_1 = require("aws-cdk-lib/aws-events-targets");
|
|
13
14
|
const aws_dynamodb_1 = require("aws-cdk-lib/aws-dynamodb");
|
|
15
|
+
const isSubPath = (root, target) => {
|
|
16
|
+
const relative = path.relative(path.resolve(root), path.resolve(target));
|
|
17
|
+
return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
|
|
18
|
+
};
|
|
19
|
+
const LOCK_FILE_NAMES = ["pnpm-lock.yaml", "yarn.lock", "package-lock.json"];
|
|
20
|
+
const resolveProjectRoot = (projectRoot) => {
|
|
21
|
+
if (!projectRoot) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
return path.isAbsolute(projectRoot)
|
|
25
|
+
? path.resolve(projectRoot)
|
|
26
|
+
: path.resolve(process.cwd(), projectRoot);
|
|
27
|
+
};
|
|
28
|
+
const findNearestLockFile = (startDir) => {
|
|
29
|
+
let current = path.resolve(startDir);
|
|
30
|
+
const { root } = path.parse(current);
|
|
31
|
+
while (true) {
|
|
32
|
+
for (const candidate of LOCK_FILE_NAMES) {
|
|
33
|
+
const resolvedCandidate = path.join(current, candidate);
|
|
34
|
+
if (fs.existsSync(resolvedCandidate) && fs.statSync(resolvedCandidate).isFile()) {
|
|
35
|
+
return resolvedCandidate;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (current === root) {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
current = path.dirname(current);
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
const findCommonAncestor = (paths) => {
|
|
45
|
+
if (paths.length === 0) {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
let ancestor = path.resolve(paths[0]);
|
|
49
|
+
for (const currentPath of paths.slice(1)) {
|
|
50
|
+
const target = path.resolve(currentPath);
|
|
51
|
+
const ancestorRoot = path.parse(ancestor).root;
|
|
52
|
+
if (path.parse(ancestor).root.toLowerCase() !== path.parse(target).root.toLowerCase()) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
let candidate = ancestor;
|
|
56
|
+
while (!isSubPath(candidate, target)) {
|
|
57
|
+
if (candidate === ancestorRoot) {
|
|
58
|
+
candidate = ancestorRoot;
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
61
|
+
candidate = path.dirname(candidate);
|
|
62
|
+
}
|
|
63
|
+
ancestor = candidate;
|
|
64
|
+
}
|
|
65
|
+
return ancestor;
|
|
66
|
+
};
|
|
67
|
+
const resolvePath = (inputPath, projectRoot) => {
|
|
68
|
+
if (path.isAbsolute(inputPath)) {
|
|
69
|
+
return path.resolve(inputPath);
|
|
70
|
+
}
|
|
71
|
+
const candidates = [];
|
|
72
|
+
if (projectRoot) {
|
|
73
|
+
candidates.push(path.resolve(projectRoot, inputPath));
|
|
74
|
+
}
|
|
75
|
+
candidates.push(path.resolve(process.cwd(), inputPath));
|
|
76
|
+
if (projectRoot) {
|
|
77
|
+
for (const candidate of candidates) {
|
|
78
|
+
if (isSubPath(projectRoot, candidate)) {
|
|
79
|
+
return candidate;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return candidates[candidates.length - 1];
|
|
84
|
+
};
|
|
14
85
|
const createBasicLambdaTimerJob = (scope, props) => {
|
|
15
86
|
const lambdaProps = createBasicLambdaProps(props);
|
|
16
87
|
let lambdaFunction = new aws_lambda_nodejs_1.NodejsFunction(scope, `${props.appPrefix}${props.functionName}`, lambdaProps);
|
|
@@ -23,26 +94,44 @@ const createBasicLambdaTimerJob = (scope, props) => {
|
|
|
23
94
|
};
|
|
24
95
|
exports.createBasicLambdaTimerJob = createBasicLambdaTimerJob;
|
|
25
96
|
const createBasicLambdaProps = (props) => {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
97
|
+
const resolvedProjectRoot = resolveProjectRoot(props.projectRoot);
|
|
98
|
+
const defaultRelativeEntry = path.join("resources", "lambdas", "timer-jobs", props.functionName, "main.mts");
|
|
99
|
+
const entryPath = props.codePath ?? defaultRelativeEntry;
|
|
100
|
+
const resolvedEntry = resolvePath(entryPath, resolvedProjectRoot);
|
|
101
|
+
const cwd = path.resolve(process.cwd());
|
|
102
|
+
const entryDir = path.dirname(resolvedEntry);
|
|
103
|
+
let effectiveProjectRoot = resolvedProjectRoot ?? cwd;
|
|
104
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
105
|
+
const ancestor = findCommonAncestor([effectiveProjectRoot, entryDir]);
|
|
106
|
+
if (!ancestor) {
|
|
107
|
+
throw new Error(`Unable to determine a projectRoot that contains both ${effectiveProjectRoot} and ${resolvedEntry}.`);
|
|
108
|
+
}
|
|
109
|
+
effectiveProjectRoot = ancestor;
|
|
33
110
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
resolvedEntry = path.resolve(process.cwd(), props.projectRoot, `resources/lambdas/timer-jobs/${props.functionName}/main.mts`);
|
|
111
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
112
|
+
throw new Error(`Resolved lambda entry ${resolvedEntry} must be located within projectRoot ${effectiveProjectRoot}.`);
|
|
37
113
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
114
|
+
let resolvedDepsLockFilePath = props.depsLockFilePath
|
|
115
|
+
? resolvePath(props.depsLockFilePath, resolvedProjectRoot)
|
|
116
|
+
: undefined;
|
|
117
|
+
if (!resolvedDepsLockFilePath) {
|
|
118
|
+
const potentialLockFiles = [
|
|
119
|
+
findNearestLockFile(entryDir),
|
|
120
|
+
findNearestLockFile(cwd),
|
|
121
|
+
effectiveProjectRoot !== cwd ? findNearestLockFile(effectiveProjectRoot) : undefined,
|
|
122
|
+
];
|
|
123
|
+
for (const lockFile of potentialLockFiles) {
|
|
124
|
+
if (lockFile && isSubPath(effectiveProjectRoot, lockFile)) {
|
|
125
|
+
resolvedDepsLockFilePath = lockFile;
|
|
126
|
+
break;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
41
129
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
130
|
+
if (resolvedDepsLockFilePath &&
|
|
131
|
+
!isSubPath(effectiveProjectRoot, resolvedDepsLockFilePath)) {
|
|
132
|
+
throw new Error(`Resolved depsLockFilePath ${resolvedDepsLockFilePath} must be located within projectRoot ${effectiveProjectRoot}.`);
|
|
45
133
|
}
|
|
134
|
+
const environmentVars = props.envs ?? {};
|
|
46
135
|
const lambdaProp = {
|
|
47
136
|
entry: resolvedEntry,
|
|
48
137
|
functionName: `${props.appPrefix ? `${props.appPrefix}-` : ""}${props.functionName}`,
|
|
@@ -52,7 +141,7 @@ const createBasicLambdaProps = (props) => {
|
|
|
52
141
|
timeout: aws_cdk_lib_1.Duration.minutes(props.timeoutInMinutes ? props.timeoutInMinutes : 1),
|
|
53
142
|
memorySize: props.memory,
|
|
54
143
|
environment: {
|
|
55
|
-
...
|
|
144
|
+
...environmentVars,
|
|
56
145
|
},
|
|
57
146
|
bundling: {
|
|
58
147
|
minify: true,
|
|
@@ -60,15 +149,15 @@ const createBasicLambdaProps = (props) => {
|
|
|
60
149
|
sourceMap: true,
|
|
61
150
|
sourceMapMode: aws_lambda_nodejs_1.SourceMapMode.EXTERNAL,
|
|
62
151
|
environment: {
|
|
63
|
-
...
|
|
152
|
+
...environmentVars,
|
|
64
153
|
},
|
|
65
|
-
...(props.projectRoot && { projectRoot: props.projectRoot }),
|
|
66
|
-
...(props.depsLockFilePath && {
|
|
67
|
-
depsLockFilePath: props.depsLockFilePath,
|
|
68
|
-
}),
|
|
69
154
|
},
|
|
70
155
|
role: props.role,
|
|
71
156
|
layers: undefined,
|
|
157
|
+
...(effectiveProjectRoot && { projectRoot: effectiveProjectRoot }),
|
|
158
|
+
...(resolvedDepsLockFilePath && {
|
|
159
|
+
depsLockFilePath: resolvedDepsLockFilePath,
|
|
160
|
+
}),
|
|
72
161
|
};
|
|
73
162
|
return lambdaProp;
|
|
74
163
|
};
|
|
@@ -99,4 +188,4 @@ const addLambdaLayers = (scope, lambda, layerArns) => {
|
|
|
99
188
|
});
|
|
100
189
|
}
|
|
101
190
|
};
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-basic-lambda.js","sourceRoot":"","sources":["../../../src/resources/lambda/create-basic-lambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration } from \"aws-cdk-lib\";\r\nimport { ServicePrincipal } from \"aws-cdk-lib/aws-iam\";\r\nimport { LayerVersion, Runtime } from \"aws-cdk-lib/aws-lambda\";\r\nimport {\r\n  NodejsFunction,\r\n  NodejsFunctionProps,\r\n  SourceMapMode,\r\n} from \"aws-cdk-lib/aws-lambda-nodejs\";\r\nimport { RetentionDays } from \"aws-cdk-lib/aws-logs\";\r\nimport path = require(\"path\");\r\nimport { TimerJobProps } from \"../../interfaces/timer-job\";\r\nimport { Construct } from \"constructs\";\r\nimport { SERVICE_PRINCIPAL } from \"../../constants/aws-service-principal-constants\";\r\nimport { CronOptions, Rule, Schedule } from \"aws-cdk-lib/aws-events\";\r\nimport { LambdaFunction } from \"aws-cdk-lib/aws-events-targets\";\r\nimport { Table } from \"aws-cdk-lib/aws-dynamodb\";\r\n\r\nexport const createBasicLambdaTimerJob = (\r\n  scope: Construct,\r\n  props: TimerJobProps\r\n): NodejsFunction => {\r\n  const lambdaProps = createBasicLambdaProps(props);\r\n\r\n  let lambdaFunction = new NodejsFunction(\r\n    scope,\r\n    `${props.appPrefix}${props.functionName}`,\r\n    lambdaProps\r\n  );\r\n\r\n  addInvokePermissionToLambdaForEvents(lambdaFunction);\r\n\r\n  const eventRule = createEventRuleForLambda(\r\n    scope,\r\n    lambdaFunction,\r\n    props.cronOptions\r\n  );\r\n\r\n  eventRule.addTarget(new LambdaFunction(lambdaFunction));\r\n\r\n  grantAccessToDynamoTables(scope, lambdaFunction, props.dynamoTableNames);\r\n\r\n  addLambdaLayers(scope, lambdaFunction, props.lambdaLayerArn);\r\n\r\n  return lambdaFunction;\r\n};\r\n\r\nconst createBasicLambdaProps = (props: TimerJobProps): NodejsFunctionProps => {\r\n  let resolvedEntry: string;\r\n\r\n  if (props.codePath && path.isAbsolute(props.codePath)) {\r\n    resolvedEntry = props.codePath;\r\n  } else if (props.codePath && props.projectRoot) {\r\n    // codePath is relative, resolve from current directory + projectRoot\r\n    resolvedEntry = path.resolve(process.cwd(), props.codePath);\r\n  } else if (props.projectRoot) {\r\n    // No codePath, use default path with projectRoot\r\n    resolvedEntry = path.resolve(\r\n      process.cwd(),\r\n      props.projectRoot,\r\n      `resources/lambdas/timer-jobs/${props.functionName}/main.mts`\r\n    );\r\n  } else if (props.codePath) {\r\n    // codePath without projectRoot\r\n    resolvedEntry = path.resolve(process.cwd(), props.codePath);\r\n  } else {\r\n    // Default path without projectRoot\r\n    resolvedEntry = path.join(\r\n      `./resources/lambdas/timer-jobs/${props.functionName}/main.mts`\r\n    );\r\n  }\r\n\r\n  const lambdaProp: NodejsFunctionProps = {\r\n    entry: resolvedEntry,\r\n    functionName: `${props.appPrefix ? `${props.appPrefix}-` : \"\"}${\r\n      props.functionName\r\n    }`,\r\n    handler: \"main.ts\",\r\n    logRetention: RetentionDays.TWO_WEEKS,\r\n    runtime: Runtime.NODEJS_LATEST,\r\n    timeout: Duration.minutes(\r\n      props.timeoutInMinutes ? props.timeoutInMinutes : 1\r\n    ),\r\n    memorySize: props.memory,\r\n    environment: {\r\n      ...props.envs,\r\n    },\r\n    bundling: {\r\n      minify: true,\r\n      target: `esnext`,\r\n      sourceMap: true,\r\n      sourceMapMode: SourceMapMode.EXTERNAL,\r\n      environment: {\r\n        ...props.envs,\r\n      },\r\n      ...(props.projectRoot && { projectRoot: props.projectRoot }),\r\n      ...(props.depsLockFilePath && {\r\n        depsLockFilePath: props.depsLockFilePath,\r\n      }),\r\n    },\r\n    role: props.role,\r\n    layers: undefined,\r\n  };\r\n\r\n  return lambdaProp;\r\n};\r\n\r\nconst addInvokePermissionToLambdaForEvents = (lambda: NodejsFunction) => {\r\n  lambda.addPermission(`InvokePermission-${lambda.functionName}`, {\r\n    principal: new ServicePrincipal(SERVICE_PRINCIPAL.EVENTS),\r\n  });\r\n};\r\n\r\nconst createEventRuleForLambda = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  options: CronOptions\r\n) => {\r\n  const eventRule = new Rule(\r\n    scope,\r\n    `scheduleRule-${lambda?.node.id || \"010\"}`,\r\n    {\r\n      schedule: Schedule.cron(options),\r\n    }\r\n  );\r\n\r\n  return eventRule;\r\n};\r\n\r\nconst grantAccessToDynamoTables = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  tableNames?: string[]\r\n) => {\r\n  if (tableNames && tableNames.length > 0) {\r\n    tableNames.forEach((tableName) => {\r\n      const table = Table.fromTableName(scope, `${tableName}-table`, tableName);\r\n\r\n      table.grantReadWriteData(lambda);\r\n    });\r\n  }\r\n};\r\n\r\nconst addLambdaLayers = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  layerArns?: string[]\r\n) => {\r\n  if (layerArns && layerArns.length > 0) {\r\n    layerArns.forEach((arn: string, idx: number) => {\r\n      const layer = LayerVersion.fromLayerVersionArn(\r\n        scope,\r\n        `common-layer-${idx}`,\r\n        arn\r\n      );\r\n\r\n      lambda.addLayers(layer);\r\n    });\r\n  }\r\n};\r\n"]}
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-basic-lambda.js","sourceRoot":"","sources":["../../../src/resources/lambda/create-basic-lambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration } from \"aws-cdk-lib\";\r\nimport { ServicePrincipal } from \"aws-cdk-lib/aws-iam\";\r\nimport { LayerVersion, Runtime } from \"aws-cdk-lib/aws-lambda\";\r\nimport {\r\n  NodejsFunction,\r\n  NodejsFunctionProps,\r\n  SourceMapMode,\r\n} from \"aws-cdk-lib/aws-lambda-nodejs\";\r\nimport { RetentionDays } from \"aws-cdk-lib/aws-logs\";\r\nimport fs = require(\"fs\");\r\nimport path = require(\"path\");\r\nimport { TimerJobProps } from \"../../interfaces/timer-job\";\r\nimport { Construct } from \"constructs\";\r\nimport { SERVICE_PRINCIPAL } from \"../../constants/aws-service-principal-constants\";\r\nimport { CronOptions, Rule, Schedule } from \"aws-cdk-lib/aws-events\";\r\nimport { LambdaFunction } from \"aws-cdk-lib/aws-events-targets\";\r\nimport { Table } from \"aws-cdk-lib/aws-dynamodb\";\r\n\r\nconst isSubPath = (root: string, target: string): boolean => {\r\n  const relative = path.relative(path.resolve(root), path.resolve(target));\r\n  return relative === \"\" || (!relative.startsWith(\"..\") && !path.isAbsolute(relative));\r\n};\r\n\r\nconst LOCK_FILE_NAMES = [\"pnpm-lock.yaml\", \"yarn.lock\", \"package-lock.json\"];\r\n\r\nconst resolveProjectRoot = (projectRoot?: string): string | undefined => {\r\n  if (!projectRoot) {\r\n    return undefined;\r\n  }\r\n\r\n  return path.isAbsolute(projectRoot)\r\n    ? path.resolve(projectRoot)\r\n    : path.resolve(process.cwd(), projectRoot);\r\n};\r\n\r\nconst findNearestLockFile = (startDir: string): string | undefined => {\r\n  let current = path.resolve(startDir);\r\n  const { root } = path.parse(current);\r\n\r\n  while (true) {\r\n    for (const candidate of LOCK_FILE_NAMES) {\r\n      const resolvedCandidate = path.join(current, candidate);\r\n      if (fs.existsSync(resolvedCandidate) && fs.statSync(resolvedCandidate).isFile()) {\r\n        return resolvedCandidate;\r\n      }\r\n    }\r\n\r\n    if (current === root) {\r\n      return undefined;\r\n    }\r\n\r\n    current = path.dirname(current);\r\n  }\r\n};\r\n\r\nconst findCommonAncestor = (paths: string[]): string | undefined => {\r\n  if (paths.length === 0) {\r\n    return undefined;\r\n  }\r\n\r\n  let ancestor = path.resolve(paths[0]);\r\n\r\n  for (const currentPath of paths.slice(1)) {\r\n    const target = path.resolve(currentPath);\r\n    const ancestorRoot = path.parse(ancestor).root;\r\n\r\n    if (path.parse(ancestor).root.toLowerCase() !== path.parse(target).root.toLowerCase()) {\r\n      return undefined;\r\n    }\r\n\r\n    let candidate = ancestor;\r\n    while (!isSubPath(candidate, target)) {\r\n      if (candidate === ancestorRoot) {\r\n        candidate = ancestorRoot;\r\n        break;\r\n      }\r\n      candidate = path.dirname(candidate);\r\n    }\r\n\r\n    ancestor = candidate;\r\n  }\r\n\r\n  return ancestor;\r\n};\r\n\r\nconst resolvePath = (inputPath: string, projectRoot?: string): string => {\r\n  if (path.isAbsolute(inputPath)) {\r\n    return path.resolve(inputPath);\r\n  }\r\n\r\n  const candidates: string[] = [];\r\n  if (projectRoot) {\r\n    candidates.push(path.resolve(projectRoot, inputPath));\r\n  }\r\n  candidates.push(path.resolve(process.cwd(), inputPath));\r\n\r\n  if (projectRoot) {\r\n    for (const candidate of candidates) {\r\n      if (isSubPath(projectRoot, candidate)) {\r\n        return candidate;\r\n      }\r\n    }\r\n  }\r\n\r\n  return candidates[candidates.length - 1];\r\n};\r\n\r\nexport const createBasicLambdaTimerJob = (\r\n  scope: Construct,\r\n  props: TimerJobProps\r\n): NodejsFunction => {\r\n  const lambdaProps = createBasicLambdaProps(props);\r\n\r\n  let lambdaFunction = new NodejsFunction(\r\n    scope,\r\n    `${props.appPrefix}${props.functionName}`,\r\n    lambdaProps\r\n  );\r\n\r\n  addInvokePermissionToLambdaForEvents(lambdaFunction);\r\n\r\n  const eventRule = createEventRuleForLambda(\r\n    scope,\r\n    lambdaFunction,\r\n    props.cronOptions\r\n  );\r\n\r\n  eventRule.addTarget(new LambdaFunction(lambdaFunction));\r\n\r\n  grantAccessToDynamoTables(scope, lambdaFunction, props.dynamoTableNames);\r\n\r\n  addLambdaLayers(scope, lambdaFunction, props.lambdaLayerArn);\r\n\r\n  return lambdaFunction;\r\n};\r\n\r\nconst createBasicLambdaProps = (props: TimerJobProps): NodejsFunctionProps => {\r\n  const resolvedProjectRoot = resolveProjectRoot(props.projectRoot);\r\n  const defaultRelativeEntry = path.join(\r\n    \"resources\",\r\n    \"lambdas\",\r\n    \"timer-jobs\",\r\n    props.functionName,\r\n    \"main.mts\"\r\n  );\r\n  const entryPath = props.codePath ?? defaultRelativeEntry;\r\n  const resolvedEntry = resolvePath(entryPath, resolvedProjectRoot);\r\n\r\n  const cwd = path.resolve(process.cwd());\r\n  const entryDir = path.dirname(resolvedEntry);\r\n\r\n  let effectiveProjectRoot = resolvedProjectRoot ?? cwd;\r\n  if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {\r\n    const ancestor = findCommonAncestor([effectiveProjectRoot, entryDir]);\r\n    if (!ancestor) {\r\n      throw new Error(\r\n        `Unable to determine a projectRoot that contains both ${effectiveProjectRoot} and ${resolvedEntry}.`\r\n      );\r\n    }\r\n    effectiveProjectRoot = ancestor;\r\n  }\r\n\r\n  if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {\r\n    throw new Error(\r\n      `Resolved lambda entry ${resolvedEntry} must be located within projectRoot ${effectiveProjectRoot}.`\r\n    );\r\n  }\r\n\r\n  let resolvedDepsLockFilePath = props.depsLockFilePath\r\n    ? resolvePath(props.depsLockFilePath, resolvedProjectRoot)\r\n    : undefined;\r\n\r\n  if (!resolvedDepsLockFilePath) {\r\n    const potentialLockFiles = [\r\n      findNearestLockFile(entryDir),\r\n      findNearestLockFile(cwd),\r\n      effectiveProjectRoot !== cwd ? findNearestLockFile(effectiveProjectRoot) : undefined,\r\n    ];\r\n\r\n    for (const lockFile of potentialLockFiles) {\r\n      if (lockFile && isSubPath(effectiveProjectRoot, lockFile)) {\r\n        resolvedDepsLockFilePath = lockFile;\r\n        break;\r\n      }\r\n    }\r\n  }\r\n\r\n  if (\r\n    resolvedDepsLockFilePath &&\r\n    !isSubPath(effectiveProjectRoot, resolvedDepsLockFilePath)\r\n  ) {\r\n    throw new Error(\r\n      `Resolved depsLockFilePath ${resolvedDepsLockFilePath} must be located within projectRoot ${effectiveProjectRoot}.`\r\n    );\r\n  }\r\n\r\n  const environmentVars = props.envs ?? {};\r\n\r\n  const lambdaProp: NodejsFunctionProps = {\r\n    entry: resolvedEntry,\r\n    functionName: `${props.appPrefix ? `${props.appPrefix}-` : \"\"}${\r\n      props.functionName\r\n    }`,\r\n    handler: \"main.ts\",\r\n    logRetention: RetentionDays.TWO_WEEKS,\r\n    runtime: Runtime.NODEJS_LATEST,\r\n    timeout: Duration.minutes(\r\n      props.timeoutInMinutes ? props.timeoutInMinutes : 1\r\n    ),\r\n    memorySize: props.memory,\r\n    environment: {\r\n      ...environmentVars,\r\n    },\r\n    bundling: {\r\n      minify: true,\r\n      target: `esnext`,\r\n      sourceMap: true,\r\n      sourceMapMode: SourceMapMode.EXTERNAL,\r\n      environment: {\r\n        ...environmentVars,\r\n      },\r\n    },\r\n    role: props.role,\r\n    layers: undefined,\r\n    ...(effectiveProjectRoot && { projectRoot: effectiveProjectRoot }),\r\n    ...(resolvedDepsLockFilePath && {\r\n      depsLockFilePath: resolvedDepsLockFilePath,\r\n    }),\r\n  };\r\n\r\n  return lambdaProp;\r\n};\r\n\r\nconst addInvokePermissionToLambdaForEvents = (lambda: NodejsFunction) => {\r\n  lambda.addPermission(`InvokePermission-${lambda.functionName}`, {\r\n    principal: new ServicePrincipal(SERVICE_PRINCIPAL.EVENTS),\r\n  });\r\n};\r\n\r\nconst createEventRuleForLambda = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  options: CronOptions\r\n) => {\r\n  const eventRule = new Rule(\r\n    scope,\r\n    `scheduleRule-${lambda?.node.id || \"010\"}`,\r\n    {\r\n      schedule: Schedule.cron(options),\r\n    }\r\n  );\r\n\r\n  return eventRule;\r\n};\r\n\r\nconst grantAccessToDynamoTables = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  tableNames?: string[]\r\n) => {\r\n  if (tableNames && tableNames.length > 0) {\r\n    tableNames.forEach((tableName) => {\r\n      const table = Table.fromTableName(scope, `${tableName}-table`, tableName);\r\n\r\n      table.grantReadWriteData(lambda);\r\n    });\r\n  }\r\n};\r\n\r\nconst addLambdaLayers = (\r\n  scope: Construct,\r\n  lambda: NodejsFunction,\r\n  layerArns?: string[]\r\n) => {\r\n  if (layerArns && layerArns.length > 0) {\r\n    layerArns.forEach((arn: string, idx: number) => {\r\n      const layer = LayerVersion.fromLayerVersionArn(\r\n        scope,\r\n        `common-layer-${idx}`,\r\n        arn\r\n      );\r\n\r\n      lambda.addLayers(layer);\r\n    });\r\n  }\r\n};\r\n"]}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@ export const config: IAppConfig = {
|
|
|
8
8
|
name: `${process.env.APP_NAME}`,
|
|
9
9
|
accountNumber: process.env.CDK_DEFAULT_ACCOUNT || "",
|
|
10
10
|
region: process.env.CDK_DEFAULT_REGION || "us-east-1",
|
|
11
|
-
stackRuntime: Runtime.
|
|
11
|
+
stackRuntime: Runtime.NODEJS_LATEST,
|
|
12
12
|
},
|
|
13
13
|
API: {
|
|
14
14
|
Name: `${process.env.APP_NAME}-auth-api`,
|
|
@@ -7,11 +7,101 @@ import {
|
|
|
7
7
|
SourceMapMode,
|
|
8
8
|
} from "aws-cdk-lib/aws-lambda-nodejs";
|
|
9
9
|
import { RetentionDays } from "aws-cdk-lib/aws-logs";
|
|
10
|
+
import fs = require("fs");
|
|
10
11
|
import path = require("path");
|
|
11
12
|
import { LambdaProps } from "../../interfaces/lambda";
|
|
12
13
|
import { Construct } from "constructs";
|
|
13
14
|
import { Table } from "aws-cdk-lib/aws-dynamodb";
|
|
14
15
|
|
|
16
|
+
const isSubPath = (root: string, target: string): boolean => {
|
|
17
|
+
const relative = path.relative(path.resolve(root), path.resolve(target));
|
|
18
|
+
return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
const LOCK_FILE_NAMES = ["pnpm-lock.yaml", "yarn.lock", "package-lock.json"];
|
|
22
|
+
|
|
23
|
+
const resolveProjectRoot = (projectRoot?: string): string | undefined => {
|
|
24
|
+
if (!projectRoot) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
return path.isAbsolute(projectRoot)
|
|
29
|
+
? path.resolve(projectRoot)
|
|
30
|
+
: path.resolve(process.cwd(), projectRoot);
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
const findNearestLockFile = (startDir: string): string | undefined => {
|
|
34
|
+
let current = path.resolve(startDir);
|
|
35
|
+
const { root } = path.parse(current);
|
|
36
|
+
|
|
37
|
+
while (true) {
|
|
38
|
+
for (const candidate of LOCK_FILE_NAMES) {
|
|
39
|
+
const resolvedCandidate = path.join(current, candidate);
|
|
40
|
+
if (fs.existsSync(resolvedCandidate) && fs.statSync(resolvedCandidate).isFile()) {
|
|
41
|
+
return resolvedCandidate;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (current === root) {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
current = path.dirname(current);
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
const findCommonAncestor = (paths: string[]): string | undefined => {
|
|
54
|
+
if (paths.length === 0) {
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
let ancestor = path.resolve(paths[0]);
|
|
59
|
+
|
|
60
|
+
for (const currentPath of paths.slice(1)) {
|
|
61
|
+
const target = path.resolve(currentPath);
|
|
62
|
+
const ancestorRoot = path.parse(ancestor).root;
|
|
63
|
+
|
|
64
|
+
if (path.parse(ancestor).root.toLowerCase() !== path.parse(target).root.toLowerCase()) {
|
|
65
|
+
return undefined;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
let candidate = ancestor;
|
|
69
|
+
while (!isSubPath(candidate, target)) {
|
|
70
|
+
if (candidate === ancestorRoot) {
|
|
71
|
+
candidate = ancestorRoot;
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
candidate = path.dirname(candidate);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
ancestor = candidate;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
return ancestor;
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
const resolvePath = (inputPath: string, projectRoot?: string): string => {
|
|
84
|
+
if (path.isAbsolute(inputPath)) {
|
|
85
|
+
return path.resolve(inputPath);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
const candidates: string[] = [];
|
|
89
|
+
if (projectRoot) {
|
|
90
|
+
candidates.push(path.resolve(projectRoot, inputPath));
|
|
91
|
+
}
|
|
92
|
+
candidates.push(path.resolve(process.cwd(), inputPath));
|
|
93
|
+
|
|
94
|
+
if (projectRoot) {
|
|
95
|
+
for (const candidate of candidates) {
|
|
96
|
+
if (isSubPath(projectRoot, candidate)) {
|
|
97
|
+
return candidate;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
return candidates[candidates.length - 1];
|
|
103
|
+
};
|
|
104
|
+
|
|
15
105
|
export const createBasicLambda = (
|
|
16
106
|
scope: Construct,
|
|
17
107
|
props: LambdaProps
|
|
@@ -32,30 +122,66 @@ export const createBasicLambda = (
|
|
|
32
122
|
};
|
|
33
123
|
|
|
34
124
|
const createBasicLambdaProps = (props: LambdaProps): NodejsFunctionProps => {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
125
|
+
const resolvedProjectRoot = resolveProjectRoot(props.projectRoot);
|
|
126
|
+
const defaultRelativeEntry = path.join(
|
|
127
|
+
"resources",
|
|
128
|
+
"lambdas",
|
|
129
|
+
props.functionName,
|
|
130
|
+
"main.mts"
|
|
131
|
+
);
|
|
132
|
+
const entryPath = props.codePath ?? defaultRelativeEntry;
|
|
133
|
+
const resolvedEntry = resolvePath(entryPath, resolvedProjectRoot);
|
|
134
|
+
|
|
135
|
+
const cwd = path.resolve(process.cwd());
|
|
136
|
+
const entryDir = path.dirname(resolvedEntry);
|
|
137
|
+
|
|
138
|
+
let effectiveProjectRoot = resolvedProjectRoot ?? cwd;
|
|
139
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
140
|
+
const ancestor = findCommonAncestor([effectiveProjectRoot, entryDir]);
|
|
141
|
+
if (!ancestor) {
|
|
142
|
+
throw new Error(
|
|
143
|
+
`Unable to determine a projectRoot that contains both ${effectiveProjectRoot} and ${resolvedEntry}.`
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
effectiveProjectRoot = ancestor;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
150
|
+
throw new Error(
|
|
151
|
+
`Resolved lambda entry ${resolvedEntry} must be located within projectRoot ${effectiveProjectRoot}.`
|
|
48
152
|
);
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
let resolvedDepsLockFilePath = props.depsLockFilePath
|
|
156
|
+
? resolvePath(props.depsLockFilePath, resolvedProjectRoot)
|
|
157
|
+
: undefined;
|
|
158
|
+
|
|
159
|
+
if (!resolvedDepsLockFilePath) {
|
|
160
|
+
const potentialLockFiles = [
|
|
161
|
+
findNearestLockFile(entryDir),
|
|
162
|
+
findNearestLockFile(cwd),
|
|
163
|
+
effectiveProjectRoot !== cwd ? findNearestLockFile(effectiveProjectRoot) : undefined,
|
|
164
|
+
];
|
|
165
|
+
|
|
166
|
+
for (const lockFile of potentialLockFiles) {
|
|
167
|
+
if (lockFile && isSubPath(effectiveProjectRoot, lockFile)) {
|
|
168
|
+
resolvedDepsLockFilePath = lockFile;
|
|
169
|
+
break;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
if (
|
|
175
|
+
resolvedDepsLockFilePath &&
|
|
176
|
+
!isSubPath(effectiveProjectRoot, resolvedDepsLockFilePath)
|
|
177
|
+
) {
|
|
178
|
+
throw new Error(
|
|
179
|
+
`Resolved depsLockFilePath ${resolvedDepsLockFilePath} must be located within projectRoot ${effectiveProjectRoot}.`
|
|
56
180
|
);
|
|
57
181
|
}
|
|
58
182
|
|
|
183
|
+
const environmentVars = props.envs ?? {};
|
|
184
|
+
|
|
59
185
|
const lambdaProp: NodejsFunctionProps = {
|
|
60
186
|
entry: resolvedEntry,
|
|
61
187
|
functionName: `${props.appPrefix ? `${props.appPrefix}-` : ""}${
|
|
@@ -69,7 +195,7 @@ const createBasicLambdaProps = (props: LambdaProps): NodejsFunctionProps => {
|
|
|
69
195
|
),
|
|
70
196
|
memorySize: props.memory,
|
|
71
197
|
environment: {
|
|
72
|
-
...
|
|
198
|
+
...environmentVars,
|
|
73
199
|
},
|
|
74
200
|
bundling: {
|
|
75
201
|
minify: true,
|
|
@@ -77,15 +203,15 @@ const createBasicLambdaProps = (props: LambdaProps): NodejsFunctionProps => {
|
|
|
77
203
|
sourceMap: true,
|
|
78
204
|
sourceMapMode: SourceMapMode.EXTERNAL,
|
|
79
205
|
environment: {
|
|
80
|
-
...
|
|
206
|
+
...environmentVars,
|
|
81
207
|
},
|
|
82
|
-
...(props.projectRoot && { projectRoot: props.projectRoot }),
|
|
83
|
-
...(props.depsLockFilePath && {
|
|
84
|
-
depsLockFilePath: props.depsLockFilePath,
|
|
85
|
-
}),
|
|
86
208
|
},
|
|
87
209
|
role: props.role,
|
|
88
210
|
layers: undefined,
|
|
211
|
+
...(effectiveProjectRoot && { projectRoot: effectiveProjectRoot }),
|
|
212
|
+
...(resolvedDepsLockFilePath && {
|
|
213
|
+
depsLockFilePath: resolvedDepsLockFilePath,
|
|
214
|
+
}),
|
|
89
215
|
};
|
|
90
216
|
|
|
91
217
|
return lambdaProp;
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
SourceMapMode,
|
|
8
8
|
} from "aws-cdk-lib/aws-lambda-nodejs";
|
|
9
9
|
import { RetentionDays } from "aws-cdk-lib/aws-logs";
|
|
10
|
+
import fs = require("fs");
|
|
10
11
|
import path = require("path");
|
|
11
12
|
import { TimerJobProps } from "../../interfaces/timer-job";
|
|
12
13
|
import { Construct } from "constructs";
|
|
@@ -15,6 +16,95 @@ import { CronOptions, Rule, Schedule } from "aws-cdk-lib/aws-events";
|
|
|
15
16
|
import { LambdaFunction } from "aws-cdk-lib/aws-events-targets";
|
|
16
17
|
import { Table } from "aws-cdk-lib/aws-dynamodb";
|
|
17
18
|
|
|
19
|
+
const isSubPath = (root: string, target: string): boolean => {
|
|
20
|
+
const relative = path.relative(path.resolve(root), path.resolve(target));
|
|
21
|
+
return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
const LOCK_FILE_NAMES = ["pnpm-lock.yaml", "yarn.lock", "package-lock.json"];
|
|
25
|
+
|
|
26
|
+
const resolveProjectRoot = (projectRoot?: string): string | undefined => {
|
|
27
|
+
if (!projectRoot) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return path.isAbsolute(projectRoot)
|
|
32
|
+
? path.resolve(projectRoot)
|
|
33
|
+
: path.resolve(process.cwd(), projectRoot);
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
const findNearestLockFile = (startDir: string): string | undefined => {
|
|
37
|
+
let current = path.resolve(startDir);
|
|
38
|
+
const { root } = path.parse(current);
|
|
39
|
+
|
|
40
|
+
while (true) {
|
|
41
|
+
for (const candidate of LOCK_FILE_NAMES) {
|
|
42
|
+
const resolvedCandidate = path.join(current, candidate);
|
|
43
|
+
if (fs.existsSync(resolvedCandidate) && fs.statSync(resolvedCandidate).isFile()) {
|
|
44
|
+
return resolvedCandidate;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
if (current === root) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
current = path.dirname(current);
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
const findCommonAncestor = (paths: string[]): string | undefined => {
|
|
57
|
+
if (paths.length === 0) {
|
|
58
|
+
return undefined;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
let ancestor = path.resolve(paths[0]);
|
|
62
|
+
|
|
63
|
+
for (const currentPath of paths.slice(1)) {
|
|
64
|
+
const target = path.resolve(currentPath);
|
|
65
|
+
const ancestorRoot = path.parse(ancestor).root;
|
|
66
|
+
|
|
67
|
+
if (path.parse(ancestor).root.toLowerCase() !== path.parse(target).root.toLowerCase()) {
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
let candidate = ancestor;
|
|
72
|
+
while (!isSubPath(candidate, target)) {
|
|
73
|
+
if (candidate === ancestorRoot) {
|
|
74
|
+
candidate = ancestorRoot;
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
candidate = path.dirname(candidate);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
ancestor = candidate;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
return ancestor;
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
const resolvePath = (inputPath: string, projectRoot?: string): string => {
|
|
87
|
+
if (path.isAbsolute(inputPath)) {
|
|
88
|
+
return path.resolve(inputPath);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
const candidates: string[] = [];
|
|
92
|
+
if (projectRoot) {
|
|
93
|
+
candidates.push(path.resolve(projectRoot, inputPath));
|
|
94
|
+
}
|
|
95
|
+
candidates.push(path.resolve(process.cwd(), inputPath));
|
|
96
|
+
|
|
97
|
+
if (projectRoot) {
|
|
98
|
+
for (const candidate of candidates) {
|
|
99
|
+
if (isSubPath(projectRoot, candidate)) {
|
|
100
|
+
return candidate;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
return candidates[candidates.length - 1];
|
|
106
|
+
};
|
|
107
|
+
|
|
18
108
|
export const createBasicLambdaTimerJob = (
|
|
19
109
|
scope: Construct,
|
|
20
110
|
props: TimerJobProps
|
|
@@ -45,30 +135,67 @@ export const createBasicLambdaTimerJob = (
|
|
|
45
135
|
};
|
|
46
136
|
|
|
47
137
|
const createBasicLambdaProps = (props: TimerJobProps): NodejsFunctionProps => {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
138
|
+
const resolvedProjectRoot = resolveProjectRoot(props.projectRoot);
|
|
139
|
+
const defaultRelativeEntry = path.join(
|
|
140
|
+
"resources",
|
|
141
|
+
"lambdas",
|
|
142
|
+
"timer-jobs",
|
|
143
|
+
props.functionName,
|
|
144
|
+
"main.mts"
|
|
145
|
+
);
|
|
146
|
+
const entryPath = props.codePath ?? defaultRelativeEntry;
|
|
147
|
+
const resolvedEntry = resolvePath(entryPath, resolvedProjectRoot);
|
|
148
|
+
|
|
149
|
+
const cwd = path.resolve(process.cwd());
|
|
150
|
+
const entryDir = path.dirname(resolvedEntry);
|
|
151
|
+
|
|
152
|
+
let effectiveProjectRoot = resolvedProjectRoot ?? cwd;
|
|
153
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
154
|
+
const ancestor = findCommonAncestor([effectiveProjectRoot, entryDir]);
|
|
155
|
+
if (!ancestor) {
|
|
156
|
+
throw new Error(
|
|
157
|
+
`Unable to determine a projectRoot that contains both ${effectiveProjectRoot} and ${resolvedEntry}.`
|
|
158
|
+
);
|
|
159
|
+
}
|
|
160
|
+
effectiveProjectRoot = ancestor;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
if (!isSubPath(effectiveProjectRoot, resolvedEntry)) {
|
|
164
|
+
throw new Error(
|
|
165
|
+
`Resolved lambda entry ${resolvedEntry} must be located within projectRoot ${effectiveProjectRoot}.`
|
|
61
166
|
);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
let resolvedDepsLockFilePath = props.depsLockFilePath
|
|
170
|
+
? resolvePath(props.depsLockFilePath, resolvedProjectRoot)
|
|
171
|
+
: undefined;
|
|
172
|
+
|
|
173
|
+
if (!resolvedDepsLockFilePath) {
|
|
174
|
+
const potentialLockFiles = [
|
|
175
|
+
findNearestLockFile(entryDir),
|
|
176
|
+
findNearestLockFile(cwd),
|
|
177
|
+
effectiveProjectRoot !== cwd ? findNearestLockFile(effectiveProjectRoot) : undefined,
|
|
178
|
+
];
|
|
179
|
+
|
|
180
|
+
for (const lockFile of potentialLockFiles) {
|
|
181
|
+
if (lockFile && isSubPath(effectiveProjectRoot, lockFile)) {
|
|
182
|
+
resolvedDepsLockFilePath = lockFile;
|
|
183
|
+
break;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
if (
|
|
189
|
+
resolvedDepsLockFilePath &&
|
|
190
|
+
!isSubPath(effectiveProjectRoot, resolvedDepsLockFilePath)
|
|
191
|
+
) {
|
|
192
|
+
throw new Error(
|
|
193
|
+
`Resolved depsLockFilePath ${resolvedDepsLockFilePath} must be located within projectRoot ${effectiveProjectRoot}.`
|
|
69
194
|
);
|
|
70
195
|
}
|
|
71
196
|
|
|
197
|
+
const environmentVars = props.envs ?? {};
|
|
198
|
+
|
|
72
199
|
const lambdaProp: NodejsFunctionProps = {
|
|
73
200
|
entry: resolvedEntry,
|
|
74
201
|
functionName: `${props.appPrefix ? `${props.appPrefix}-` : ""}${
|
|
@@ -82,7 +209,7 @@ const createBasicLambdaProps = (props: TimerJobProps): NodejsFunctionProps => {
|
|
|
82
209
|
),
|
|
83
210
|
memorySize: props.memory,
|
|
84
211
|
environment: {
|
|
85
|
-
...
|
|
212
|
+
...environmentVars,
|
|
86
213
|
},
|
|
87
214
|
bundling: {
|
|
88
215
|
minify: true,
|
|
@@ -90,15 +217,15 @@ const createBasicLambdaProps = (props: TimerJobProps): NodejsFunctionProps => {
|
|
|
90
217
|
sourceMap: true,
|
|
91
218
|
sourceMapMode: SourceMapMode.EXTERNAL,
|
|
92
219
|
environment: {
|
|
93
|
-
...
|
|
220
|
+
...environmentVars,
|
|
94
221
|
},
|
|
95
|
-
...(props.projectRoot && { projectRoot: props.projectRoot }),
|
|
96
|
-
...(props.depsLockFilePath && {
|
|
97
|
-
depsLockFilePath: props.depsLockFilePath,
|
|
98
|
-
}),
|
|
99
222
|
},
|
|
100
223
|
role: props.role,
|
|
101
224
|
layers: undefined,
|
|
225
|
+
...(effectiveProjectRoot && { projectRoot: effectiveProjectRoot }),
|
|
226
|
+
...(resolvedDepsLockFilePath && {
|
|
227
|
+
depsLockFilePath: resolvedDepsLockFilePath,
|
|
228
|
+
}),
|
|
102
229
|
};
|
|
103
230
|
|
|
104
231
|
return lambdaProp;
|