@digitraffic/common 2022.12.22-1 → 2022.12.22-3
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/api/handler-factory.d.ts +1 -1
- package/dist/aws/infra/api/handler-factory.js +10 -13
- package/dist/aws/infra/stack/stack-checking-aspect.js +2 -2
- package/dist/aws/infra/stacks/db-stack.js +2 -1
- package/package.json +1 -1
- package/src/aws/infra/api/handler-factory.ts +15 -19
- package/src/aws/infra/stack/stack-checking-aspect.ts +3 -3
@@ -1,7 +1,7 @@
|
|
1
1
|
import { DtLogger } from "../../runtime/dt-logger";
|
2
2
|
import { LambdaResponse } from "../../types/lambda-response";
|
3
3
|
export type LoggingHandler = (method: () => Promise<LambdaResponse>, logger: DtLogger) => Promise<LambdaResponse>;
|
4
|
-
export type ErrorHandler = (error: unknown) => LambdaResponse;
|
4
|
+
export type ErrorHandler = (error: unknown, logger: DtLogger) => LambdaResponse;
|
5
5
|
/**
|
6
6
|
* Factory class for creating lambda-handler functions. You can set functionality to handle logging and error-handling,
|
7
7
|
* with the defaults:
|
@@ -12,7 +12,15 @@ exports.createJsonLoggingHandler = exports.HandlerFactory = void 0;
|
|
12
12
|
*/
|
13
13
|
class HandlerFactory {
|
14
14
|
constructor() {
|
15
|
-
this.loggingHandler =
|
15
|
+
this.loggingHandler = async (method) => {
|
16
|
+
const start = Date.now();
|
17
|
+
try {
|
18
|
+
return await method();
|
19
|
+
}
|
20
|
+
finally {
|
21
|
+
console.info("method=%s.handler tookMs=%d", process.env.AWS_LAMBDA_FUNCTION_NAME, Date.now() - start);
|
22
|
+
}
|
23
|
+
};
|
16
24
|
this.errorHandler = (error) => {
|
17
25
|
throw error;
|
18
26
|
};
|
@@ -32,24 +40,13 @@ class HandlerFactory {
|
|
32
40
|
return await handler(event);
|
33
41
|
}
|
34
42
|
catch (error) {
|
35
|
-
return this.errorHandler(error);
|
43
|
+
return this.errorHandler(error, logger);
|
36
44
|
}
|
37
45
|
}, logger);
|
38
46
|
};
|
39
47
|
}
|
40
48
|
}
|
41
49
|
exports.HandlerFactory = HandlerFactory;
|
42
|
-
function createDefaultLoggingHandler() {
|
43
|
-
return async (method) => {
|
44
|
-
const start = Date.now();
|
45
|
-
try {
|
46
|
-
return await method();
|
47
|
-
}
|
48
|
-
finally {
|
49
|
-
console.info("method=%s.handler tookMs=%d", process.env.AWS_LAMBDA_FUNCTION_NAME, Date.now() - start);
|
50
|
-
}
|
51
|
-
};
|
52
|
-
}
|
53
50
|
function createJsonLoggingHandler() {
|
54
51
|
return async (method, logger) => {
|
55
52
|
const start = Date.now();
|
@@ -110,10 +110,10 @@ class StackCheckingAspect {
|
|
110
110
|
checkBucket(node) {
|
111
111
|
if (node instanceof aws_s3_1.CfnBucket) {
|
112
112
|
const c = node.publicAccessBlockConfiguration;
|
113
|
-
if (!c.blockPublicAcls ||
|
113
|
+
if (c && (!c.blockPublicAcls ||
|
114
114
|
!c.blockPublicPolicy ||
|
115
115
|
!c.ignorePublicAcls ||
|
116
|
-
!c.restrictPublicBuckets) {
|
116
|
+
!c.restrictPublicBuckets)) {
|
117
117
|
this.addAnnotation(node, ResourceType.bucketPublicity, "Check bucket publicity");
|
118
118
|
}
|
119
119
|
}
|
@@ -38,7 +38,8 @@ class DbStack extends aws_cdk_lib_1.Stack {
|
|
38
38
|
}),
|
39
39
|
parameters: {
|
40
40
|
"pg_stat_statements.track": "ALL",
|
41
|
-
random_page_cost: "1",
|
41
|
+
"random_page_cost": "1",
|
42
|
+
"work_mem": "512MB"
|
42
43
|
},
|
43
44
|
})
|
44
45
|
: aws_rds_1.ParameterGroup.fromParameterGroupName(this, "ParameterGroup", `default.aurora-postgresql${configuration.dbVersion.auroraPostgresMajorVersion}`);
|
package/package.json
CHANGED
@@ -6,7 +6,7 @@ export type LoggingHandler = (
|
|
6
6
|
logger: DtLogger
|
7
7
|
) => Promise<LambdaResponse>;
|
8
8
|
|
9
|
-
export type ErrorHandler = (error: unknown) => LambdaResponse;
|
9
|
+
export type ErrorHandler = (error: unknown, logger: DtLogger) => LambdaResponse;
|
10
10
|
|
11
11
|
/**
|
12
12
|
* Factory class for creating lambda-handler functions. You can set functionality to handle logging and error-handling,
|
@@ -22,7 +22,19 @@ export class HandlerFactory {
|
|
22
22
|
private errorHandler: ErrorHandler;
|
23
23
|
|
24
24
|
constructor() {
|
25
|
-
this.loggingHandler =
|
25
|
+
this.loggingHandler = async (method: () => Promise<LambdaResponse>) => {
|
26
|
+
const start = Date.now();
|
27
|
+
|
28
|
+
try {
|
29
|
+
return await method();
|
30
|
+
} finally {
|
31
|
+
console.info(
|
32
|
+
"method=%s.handler tookMs=%d",
|
33
|
+
process.env.AWS_LAMBDA_FUNCTION_NAME,
|
34
|
+
Date.now() - start
|
35
|
+
);
|
36
|
+
}
|
37
|
+
};
|
26
38
|
|
27
39
|
this.errorHandler = (error: unknown) => {
|
28
40
|
throw error;
|
@@ -48,29 +60,13 @@ export class HandlerFactory {
|
|
48
60
|
try {
|
49
61
|
return await handler(event);
|
50
62
|
} catch (error) {
|
51
|
-
return this.errorHandler(error);
|
63
|
+
return this.errorHandler(error, logger);
|
52
64
|
}
|
53
65
|
}, logger);
|
54
66
|
};
|
55
67
|
}
|
56
68
|
}
|
57
69
|
|
58
|
-
function createDefaultLoggingHandler(): LoggingHandler {
|
59
|
-
return async (method: () => Promise<LambdaResponse>) => {
|
60
|
-
const start = Date.now();
|
61
|
-
|
62
|
-
try {
|
63
|
-
return await method();
|
64
|
-
} finally {
|
65
|
-
console.info(
|
66
|
-
"method=%s.handler tookMs=%d",
|
67
|
-
process.env.AWS_LAMBDA_FUNCTION_NAME,
|
68
|
-
Date.now() - start
|
69
|
-
);
|
70
|
-
}
|
71
|
-
};
|
72
|
-
}
|
73
|
-
|
74
70
|
export function createJsonLoggingHandler(): LoggingHandler {
|
75
71
|
return async (method: () => Promise<LambdaResponse>, logger: DtLogger) => {
|
76
72
|
const start = Date.now();
|
@@ -181,14 +181,14 @@ export class StackCheckingAspect implements IAspect {
|
|
181
181
|
private checkBucket(node: IConstruct) {
|
182
182
|
if (node instanceof CfnBucket) {
|
183
183
|
const c =
|
184
|
-
node.publicAccessBlockConfiguration as CfnBucket.PublicAccessBlockConfigurationProperty;
|
184
|
+
node.publicAccessBlockConfiguration as CfnBucket.PublicAccessBlockConfigurationProperty | undefined;
|
185
185
|
|
186
|
-
if (
|
186
|
+
if (c && (
|
187
187
|
!c.blockPublicAcls ||
|
188
188
|
!c.blockPublicPolicy ||
|
189
189
|
!c.ignorePublicAcls ||
|
190
190
|
!c.restrictPublicBuckets
|
191
|
-
) {
|
191
|
+
)) {
|
192
192
|
this.addAnnotation(
|
193
193
|
node,
|
194
194
|
ResourceType.bucketPublicity,
|