Skip to content

Commit c485c27

Browse files
authored
Fix build issues and upgrade template node version to 16 (awslabs#584)
* Fix build issues * Upgrade to Node16 and fix swagger issue
1 parent 4eddd4c commit c485c27

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+4683
-6489
lines changed

.gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# top-level and lambda function specific
22
/node_modules
33
/coverage
4-
/lambdas/static-asset-uploader/build/config.js
4+
/lambdas/static-asset-uploader/build
55
/lambdas/coverage
66

77
# devportal specific
8+
/dev-portal/build
89

910
# we're committing the artifacts, don't need the modules
1011
# note, though, that we do need our patched version of swagger-ui and not the npm version
@@ -33,4 +34,6 @@ cognito.js
3334
.idea
3435
.vscode
3536
.eslintcache
36-
*.iml
37+
*.iml
38+
39+

cloudformation/template.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ Resources:
12271227
Description: 'Common code used by lambdas'
12281228
ContentUri: ../lambdas/common-layer/
12291229
CompatibleRuntimes:
1230-
- nodejs12.x
1230+
- nodejs16.x
12311231

12321232
DevPortalLambdaFunction:
12331233
Type: AWS::Serverless::Function
@@ -1236,7 +1236,7 @@ Resources:
12361236
Handler: index.handler
12371237
MemorySize: 1024
12381238
Role: !GetAtt BackendLambdaExecutionRole.Arn
1239-
Runtime: nodejs12.x
1239+
Runtime: nodejs16.x
12401240
Timeout: 30
12411241
Environment:
12421242
Variables:
@@ -1279,7 +1279,7 @@ Resources:
12791279
# Handler: index.handler
12801280
# MemorySize: 128
12811281
# Role: !GetAtt BackendLambdaExecutionRole.Arn
1282-
# Runtime: nodejs12.x
1282+
# Runtime: nodejs16.x
12831283
# Timeout: 30
12841284
# Layers:
12851285
# - !Ref LambdaCommonLayer
@@ -1292,7 +1292,7 @@ Resources:
12921292
Handler: index.handler
12931293
MemorySize: 128
12941294
Role: !GetAtt CognitoPreSignupTriggerExecutionRole.Arn
1295-
Runtime: nodejs12.x
1295+
Runtime: nodejs16.x
12961296
Timeout: 3
12971297
Environment:
12981298
Variables:
@@ -1308,7 +1308,7 @@ Resources:
13081308
Handler: index.handler
13091309
MemorySize: 128
13101310
Role: !GetAtt CognitoPostConfirmationTriggerExecutionRole.Arn
1311-
Runtime: nodejs12.x
1311+
Runtime: nodejs16.x
13121312
Timeout: 3
13131313
Environment:
13141314
Variables:
@@ -1326,7 +1326,7 @@ Resources:
13261326
Handler: index.handler
13271327
MemorySize: 128
13281328
Role: !GetAtt CognitoPostAuthenticationTriggerExecutionRole.Arn
1329-
Runtime: nodejs12.x
1329+
Runtime: nodejs16.x
13301330
Timeout: 3
13311331
Environment:
13321332
Variables:
@@ -1455,7 +1455,7 @@ Resources:
14551455
CognitoUserPoolClientSettingsBackingFn:
14561456
Type: AWS::Serverless::Function
14571457
Properties:
1458-
Runtime: nodejs12.x
1458+
Runtime: nodejs16.x
14591459
MemorySize: 128
14601460
Timeout: 300
14611461
CodeUri: ../lambdas/cfn-cognito-user-pools-client-settings
@@ -1539,7 +1539,7 @@ Resources:
15391539
CognitoUserPoolDomainBackingFn:
15401540
Type: AWS::Serverless::Function
15411541
Properties:
1542-
Runtime: nodejs12.x
1542+
Runtime: nodejs16.x
15431543
MemorySize: 128
15441544
Timeout: 300
15451545
CodeUri: ../lambdas/cfn-cognito-user-pools-domain
@@ -1710,7 +1710,7 @@ Resources:
17101710
Handler: index.handler
17111711
MemorySize: 128
17121712
Role: !GetAtt CatalogUpdaterLambdaExecutionRole.Arn
1713-
Runtime: nodejs12.x
1713+
Runtime: nodejs16.x
17141714
Timeout: 20
17151715
Environment:
17161716
Variables:
@@ -1735,7 +1735,7 @@ Resources:
17351735
Handler: index.handler
17361736
MemorySize: 512
17371737
Role: !GetAtt AssetUploaderLambdaExecutionRole.Arn
1738-
Runtime: nodejs12.x
1738+
Runtime: nodejs16.x
17391739
Timeout: 300
17401740
Environment:
17411741
Variables:
@@ -1789,7 +1789,7 @@ Resources:
17891789
Handler: replicator.handler
17901790
MemorySize: 128
17911791
Role: !GetAtt CloudFrontEdgeReplicatorRole.Arn
1792-
Runtime: nodejs12.x
1792+
Runtime: nodejs16.x
17931793
Timeout: 300
17941794
AutoPublishAlias: Live
17951795
Environment:
@@ -1958,7 +1958,7 @@ Resources:
19581958
Handler: index.handler
19591959
MemorySize: 512
19601960
Role: !GetAtt DumpV3AccountDataExecutionRole.Arn
1961-
Runtime: nodejs12.x
1961+
Runtime: nodejs16.x
19621962
Timeout: 300
19631963
Environment:
19641964
Variables:
@@ -2068,7 +2068,7 @@ Resources:
20682068
Handler: index.handler
20692069
MemorySize: 512
20702070
Role: !GetAtt UserGroupImporterExecutionRole.Arn
2071-
Runtime: nodejs12.x
2071+
Runtime: nodejs16.x
20722072
# Use the default max timeout duration.
20732073
Timeout: 900
20742074
Environment:

dev-portal/.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
module.exports = {
4-
extends: ['react-app', '../.eslintrc.js'],
4+
extends: ['react-app'],
55
overrides: [
66
{
77
files: ['.eslintrc.js', './*.js'],

dev-portal/node_modules/swagger-ui/package.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)