@digitraffic/common 2022.10.28-2 → 2022.10.31-2
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/aws/infra/stack/lambda-configs.d.ts +4 -4
- package/dist/aws/infra/stack/lambda-configs.js +8 -8
- package/dist/aws/infra/stack/lambda-configs.js.map +1 -1
- package/dist/aws/infra/stack/monitoredfunction.d.ts +3 -3
- package/dist/aws/infra/stack/monitoredfunction.js.map +1 -1
- package/package.json +4 -4
- package/src/aws/infra/stack/lambda-configs.ts +12 -12
- package/src/aws/infra/stack/monitoredfunction.ts +3 -3
|
@@ -26,8 +26,8 @@ declare interface DbProps {
|
|
|
26
26
|
uri?: string;
|
|
27
27
|
ro_uri?: string;
|
|
28
28
|
}
|
|
29
|
-
export declare function databaseFunctionProps(stack: DigitrafficStack, environment: LambdaEnvironment, lambdaName: string, simpleLambdaName: string, config?: FunctionParameters): FunctionProps;
|
|
30
|
-
export declare function lambdaFunctionProps(stack: DigitrafficStack, environment: LambdaEnvironment, lambdaName: string, simpleLambdaName: string, config?: FunctionParameters): FunctionProps;
|
|
29
|
+
export declare function databaseFunctionProps(stack: DigitrafficStack, environment: LambdaEnvironment, lambdaName: string, simpleLambdaName: string, config?: Partial<FunctionParameters>): FunctionProps;
|
|
30
|
+
export declare function lambdaFunctionProps(stack: DigitrafficStack, environment: LambdaEnvironment, lambdaName: string, simpleLambdaName: string, config?: Partial<FunctionParameters>): FunctionProps;
|
|
31
31
|
/**
|
|
32
32
|
* Creates a base configuration for a Lambda that uses an RDS database
|
|
33
33
|
* @param vpc "Private" Lambdas are associated with a VPC
|
|
@@ -55,7 +55,7 @@ export interface FunctionParameters {
|
|
|
55
55
|
architecture?: Architecture;
|
|
56
56
|
singleLambda?: boolean;
|
|
57
57
|
}
|
|
58
|
-
export declare type MonitoredFunctionParameters = {
|
|
58
|
+
export declare type MonitoredFunctionParameters = FunctionParameters & {
|
|
59
59
|
readonly memorySize?: number;
|
|
60
60
|
readonly timeout?: number;
|
|
61
61
|
readonly functionName?: string;
|
|
@@ -68,5 +68,5 @@ export declare type MonitoredFunctionParameters = {
|
|
|
68
68
|
readonly durationWarningProps?: MonitoredFunctionAlarmProps;
|
|
69
69
|
readonly errorAlarmProps?: MonitoredFunctionAlarmProps;
|
|
70
70
|
readonly throttleAlarmProps?: MonitoredFunctionAlarmProps;
|
|
71
|
-
}
|
|
71
|
+
};
|
|
72
72
|
export {};
|
|
@@ -22,22 +22,22 @@ function databaseFunctionProps(stack, environment, lambdaName, simpleLambdaName,
|
|
|
22
22
|
exports.databaseFunctionProps = databaseFunctionProps;
|
|
23
23
|
function lambdaFunctionProps(stack, environment, lambdaName, simpleLambdaName, config) {
|
|
24
24
|
return {
|
|
25
|
-
runtime: config?.runtime
|
|
26
|
-
architecture: config?.architecture
|
|
27
|
-
memorySize: config?.memorySize
|
|
25
|
+
runtime: config?.runtime ?? aws_lambda_1.Runtime.NODEJS_14_X,
|
|
26
|
+
architecture: config?.architecture ?? aws_lambda_1.Architecture.ARM_64,
|
|
27
|
+
memorySize: config?.memorySize ?? 128,
|
|
28
28
|
functionName: lambdaName,
|
|
29
29
|
role: config?.role,
|
|
30
|
-
timeout: aws_cdk_lib_1.Duration.seconds(config?.timeout
|
|
30
|
+
timeout: aws_cdk_lib_1.Duration.seconds(config?.timeout ?? 60),
|
|
31
31
|
logRetention: aws_logs_1.RetentionDays.ONE_YEAR,
|
|
32
|
-
reservedConcurrentExecutions: config?.reservedConcurrentExecutions
|
|
33
|
-
code: getAssetCode(simpleLambdaName, config),
|
|
32
|
+
reservedConcurrentExecutions: config?.reservedConcurrentExecutions ?? 2,
|
|
33
|
+
code: getAssetCode(simpleLambdaName, config?.singleLambda ?? false),
|
|
34
34
|
handler: `${simpleLambdaName}.handler`,
|
|
35
35
|
environment,
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
38
|
exports.lambdaFunctionProps = lambdaFunctionProps;
|
|
39
|
-
function getAssetCode(simpleLambdaName,
|
|
40
|
-
const lambdaPath =
|
|
39
|
+
function getAssetCode(simpleLambdaName, isSingleLambda) {
|
|
40
|
+
const lambdaPath = isSingleLambda
|
|
41
41
|
? `dist/lambda/`
|
|
42
42
|
: `dist/lambda/${simpleLambdaName}`;
|
|
43
43
|
return new aws_lambda_1.AssetCode(lambdaPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambda-configs.js","sourceRoot":"","sources":["../../../../src/aws/infra/stack/lambda-configs.ts"],"names":[],"mappings":";;;AAAA,uDAMgC;AAChC,6CAAuC;AAEvC,mDAAqD;AAgCrD,SAAgB,qBAAqB,CACjC,KAAuB,EACvB,WAA8B,EAC9B,UAAkB,EAClB,gBAAwB,EACxB,
|
|
1
|
+
{"version":3,"file":"lambda-configs.js","sourceRoot":"","sources":["../../../../src/aws/infra/stack/lambda-configs.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ export declare class MonitoredFunction extends Function {
|
|
|
39
39
|
* @param functionProps Lambda function properties
|
|
40
40
|
* @param props Monitored function properties
|
|
41
41
|
*/
|
|
42
|
-
static create(stack: DigitrafficStack, id: string, functionProps: FunctionProps, props?: MonitoredFunctionProps): MonitoredFunction;
|
|
42
|
+
static create(stack: DigitrafficStack, id: string, functionProps: FunctionProps, props?: Partial<MonitoredFunctionProps>): MonitoredFunction;
|
|
43
43
|
/**
|
|
44
44
|
* Create new MonitoredFunction. Use topics from given DigitrafficStack. Generate names from given name and configuration shortName.
|
|
45
45
|
*
|
|
@@ -50,7 +50,7 @@ export declare class MonitoredFunction extends Function {
|
|
|
50
50
|
* @param environment Lambda environment
|
|
51
51
|
* @param functionParameters Lambda function parameters
|
|
52
52
|
*/
|
|
53
|
-
static createV2(stack: DigitrafficStack, name: string, environment: LambdaEnvironment, functionParameters?: MonitoredFunctionParameters): MonitoredFunction;
|
|
53
|
+
static createV2(stack: DigitrafficStack, name: string, environment: LambdaEnvironment, functionParameters?: Partial<MonitoredFunctionParameters>): MonitoredFunction;
|
|
54
54
|
/**
|
|
55
55
|
* @param scope Stack
|
|
56
56
|
* @param id Lambda construct Id
|
|
@@ -80,5 +80,5 @@ export declare class MonitoredDBFunction {
|
|
|
80
80
|
* @param environment Lambda environment
|
|
81
81
|
* @param functionParameters Lambda function parameters
|
|
82
82
|
*/
|
|
83
|
-
static create(stack: DigitrafficStack, name: string, environment?: LambdaEnvironment, functionParameters?: MonitoredFunctionParameters): MonitoredFunction;
|
|
83
|
+
static create(stack: DigitrafficStack, name: string, environment?: LambdaEnvironment, functionParameters?: Partial<MonitoredFunctionParameters>): MonitoredFunction;
|
|
84
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitoredfunction.js","sourceRoot":"","sources":["../../../../src/aws/infra/stack/monitoredfunction.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"monitoredfunction.js","sourceRoot":"","sources":["../../../../src/aws/infra/stack/monitoredfunction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@digitraffic/common",
|
|
3
|
-
"version": "2022.10.
|
|
3
|
+
"version": "2022.10.31-2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"src/**/*.ts"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@aws-cdk/aws-synthetics-alpha": "2.
|
|
29
|
+
"@aws-cdk/aws-synthetics-alpha": "2.47.0-alpha.0",
|
|
30
30
|
"@types/geojson": "^7946.0.10",
|
|
31
|
-
"aws-cdk-lib": "2.
|
|
32
|
-
"aws-sdk": "2.
|
|
31
|
+
"aws-cdk-lib": "2.47.0",
|
|
32
|
+
"aws-sdk": "2.1241.0",
|
|
33
33
|
"axios": "^0.21.1",
|
|
34
34
|
"change-case": "4.1.2",
|
|
35
35
|
"constructs": "10.1.131",
|
|
@@ -44,7 +44,7 @@ export function databaseFunctionProps(
|
|
|
44
44
|
environment: LambdaEnvironment,
|
|
45
45
|
lambdaName: string,
|
|
46
46
|
simpleLambdaName: string,
|
|
47
|
-
config?: FunctionParameters
|
|
47
|
+
config?: Partial<FunctionParameters>
|
|
48
48
|
): FunctionProps {
|
|
49
49
|
const vpcSubnets = stack.vpc
|
|
50
50
|
? {
|
|
@@ -73,18 +73,18 @@ export function lambdaFunctionProps(
|
|
|
73
73
|
environment: LambdaEnvironment,
|
|
74
74
|
lambdaName: string,
|
|
75
75
|
simpleLambdaName: string,
|
|
76
|
-
config?: FunctionParameters
|
|
76
|
+
config?: Partial<FunctionParameters>
|
|
77
77
|
): FunctionProps {
|
|
78
78
|
return {
|
|
79
|
-
runtime: config?.runtime
|
|
80
|
-
architecture: config?.architecture
|
|
81
|
-
memorySize: config?.memorySize
|
|
79
|
+
runtime: config?.runtime ?? Runtime.NODEJS_14_X,
|
|
80
|
+
architecture: config?.architecture ?? Architecture.ARM_64,
|
|
81
|
+
memorySize: config?.memorySize ?? 128,
|
|
82
82
|
functionName: lambdaName,
|
|
83
83
|
role: config?.role,
|
|
84
|
-
timeout: Duration.seconds(config?.timeout
|
|
84
|
+
timeout: Duration.seconds(config?.timeout ?? 60),
|
|
85
85
|
logRetention: RetentionDays.ONE_YEAR,
|
|
86
|
-
reservedConcurrentExecutions: config?.reservedConcurrentExecutions
|
|
87
|
-
code: getAssetCode(simpleLambdaName, config),
|
|
86
|
+
reservedConcurrentExecutions: config?.reservedConcurrentExecutions ?? 2,
|
|
87
|
+
code: getAssetCode(simpleLambdaName, config?.singleLambda ?? false),
|
|
88
88
|
handler: `${simpleLambdaName}.handler`,
|
|
89
89
|
environment,
|
|
90
90
|
};
|
|
@@ -92,9 +92,9 @@ export function lambdaFunctionProps(
|
|
|
92
92
|
|
|
93
93
|
function getAssetCode(
|
|
94
94
|
simpleLambdaName: string,
|
|
95
|
-
|
|
95
|
+
isSingleLambda: boolean
|
|
96
96
|
): AssetCode {
|
|
97
|
-
const lambdaPath =
|
|
97
|
+
const lambdaPath = isSingleLambda
|
|
98
98
|
? `dist/lambda/`
|
|
99
99
|
: `dist/lambda/${simpleLambdaName}`;
|
|
100
100
|
|
|
@@ -190,7 +190,7 @@ export interface FunctionParameters {
|
|
|
190
190
|
singleLambda?: boolean;
|
|
191
191
|
}
|
|
192
192
|
|
|
193
|
-
export type MonitoredFunctionParameters = {
|
|
193
|
+
export type MonitoredFunctionParameters = FunctionParameters & {
|
|
194
194
|
readonly memorySize?: number;
|
|
195
195
|
readonly timeout?: number;
|
|
196
196
|
readonly functionName?: string;
|
|
@@ -204,4 +204,4 @@ export type MonitoredFunctionParameters = {
|
|
|
204
204
|
readonly durationWarningProps?: MonitoredFunctionAlarmProps;
|
|
205
205
|
readonly errorAlarmProps?: MonitoredFunctionAlarmProps;
|
|
206
206
|
readonly throttleAlarmProps?: MonitoredFunctionAlarmProps;
|
|
207
|
-
}
|
|
207
|
+
};
|
|
@@ -75,7 +75,7 @@ export class MonitoredFunction extends Function {
|
|
|
75
75
|
stack: DigitrafficStack,
|
|
76
76
|
id: string,
|
|
77
77
|
functionProps: FunctionProps,
|
|
78
|
-
props?: MonitoredFunctionProps
|
|
78
|
+
props?: Partial<MonitoredFunctionProps>
|
|
79
79
|
): MonitoredFunction {
|
|
80
80
|
if (
|
|
81
81
|
props === MonitoredFunction.DISABLE_ALARMS &&
|
|
@@ -112,7 +112,7 @@ export class MonitoredFunction extends Function {
|
|
|
112
112
|
stack: DigitrafficStack,
|
|
113
113
|
name: string,
|
|
114
114
|
environment: LambdaEnvironment,
|
|
115
|
-
functionParameters?: MonitoredFunctionParameters
|
|
115
|
+
functionParameters?: Partial<MonitoredFunctionParameters>
|
|
116
116
|
): MonitoredFunction {
|
|
117
117
|
const functionName =
|
|
118
118
|
functionParameters?.functionName ||
|
|
@@ -310,7 +310,7 @@ export class MonitoredDBFunction {
|
|
|
310
310
|
stack: DigitrafficStack,
|
|
311
311
|
name: string,
|
|
312
312
|
environment?: LambdaEnvironment,
|
|
313
|
-
functionParameters?: MonitoredFunctionParameters
|
|
313
|
+
functionParameters?: Partial<MonitoredFunctionParameters>
|
|
314
314
|
): MonitoredFunction {
|
|
315
315
|
const functionName =
|
|
316
316
|
functionParameters?.functionName ||
|