Skip to content

Commit 8ad5d04

Browse files
hupe1980hupe1980
committed
Refactor env handling
1 parent 9ff0c7c commit 8ad5d04

File tree

35 files changed

+110
-1592
lines changed

35 files changed

+110
-1592
lines changed

‎packages/cdk-cloudfront-authorization/lambda-file-sizes.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎packages/cdk-cloudfront-authorization/src/lambdas/user-pool-domain/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ export const handler: CloudFormationCustomResourceHandler = async (event) => {
4949
DomainName: domainName,
5050
},
5151
};
52-
} catch (err) {
52+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
53+
} catch (err: any) {
5354
response = {
5455
LogicalResourceId,
5556
PhysicalResourceId: physicalResourceId || `failed-to-create-${Date.now()}`,

‎packages/cdk-codepipeline-check-parameter-action/lambda-file-sizes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"timestamp":1606329520238,"files":[{"filename":"check-parameter/index.js","previous":2158,"size":2166,"diff":8}]},{"timestamp":1596442979475,"files":[{"filename":"check-parameter/index.js","previous":6031,"size":2158,"diff":-3873}]},{"timestamp":1596407637891,"files":[{"filename":"check-parameter/index.js","previous":2354,"size":6031,"diff":3677}]}]
1+
[{"timestamp":1631688054589,"files":[{"filename":"check-parameter/index.js","previous":2166,"size":2208,"diff":42}]},{"timestamp":1606329520238,"files":[{"filename":"check-parameter/index.js","previous":2158,"size":2166,"diff":8}]},{"timestamp":1596442979475,"files":[{"filename":"check-parameter/index.js","previous":6031,"size":2158,"diff":-3873}]},{"timestamp":1596407637891,"files":[{"filename":"check-parameter/index.js","previous":2354,"size":6031,"diff":3677}]}]

‎packages/cdk-codepipeline-check-parameter-action/src/__tests__/__snapshots__/codepipeline-check-email-parameter-action.test.ts.snap

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,7 @@
22

33
exports[`default setup 1`] = `
44
Object {
5-
"Parameters": Object {
6-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5ArtifactHash7DCE9441": Object {
7-
"Description": "Artifact hash for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
8-
"Type": "String",
9-
},
10-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B": Object {
11-
"Description": "S3 bucket for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
12-
"Type": "String",
13-
},
14-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA": Object {
15-
"Description": "S3 key for asset version \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
16-
"Type": "String",
17-
},
18-
},
5+
"Parameters": Any<Object>,
196
"Resources": Object {
207
"PipelineArtifactsBucket22248F97": Object {
218
"DeletionPolicy": "Retain",
@@ -249,44 +236,7 @@ Object {
249236
"PipelineCheckParamterCheckParamterFunctionServiceRole236B99F5",
250237
],
251238
"Properties": Object {
252-
"Code": Object {
253-
"S3Bucket": Object {
254-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B",
255-
},
256-
"S3Key": Object {
257-
"Fn::Join": Array [
258-
"",
259-
Array [
260-
Object {
261-
"Fn::Select": Array [
262-
0,
263-
Object {
264-
"Fn::Split": Array [
265-
"||",
266-
Object {
267-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
268-
},
269-
],
270-
},
271-
],
272-
},
273-
Object {
274-
"Fn::Select": Array [
275-
1,
276-
Object {
277-
"Fn::Split": Array [
278-
"||",
279-
Object {
280-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
281-
},
282-
],
283-
},
284-
],
285-
},
286-
],
287-
],
288-
},
289-
},
239+
"Code": Any<Object>,
290240
"Handler": "index.handler",
291241
"Role": Object {
292242
"Fn::GetAtt": Array [

‎packages/cdk-codepipeline-check-parameter-action/src/__tests__/__snapshots__/codepipeline-check-parameter-action.test.ts.snap

Lines changed: 7 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,7 @@
22

33
exports[`default setup 1`] = `
44
Object {
5-
"Parameters": Object {
6-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5ArtifactHash7DCE9441": Object {
7-
"Description": "Artifact hash for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
8-
"Type": "String",
9-
},
10-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B": Object {
11-
"Description": "S3 bucket for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
12-
"Type": "String",
13-
},
14-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA": Object {
15-
"Description": "S3 key for asset version \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
16-
"Type": "String",
17-
},
18-
},
5+
"Parameters": Any<Object>,
196
"Resources": Object {
207
"PipelineArtifactsBucket22248F97": Object {
218
"DeletionPolicy": "Retain",
@@ -249,44 +236,7 @@ Object {
249236
"PipelineCheckParamterCheckParamterFunctionServiceRole236B99F5",
250237
],
251238
"Properties": Object {
252-
"Code": Object {
253-
"S3Bucket": Object {
254-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B",
255-
},
256-
"S3Key": Object {
257-
"Fn::Join": Array [
258-
"",
259-
Array [
260-
Object {
261-
"Fn::Select": Array [
262-
0,
263-
Object {
264-
"Fn::Split": Array [
265-
"||",
266-
Object {
267-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
268-
},
269-
],
270-
},
271-
],
272-
},
273-
Object {
274-
"Fn::Select": Array [
275-
1,
276-
Object {
277-
"Fn::Split": Array [
278-
"||",
279-
Object {
280-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
281-
},
282-
],
283-
},
284-
],
285-
},
286-
],
287-
],
288-
},
289-
},
239+
"Code": Any<Object>,
290240
"Handler": "index.handler",
291241
"Role": Object {
292242
"Fn::GetAtt": Array [
@@ -793,20 +743,7 @@ Object {
793743
794744
exports[`multiple 1`] = `
795745
Object {
796-
"Parameters": Object {
797-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5ArtifactHash7DCE9441": Object {
798-
"Description": "Artifact hash for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
799-
"Type": "String",
800-
},
801-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B": Object {
802-
"Description": "S3 bucket for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
803-
"Type": "String",
804-
},
805-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA": Object {
806-
"Description": "S3 key for asset version \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
807-
"Type": "String",
808-
},
809-
},
746+
"Parameters": Any<Object>,
810747
"Resources": Object {
811748
"PipelineArtifactsBucket22248F97": Object {
812749
"DeletionPolicy": "Retain",
@@ -1062,44 +999,7 @@ Object {
1062999
"PipelineCheckParamterCheckParamter1CheckParamterFunctionServiceRole6801FEBB",
10631000
],
10641001
"Properties": Object {
1065-
"Code": Object {
1066-
"S3Bucket": Object {
1067-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B",
1068-
},
1069-
"S3Key": Object {
1070-
"Fn::Join": Array [
1071-
"",
1072-
Array [
1073-
Object {
1074-
"Fn::Select": Array [
1075-
0,
1076-
Object {
1077-
"Fn::Split": Array [
1078-
"||",
1079-
Object {
1080-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
1081-
},
1082-
],
1083-
},
1084-
],
1085-
},
1086-
Object {
1087-
"Fn::Select": Array [
1088-
1,
1089-
Object {
1090-
"Fn::Split": Array [
1091-
"||",
1092-
Object {
1093-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
1094-
},
1095-
],
1096-
},
1097-
],
1098-
},
1099-
],
1100-
],
1101-
},
1102-
},
1002+
"Code": Any<Object>,
11031003
"Handler": "index.handler",
11041004
"Role": Object {
11051005
"Fn::GetAtt": Array [
@@ -1259,44 +1159,7 @@ Object {
12591159
"PipelineCheckParamterCheckParamter2CheckParamterFunctionServiceRole6832E7A7",
12601160
],
12611161
"Properties": Object {
1262-
"Code": Object {
1263-
"S3Bucket": Object {
1264-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B",
1265-
},
1266-
"S3Key": Object {
1267-
"Fn::Join": Array [
1268-
"",
1269-
Array [
1270-
Object {
1271-
"Fn::Select": Array [
1272-
0,
1273-
Object {
1274-
"Fn::Split": Array [
1275-
"||",
1276-
Object {
1277-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
1278-
},
1279-
],
1280-
},
1281-
],
1282-
},
1283-
Object {
1284-
"Fn::Select": Array [
1285-
1,
1286-
Object {
1287-
"Fn::Split": Array [
1288-
"||",
1289-
Object {
1290-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
1291-
},
1292-
],
1293-
},
1294-
],
1295-
},
1296-
],
1297-
],
1298-
},
1299-
},
1162+
"Code": Any<Object>,
13001163
"Handler": "index.handler",
13011164
"Role": Object {
13021165
"Fn::GetAtt": Array [
@@ -1812,20 +1675,7 @@ Object {
18121675
18131676
exports[`with regExp 1`] = `
18141677
Object {
1815-
"Parameters": Object {
1816-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5ArtifactHash7DCE9441": Object {
1817-
"Description": "Artifact hash for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
1818-
"Type": "String",
1819-
},
1820-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B": Object {
1821-
"Description": "S3 bucket for asset \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
1822-
"Type": "String",
1823-
},
1824-
"AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA": Object {
1825-
"Description": "S3 key for asset version \\"28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5\\"",
1826-
"Type": "String",
1827-
},
1828-
},
1678+
"Parameters": Any<Object>,
18291679
"Resources": Object {
18301680
"PipelineArtifactsBucket22248F97": Object {
18311681
"DeletionPolicy": "Retain",
@@ -2059,44 +1909,7 @@ Object {
20591909
"PipelineCheckParamterCheckParamterFunctionServiceRole236B99F5",
20601910
],
20611911
"Properties": Object {
2062-
"Code": Object {
2063-
"S3Bucket": Object {
2064-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3Bucket7F258C3B",
2065-
},
2066-
"S3Key": Object {
2067-
"Fn::Join": Array [
2068-
"",
2069-
Array [
2070-
Object {
2071-
"Fn::Select": Array [
2072-
0,
2073-
Object {
2074-
"Fn::Split": Array [
2075-
"||",
2076-
Object {
2077-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
2078-
},
2079-
],
2080-
},
2081-
],
2082-
},
2083-
Object {
2084-
"Fn::Select": Array [
2085-
1,
2086-
Object {
2087-
"Fn::Split": Array [
2088-
"||",
2089-
Object {
2090-
"Ref": "AssetParameters28a6e9dddf7aa522cb41f6d848625aa48a0b705b1813df0752e7ae3567de68d5S3VersionKeyE22269DA",
2091-
},
2092-
],
2093-
},
2094-
],
2095-
},
2096-
],
2097-
],
2098-
},
2099-
},
1912+
"Code": Any<Object>,
21001913
"Handler": "index.handler",
21011914
"Role": Object {
21021915
"Fn::GetAtt": Array [

‎packages/cdk-codepipeline-check-parameter-action/src/__tests__/codepipeline-check-email-parameter-action.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,7 @@ test('default setup', (): void => {
4242
],
4343
});
4444

45-
expect(stack).toMatchCdkSnapshot();
45+
expect(stack).toMatchCdkSnapshot({
46+
ignoreAssets: true,
47+
});
4648
});

‎packages/cdk-codepipeline-check-parameter-action/src/__tests__/codepipeline-check-parameter-action.test.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ test('default setup', (): void => {
4242
],
4343
});
4444

45-
expect(stack).toMatchCdkSnapshot();
45+
expect(stack).toMatchCdkSnapshot({
46+
ignoreAssets: true,
47+
});
4648
});
4749

4850
test('with regExp', (): void => {
@@ -82,7 +84,9 @@ test('with regExp', (): void => {
8284
],
8385
});
8486

85-
expect(stack).toMatchCdkSnapshot();
87+
expect(stack).toMatchCdkSnapshot({
88+
ignoreAssets: true,
89+
});
8690
});
8791

8892
test('multiple', (): void => {
@@ -124,5 +128,7 @@ test('multiple', (): void => {
124128
],
125129
});
126130

127-
expect(stack).toMatchCdkSnapshot();
131+
expect(stack).toMatchCdkSnapshot({
132+
ignoreAssets: true,
133+
});
128134
});

‎packages/cdk-codepipeline-check-parameter-action/src/lambdas/check-parameter/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ export const handler = async (event: CodePipelineEvent): Promise<void> => {
5353
}
5454

5555
await putJobSuccess(jobId, logParameter ? JSON.stringify(parameter) : 'Logging is off');
56-
} catch (error) {
56+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
57+
} catch (error: any) {
5758
console.log(error);
5859
await putJobFailure(jobId, `Function exception: ${error.message as string}`);
5960
}

‎packages/cdk-codepipeline-merge-action/lambda-file-sizes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"timestamp":1606329521052,"files":[{"filename":"merge-branches/index.js","previous":2113,"size":2121,"diff":8}]},{"timestamp":1596468947179,"files":[{"filename":"merge-branches/index.js","previous":2111,"size":2113,"diff":2}]},{"timestamp":1596439804155,"files":[{"filename":"merge-branches/index.js","previous":6009,"size":2111,"diff":-3898}]},{"timestamp":1596407638195,"files":[{"filename":"merge-branches/index.js","previous":2330,"size":6009,"diff":3679}]}]
1+
[{"timestamp":1631688053756,"files":[{"filename":"merge-branches/index.js","previous":2121,"size":4875,"diff":2754}]},{"timestamp":1606329521052,"files":[{"filename":"merge-branches/index.js","previous":2113,"size":2121,"diff":8}]},{"timestamp":1596468947179,"files":[{"filename":"merge-branches/index.js","previous":2111,"size":2113,"diff":2}]},{"timestamp":1596439804155,"files":[{"filename":"merge-branches/index.js","previous":6009,"size":2111,"diff":-3898}]},{"timestamp":1596407638195,"files":[{"filename":"merge-branches/index.js","previous":2330,"size":6009,"diff":3679}]}]

‎packages/cdk-codepipeline-merge-action/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"devDependencies": {
8080
"@aws-cdk/assert": "^1.121.0",
8181
"aws-sdk": "^2.974.0",
82+
"get-env-or-die": "^0.0.7",
8283
"jest-cdk-snapshot": "^1.4.2"
8384
},
8485
"externals": [

0 commit comments

Comments
 (0)