Skip to content

Commit 577455f

Browse files
deps: lock file maintenance (#55)
* deps: lock file maintenance * Update CDK * Run `skuba format` * Yay --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Aaron Moat <[email protected]> Co-authored-by: skuba <>
1 parent c596cc8 commit 577455f

File tree

3 files changed

+1145
-1269
lines changed

3 files changed

+1145
-1269
lines changed

packages/infra/src/constructs/__snapshots__/lambdaDeployment.test.ts.snap

Lines changed: 1 addition & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -2,115 +2,6 @@
22

33
exports[`returns expected CloudFormation stack 1`] = `
44
{
5-
"Mappings": {
6-
"ServiceprincipalMap": {
7-
"af-south-1": {
8-
"codedeploy": "codedeploy.af-south-1.amazonaws.com",
9-
},
10-
"ap-east-1": {
11-
"codedeploy": "codedeploy.ap-east-1.amazonaws.com",
12-
},
13-
"ap-northeast-1": {
14-
"codedeploy": "codedeploy.ap-northeast-1.amazonaws.com",
15-
},
16-
"ap-northeast-2": {
17-
"codedeploy": "codedeploy.ap-northeast-2.amazonaws.com",
18-
},
19-
"ap-northeast-3": {
20-
"codedeploy": "codedeploy.ap-northeast-3.amazonaws.com",
21-
},
22-
"ap-south-1": {
23-
"codedeploy": "codedeploy.ap-south-1.amazonaws.com",
24-
},
25-
"ap-south-2": {
26-
"codedeploy": "codedeploy.ap-south-2.amazonaws.com",
27-
},
28-
"ap-southeast-1": {
29-
"codedeploy": "codedeploy.ap-southeast-1.amazonaws.com",
30-
},
31-
"ap-southeast-2": {
32-
"codedeploy": "codedeploy.ap-southeast-2.amazonaws.com",
33-
},
34-
"ap-southeast-3": {
35-
"codedeploy": "codedeploy.ap-southeast-3.amazonaws.com",
36-
},
37-
"ap-southeast-4": {
38-
"codedeploy": "codedeploy.ap-southeast-4.amazonaws.com",
39-
},
40-
"ca-central-1": {
41-
"codedeploy": "codedeploy.ca-central-1.amazonaws.com",
42-
},
43-
"cn-north-1": {
44-
"codedeploy": "codedeploy.cn-north-1.amazonaws.com.cn",
45-
},
46-
"cn-northwest-1": {
47-
"codedeploy": "codedeploy.cn-northwest-1.amazonaws.com.cn",
48-
},
49-
"eu-central-1": {
50-
"codedeploy": "codedeploy.eu-central-1.amazonaws.com",
51-
},
52-
"eu-central-2": {
53-
"codedeploy": "codedeploy.eu-central-2.amazonaws.com",
54-
},
55-
"eu-north-1": {
56-
"codedeploy": "codedeploy.eu-north-1.amazonaws.com",
57-
},
58-
"eu-south-1": {
59-
"codedeploy": "codedeploy.eu-south-1.amazonaws.com",
60-
},
61-
"eu-south-2": {
62-
"codedeploy": "codedeploy.eu-south-2.amazonaws.com",
63-
},
64-
"eu-west-1": {
65-
"codedeploy": "codedeploy.eu-west-1.amazonaws.com",
66-
},
67-
"eu-west-2": {
68-
"codedeploy": "codedeploy.eu-west-2.amazonaws.com",
69-
},
70-
"eu-west-3": {
71-
"codedeploy": "codedeploy.eu-west-3.amazonaws.com",
72-
},
73-
"il-central-1": {
74-
"codedeploy": "codedeploy.il-central-1.amazonaws.com",
75-
},
76-
"me-central-1": {
77-
"codedeploy": "codedeploy.me-central-1.amazonaws.com",
78-
},
79-
"me-south-1": {
80-
"codedeploy": "codedeploy.me-south-1.amazonaws.com",
81-
},
82-
"sa-east-1": {
83-
"codedeploy": "codedeploy.sa-east-1.amazonaws.com",
84-
},
85-
"us-east-1": {
86-
"codedeploy": "codedeploy.us-east-1.amazonaws.com",
87-
},
88-
"us-east-2": {
89-
"codedeploy": "codedeploy.us-east-2.amazonaws.com",
90-
},
91-
"us-gov-east-1": {
92-
"codedeploy": "codedeploy.us-gov-east-1.amazonaws.com",
93-
},
94-
"us-gov-west-1": {
95-
"codedeploy": "codedeploy.us-gov-west-1.amazonaws.com",
96-
},
97-
"us-iso-east-1": {
98-
"codedeploy": "codedeploy.amazonaws.com",
99-
},
100-
"us-iso-west-1": {
101-
"codedeploy": "codedeploy.amazonaws.com",
102-
},
103-
"us-isob-east-1": {
104-
"codedeploy": "codedeploy.amazonaws.com",
105-
},
106-
"us-west-1": {
107-
"codedeploy": "codedeploy.us-west-1.amazonaws.com",
108-
},
109-
"us-west-2": {
110-
"codedeploy": "codedeploy.us-west-2.amazonaws.com",
111-
},
112-
},
113-
},
1145
"Parameters": {
1156
"BootstrapVersion": {
1167
"Default": "/cdk-bootstrap/hnb659fds/version",
@@ -170,15 +61,7 @@ exports[`returns expected CloudFormation stack 1`] = `
17061
"Action": "sts:AssumeRole",
17162
"Effect": "Allow",
17263
"Principal": {
173-
"Service": {
174-
"Fn::FindInMap": [
175-
"ServiceprincipalMap",
176-
{
177-
"Ref": "AWS::Region",
178-
},
179-
"codedeploy",
180-
],
181-
},
64+
"Service": "codedeploy.amazonaws.com",
18265
},
18366
},
18467
],

packages/infra/src/handlers/framework/context.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ export const withTimeout = async <T>(
2121

2222
const timeout = AbortSignal.timeout(timeoutMs);
2323

24-
const abortSignal = parent
25-
? // @ts-expect-error: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/60868
26-
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
27-
(AbortSignal.any([parent, timeout]) as AbortSignal)
28-
: timeout;
24+
const abortSignal = parent ? AbortSignal.any([parent, timeout]) : timeout;
2925

3026
return storage.run({ ...getContext(), abortSignal }, task);
3127
};

0 commit comments

Comments
 (0)