From 68752450d2c6fa9f547f9ff9f503f0a20c9a6db4 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 16:14:24 -0500 Subject: [PATCH 01/16] Update package version --- .../package.json | 12 ++++++------ typescript/connect-cdk/package.json | 12 ++++++------ typescript/custom-logical-names/package.json | 8 ++++---- .../custom-resource-provider/package.json | 16 ++++++++-------- typescript/custom-resource/package.json | 8 ++++---- typescript/ddb-stream-lambda-sns/package.json | 10 +++++----- .../ddb/global-table-with-cmk/package.json | 16 ++++++++-------- .../ec2-instance-connect-endpoint/package.json | 14 +++++++------- typescript/ec2-instance/package.json | 18 +++++++++--------- typescript/ec2-ssm-local-zone/package.json | 16 ++++++++-------- typescript/ecs/cluster/package.json | 8 ++++---- .../ecs/cross-stack-load-balancer/package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../ecs/ecs-service-with-logging/package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../ecs/fargate-service-with-efs/package.json | 8 ++++---- .../package.json | 8 ++++---- .../fargate-service-with-logging/package.json | 8 ++++---- typescript/eks/cluster/package.json | 10 +++++----- .../elasticbeanstalk-bg-pipeline/package.json | 8 ++++---- .../elasticbeanstalk-environment/package.json | 8 ++++---- typescript/eventbridge-lambda/package.json | 12 ++++++------ typescript/fsx-ad/package.json | 8 ++++---- typescript/http-proxy-apigateway/package.json | 8 ++++---- typescript/imagebuilder/package.json | 14 +++++++------- typescript/inspector2/package.json | 16 ++++++++-------- typescript/lambda-api-ci/package.json | 10 +++++----- typescript/lambda-api-ci/src/package.json | 6 +++--- .../lambda-cloudwatch-dashboard/package.json | 16 ++++++++-------- typescript/lambda-cron/package.json | 12 ++++++------ typescript/lambda-layer/package.json | 10 +++++----- .../package.json | 10 +++++----- .../package.json | 15 +++++++-------- typescript/lexbot/package.json | 14 +++++++------- typescript/my-widget-service/package.json | 8 ++++---- typescript/neptune-with-vpc/package.json | 2 +- .../opensearch/cwlogs_ingestion/package.json | 16 ++++++++-------- .../opensearch/os_vpc_provision/package.json | 16 ++++++++-------- typescript/quicksight/package.json | 12 ++++++------ typescript/r53-resolver/package.json | 12 ++++++------ typescript/rds/aurora/package.json | 12 ++++++------ typescript/rds/mysql/package.json | 16 ++++++++-------- typescript/rds/oracle/package.json | 12 ++++++------ .../rekognition-lambda-s3-trigger/package.json | 12 ++++++------ typescript/resource-overrides/package.json | 8 ++++---- .../route53-resolver-dns-firewall/package.json | 8 ++++---- .../package.json | 16 ++++++++-------- typescript/s3-object-lambda/package.json | 12 ++++++------ typescript/s3-sns-lambda-chain/package.json | 18 +++++++++--------- .../secrets-manager-rotation/package.json | 18 +++++++++--------- .../portfolio-with-ec2-product/package.json | 16 ++++++++-------- typescript/static-site-basic/package.json | 8 ++++---- typescript/static-site/package.json | 8 ++++---- .../package.json | 8 ++++---- .../stepfunctions-job-poller/package.json | 8 ++++---- typescript/waf/package.json | 10 +++++----- 60 files changed, 329 insertions(+), 330 deletions(-) diff --git a/typescript/appsync-graphql-typescript-resolver/package.json b/typescript/appsync-graphql-typescript-resolver/package.json index 6ddd32f059..b200fad910 100644 --- a/typescript/appsync-graphql-typescript-resolver/package.json +++ b/typescript/appsync-graphql-typescript-resolver/package.json @@ -14,16 +14,16 @@ }, "devDependencies": { "@aws-appsync/utils": "^1.2.5", - "@types/jest": "^29.5.12", - "@types/node": "20.11.19", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", "jest": "^29.7.0", - "ts-jest": "^29.1.2", - "aws-cdk": "2.133.0", + "ts-jest": "^29.2.5", + "aws-cdk": "2.1004.0", "ts-node": "^10.9.2", - "typescript": "~5.3.3" + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.133.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/connect-cdk/package.json b/typescript/connect-cdk/package.json index 27da02d6c1..fa495b0705 100644 --- a/typescript/connect-cdk/package.json +++ b/typescript/connect-cdk/package.json @@ -11,16 +11,16 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.12", - "@types/node": "20.14.9", - "aws-cdk": "2.157.0", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "jest": "^29.7.0", - "ts-jest": "^29.1.5", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "typescript": "~5.5.3" + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.157.0", + "aws-cdk-lib": "2.185.0", "cdk-nag": "^2.30.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" diff --git a/typescript/custom-logical-names/package.json b/typescript/custom-logical-names/package.json index 892f46fcc0..188945ff57 100644 --- a/typescript/custom-logical-names/package.json +++ b/typescript/custom-logical-names/package.json @@ -10,12 +10,12 @@ "cdk": "cdk" }, "devDependencies": { - "aws-cdk": "*", - "ts-node": "^8.1.0", - "typescript": "~5.1.6" + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.9" } diff --git a/typescript/custom-resource-provider/package.json b/typescript/custom-resource-provider/package.json index e19d4c744e..39adb022a8 100644 --- a/typescript/custom-resource-provider/package.json +++ b/typescript/custom-resource-provider/package.json @@ -11,16 +11,16 @@ }, "devDependencies": { "@aws-cdk/assert": "*", - "@types/jest": "^26.0.10", - "@types/node": "10.17.27", - "jest": "^26.4.2", - "ts-jest": "^29.1.1", - "aws-cdk": "*", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.16" } diff --git a/typescript/custom-resource/package.json b/typescript/custom-resource/package.json index f90961b5c7..2d2804f725 100644 --- a/typescript/custom-resource/package.json +++ b/typescript/custom-resource/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^10.17.0", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ddb-stream-lambda-sns/package.json b/typescript/ddb-stream-lambda-sns/package.json index 8ef8796e63..5594f7dc0f 100644 --- a/typescript/ddb-stream-lambda-sns/package.json +++ b/typescript/ddb-stream-lambda-sns/package.json @@ -12,8 +12,8 @@ }, "devDependencies": { "@types/jest": "^29.5.14", - "@types/node": "22.9.0", - "aws-cdk": "2.166.0", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "jest": "^29.7.0", "ts-jest": "^29.2.5", "ts-node": "^10.9.2", @@ -21,7 +21,7 @@ }, "dependencies": { "@aws-solutions-constructs/aws-dynamodbstreams-lambda": "^2.74.0", - "aws-cdk-lib": "2.167.0", - "constructs": "^10.4.2" + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0" } -} \ No newline at end of file +} diff --git a/typescript/ddb/global-table-with-cmk/package.json b/typescript/ddb/global-table-with-cmk/package.json index 501bb0126c..e71e23611d 100644 --- a/typescript/ddb/global-table-with-cmk/package.json +++ b/typescript/ddb/global-table-with-cmk/package.json @@ -10,16 +10,16 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^26.0.10", - "@types/node": "10.17.27", - "aws-cdk": "2.80.0", - "jest": "^26.4.2", - "ts-jest": "^26.2.0", - "ts-node": "^9.0.0", - "typescript": "~5.1.6" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.80.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.16" } diff --git a/typescript/ec2-instance-connect-endpoint/package.json b/typescript/ec2-instance-connect-endpoint/package.json index 4d8b73b0bb..a7548fe071 100644 --- a/typescript/ec2-instance-connect-endpoint/package.json +++ b/typescript/ec2-instance-connect-endpoint/package.json @@ -34,18 +34,18 @@ "organization": false }, "devDependencies": { - "@types/jest": "^29.5.2", - "@types/node": "^16", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "aws-cdk": "2.85.0", + "aws-cdk": "2.1004.0", "aws-cdk-lib": "2.85.0", "constructs": "10.0.5", "eslint": "^8", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.27.5", - "jest": "^29.5.0", + "jest": "^29.7.0", "jest-junit": "^15", "jsii": "~5.0.0", "jsii-diff": "^1.84.0", @@ -55,9 +55,9 @@ "npm-check-updates": "^16", "projen": "^0.71.118", "standard-version": "^9", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "^5.1.6" + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "peerDependencies": { "aws-cdk-lib": "^2.85.0", diff --git a/typescript/ec2-instance/package.json b/typescript/ec2-instance/package.json index 59803b8804..7f9051a6f9 100644 --- a/typescript/ec2-instance/package.json +++ b/typescript/ec2-instance/package.json @@ -25,27 +25,27 @@ "projen": "npx projen" }, "devDependencies": { - "@types/jest": "^29.5.3", - "@types/node": "^16", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "aws-cdk": "^2.83.0", + "aws-cdk": "2.1004.0", "esbuild": "^0.18.17", "eslint": "^8", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.28.0", - "jest": "^29.6.2", + "jest": "^29.7.0", "jest-junit": "^15", "npm-check-updates": "^16", "projen": "^0.71.158", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "^5.1.6" + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.83.0", - "constructs": "^10.0.5", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "dotenv": "^16.3.1" }, "license": "MIT-0", diff --git a/typescript/ec2-ssm-local-zone/package.json b/typescript/ec2-ssm-local-zone/package.json index c355c1c660..9e121714ce 100644 --- a/typescript/ec2-ssm-local-zone/package.json +++ b/typescript/ec2-ssm-local-zone/package.json @@ -11,16 +11,16 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.2.4", - "@types/node": "18.11.15", - "aws-cdk": "*", - "jest": "^29.3.1", - "ts-jest": "^29.0.3", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/cluster/package.json b/typescript/ecs/cluster/package.json index 13a5ae0eed..2c3ab0c0e4 100644 --- a/typescript/ecs/cluster/package.json +++ b/typescript/ecs/cluster/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/cross-stack-load-balancer/package.json b/typescript/ecs/cross-stack-load-balancer/package.json index 3083fc570c..6df0150d81 100644 --- a/typescript/ecs/cross-stack-load-balancer/package.json +++ b/typescript/ecs/cross-stack-load-balancer/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/ecs-network-load-balanced-service/package.json b/typescript/ecs/ecs-network-load-balanced-service/package.json index 5c78e70bc5..cb20b543ae 100644 --- a/typescript/ecs/ecs-network-load-balanced-service/package.json +++ b/typescript/ecs/ecs-network-load-balanced-service/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/ecs-service-with-advanced-alb-config/package.json b/typescript/ecs/ecs-service-with-advanced-alb-config/package.json index 22df8a4eca..c3ca3dcd14 100644 --- a/typescript/ecs/ecs-service-with-advanced-alb-config/package.json +++ b/typescript/ecs/ecs-service-with-advanced-alb-config/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/ecs-service-with-logging/package.json b/typescript/ecs/ecs-service-with-logging/package.json index 6e8749b579..b14d076d6b 100644 --- a/typescript/ecs/ecs-service-with-logging/package.json +++ b/typescript/ecs/ecs-service-with-logging/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/ecs-service-with-task-networking/package.json b/typescript/ecs/ecs-service-with-task-networking/package.json index 6acc7f05ec..20896e5402 100644 --- a/typescript/ecs/ecs-service-with-task-networking/package.json +++ b/typescript/ecs/ecs-service-with-task-networking/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/ecs-service-with-task-placement/package.json b/typescript/ecs/ecs-service-with-task-placement/package.json index 22df8a4eca..c3ca3dcd14 100644 --- a/typescript/ecs/ecs-service-with-task-placement/package.json +++ b/typescript/ecs/ecs-service-with-task-placement/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/fargate-application-load-balanced-service/package.json b/typescript/ecs/fargate-application-load-balanced-service/package.json index 44d69d2615..da722fd43f 100644 --- a/typescript/ecs/fargate-application-load-balanced-service/package.json +++ b/typescript/ecs/fargate-application-load-balanced-service/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/fargate-service-with-auto-scaling/package.json b/typescript/ecs/fargate-service-with-auto-scaling/package.json index 6b2791aedc..4cbb2aa423 100644 --- a/typescript/ecs/fargate-service-with-auto-scaling/package.json +++ b/typescript/ecs/fargate-service-with-auto-scaling/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/fargate-service-with-efs/package.json b/typescript/ecs/fargate-service-with-efs/package.json index 5ba58fd8cf..15f625e3e2 100644 --- a/typescript/ecs/fargate-service-with-efs/package.json +++ b/typescript/ecs/fargate-service-with-efs/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/fargate-service-with-local-image/package.json b/typescript/ecs/fargate-service-with-local-image/package.json index 6c6ce6d6f1..73cc130109 100644 --- a/typescript/ecs/fargate-service-with-local-image/package.json +++ b/typescript/ecs/fargate-service-with-local-image/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/ecs/fargate-service-with-logging/package.json b/typescript/ecs/fargate-service-with-logging/package.json index 42b6b1cdaa..32f2bc842f 100644 --- a/typescript/ecs/fargate-service-with-logging/package.json +++ b/typescript/ecs/fargate-service-with-logging/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.38", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/eks/cluster/package.json b/typescript/eks/cluster/package.json index 88c441f7d6..3766439c9d 100644 --- a/typescript/eks/cluster/package.json +++ b/typescript/eks/cluster/package.json @@ -16,17 +16,17 @@ "license": "Apache-2.0", "devDependencies": { "@types/jest": "^29.5.14", - "@types/node": "22.10.5", - "aws-cdk": "^2.175.1", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "jest": "^29.7.0", "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "typescript": "~5.7.3" + "typescript": "~5.6.3" }, "dependencies": { "@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0", - "aws-cdk-lib": "^2.175.1", - "constructs": "^10.4.2", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "source-map-support": "^0.5.21" } } diff --git a/typescript/elasticbeanstalk/elasticbeanstalk-bg-pipeline/package.json b/typescript/elasticbeanstalk/elasticbeanstalk-bg-pipeline/package.json index d83daef591..0ac767f4c0 100644 --- a/typescript/elasticbeanstalk/elasticbeanstalk-bg-pipeline/package.json +++ b/typescript/elasticbeanstalk/elasticbeanstalk-bg-pipeline/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.40", - "typescript": "~5.1.6", - "aws-cdk": "*" + "@types/node": "22.7.9", + "typescript": "~5.6.3", + "aws-cdk": "2.1004.0" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.9" } diff --git a/typescript/elasticbeanstalk/elasticbeanstalk-environment/package.json b/typescript/elasticbeanstalk/elasticbeanstalk-environment/package.json index c0356f4eb2..08106a0aff 100644 --- a/typescript/elasticbeanstalk/elasticbeanstalk-environment/package.json +++ b/typescript/elasticbeanstalk/elasticbeanstalk-environment/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^8.10.40", - "typescript": "~5.1.6", - "aws-cdk": "*" + "@types/node": "22.7.9", + "typescript": "~5.6.3", + "aws-cdk": "2.1004.0" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.9" } diff --git a/typescript/eventbridge-lambda/package.json b/typescript/eventbridge-lambda/package.json index beab5c6940..6734506dd8 100644 --- a/typescript/eventbridge-lambda/package.json +++ b/typescript/eventbridge-lambda/package.json @@ -15,14 +15,14 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^10.17.0", - "@types/jest": "^26.0.24", - "aws-cdk": "*", - "jest": "^26.6.3", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "@types/jest": "^29.5.14", + "aws-cdk": "2.1004.0", + "jest": "^29.7.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/fsx-ad/package.json b/typescript/fsx-ad/package.json index 087224638c..e5bb693a07 100644 --- a/typescript/fsx-ad/package.json +++ b/typescript/fsx-ad/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^10.17.0", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/http-proxy-apigateway/package.json b/typescript/http-proxy-apigateway/package.json index 4088a90f09..c0ba73dcc5 100644 --- a/typescript/http-proxy-apigateway/package.json +++ b/typescript/http-proxy-apigateway/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^14.0.6", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/imagebuilder/package.json b/typescript/imagebuilder/package.json index 2415d112d8..0d47b02139 100644 --- a/typescript/imagebuilder/package.json +++ b/typescript/imagebuilder/package.json @@ -10,16 +10,16 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "29.5.11", - "@types/node": "20.11.5", - "aws-cdk": "2.122.0", - "ts-node": "10.9.2", - "typescript": "5.3.3" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.122.0", + "aws-cdk-lib": "2.185.0", "cdk-nag": "2.28.27", - "constructs": "10.3.0", + "constructs": "^10.0.0", "source-map-support": "0.5.21" } } diff --git a/typescript/inspector2/package.json b/typescript/inspector2/package.json index 5114e87180..4368906448 100644 --- a/typescript/inspector2/package.json +++ b/typescript/inspector2/package.json @@ -13,16 +13,16 @@ "devDependencies": { "@aws-sdk/client-inspector2": "^3.258.0", "@types/aws-lambda": "^8.10.109", - "@types/jest": "^29.2.4", - "@types/node": "18.11.15", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", "esbuild": "^0.17.4", - "jest": "^29.3.1", - "ts-jest": "^29.0.5", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.80.0", - "constructs": "^10.1.190" + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0" } } diff --git a/typescript/lambda-api-ci/package.json b/typescript/lambda-api-ci/package.json index 1a64f17b17..c686434fc4 100644 --- a/typescript/lambda-api-ci/package.json +++ b/typescript/lambda-api-ci/package.json @@ -12,15 +12,15 @@ "prettier": "prettier --write '**/{bin,lib,src,tst}/*.ts'" }, "devDependencies": { - "aws-cdk": "*", - "@types/node": "^20.11.24", + "aws-cdk": "2.1004.0", + "@types/node": "22.7.9", "ts-node": "^10.9.2", - "typescript": "~5.3.3", + "typescript": "~5.6.3", "prettier": "^3.2.5" }, "dependencies": { - "aws-cdk-lib": "^2.131.0", - "constructs": "^10.3.0", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "@aws-sdk/client-s3": "^3.525.0", "source-map-support": "^0.5.21" }, diff --git a/typescript/lambda-api-ci/src/package.json b/typescript/lambda-api-ci/src/package.json index 78e204fc70..30a7b0f5ec 100644 --- a/typescript/lambda-api-ci/src/package.json +++ b/typescript/lambda-api-ci/src/package.json @@ -9,11 +9,11 @@ "test": "jest" }, "devDependencies": { - "@types/node": "^20.11.25", + "@types/node": "22.7.9", "jest": "^29.7.0", - "ts-jest": "^29.1.2", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "typescript": "~5.4.2" + "typescript": "~5.6.3" }, "dependencies": { "@aws-sdk/client-s3": "^3.525.0" diff --git a/typescript/lambda-cloudwatch-dashboard/package.json b/typescript/lambda-cloudwatch-dashboard/package.json index d2aea88fc7..3688c2987d 100644 --- a/typescript/lambda-cloudwatch-dashboard/package.json +++ b/typescript/lambda-cloudwatch-dashboard/package.json @@ -11,16 +11,16 @@ }, "devDependencies": { "@aws-cdk/assert": "*", - "@types/jest": "^26.0.10", - "@types/node": "10.17.27", - "jest": "^26.4.2", - "ts-jest": "^26.2.0", - "aws-cdk": "*", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.16" } diff --git a/typescript/lambda-cron/package.json b/typescript/lambda-cron/package.json index 7c6039429a..f4407313b2 100644 --- a/typescript/lambda-cron/package.json +++ b/typescript/lambda-cron/package.json @@ -16,14 +16,14 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^10.17.0", - "@types/jest": "^26.0.24", - "aws-cdk": "*", - "jest": "^26.6.3", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "@types/jest": "^29.5.14", + "aws-cdk": "2.1004.0", + "jest": "^29.7.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/lambda-layer/package.json b/typescript/lambda-layer/package.json index 3196b8be6e..b755432d40 100644 --- a/typescript/lambda-layer/package.json +++ b/typescript/lambda-layer/package.json @@ -11,13 +11,13 @@ }, "devDependencies": { "@aws-cdk/assert": "*", - "@types/node": "10.17.27", - "aws-cdk": "*", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.16" } diff --git a/typescript/lambda-manage-s3-event-notification/package.json b/typescript/lambda-manage-s3-event-notification/package.json index ff797469ff..54b22abfde 100644 --- a/typescript/lambda-manage-s3-event-notification/package.json +++ b/typescript/lambda-manage-s3-event-notification/package.json @@ -11,14 +11,14 @@ }, "devDependencies": { "@aws-cdk/assert": "*", - "@types/node": "^10.17.27", - "aws-cdk": "*", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { "@aws-sdk/client-s3": "^3.427.0", - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.16" } diff --git a/typescript/lambda-provisioned-concurrency-autoscaling/package.json b/typescript/lambda-provisioned-concurrency-autoscaling/package.json index 0d17261ca1..02984c58a9 100644 --- a/typescript/lambda-provisioned-concurrency-autoscaling/package.json +++ b/typescript/lambda-provisioned-concurrency-autoscaling/package.json @@ -17,16 +17,15 @@ }, "devDependencies": { "@aws-cdk/assert": "*", - "@types/node": "10.17.27", - "aws-cdk": "*", - "ts-node": "^10.9.1", - "@types/jest": "^26.0.24", - "jest": "^26.6.3", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "@types/jest": "^29.5.14", + "jest": "^29.7.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" - } } diff --git a/typescript/lexbot/package.json b/typescript/lexbot/package.json index 091c136fe4..52864a787e 100644 --- a/typescript/lexbot/package.json +++ b/typescript/lexbot/package.json @@ -11,17 +11,17 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.11", - "@types/node": "20.11.14", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", "jest": "^29.7.0", - "ts-jest": "^29.1.2", - "aws-cdk": "2.126.0", + "ts-jest": "^29.2.5", + "aws-cdk": "2.1004.0", "ts-node": "^10.9.2", - "typescript": "~5.3.3" + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.126.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } -} \ No newline at end of file +} diff --git a/typescript/my-widget-service/package.json b/typescript/my-widget-service/package.json index 01124db75d..d7976c6e0b 100644 --- a/typescript/my-widget-service/package.json +++ b/typescript/my-widget-service/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^10.17.0", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "*" } diff --git a/typescript/neptune-with-vpc/package.json b/typescript/neptune-with-vpc/package.json index c08fbdcd3a..ae59b67146 100644 --- a/typescript/neptune-with-vpc/package.json +++ b/typescript/neptune-with-vpc/package.json @@ -10,7 +10,7 @@ "cdk": "cdk" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "@aws-cdk/aws-neptune-alpha": "^2.0.0-alpha.10", "@types/jest": "^26.0.10", diff --git a/typescript/opensearch/cwlogs_ingestion/package.json b/typescript/opensearch/cwlogs_ingestion/package.json index cba042315d..856a4fd5f9 100644 --- a/typescript/opensearch/cwlogs_ingestion/package.json +++ b/typescript/opensearch/cwlogs_ingestion/package.json @@ -11,21 +11,21 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.4", - "@types/node": "20.5.9", - "aws-cdk": "^2.165.0", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "aws-cdk-lib": "^2.165.0", "constructs": "^10.2.43", "globals": "^15.6.0", - "jest": "^29.6.4", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "~5.2.2" + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { "@aws-cdk/aws-lambda-python-alpha": "2.165.0-alpha.0", "aws-cdk": "^2.165.0", - "aws-cdk-lib": "^2.165.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/opensearch/os_vpc_provision/package.json b/typescript/opensearch/os_vpc_provision/package.json index ade93c4746..66c218d4c8 100644 --- a/typescript/opensearch/os_vpc_provision/package.json +++ b/typescript/opensearch/os_vpc_provision/package.json @@ -10,18 +10,18 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.4", - "@types/node": "20.5.9", - "jest": "^29.6.4", - "ts-jest": "^29.1.1", - "aws-cdk": "2.95.1", - "ts-node": "^10.9.1", - "typescript": "~5.2.2", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3", "constructs": "^10.2.43" }, "dependencies": { "aws-cdk": "^2.102.0", - "aws-cdk-lib": "2.90.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/quicksight/package.json b/typescript/quicksight/package.json index c0302e659f..9060d31678 100644 --- a/typescript/quicksight/package.json +++ b/typescript/quicksight/package.json @@ -10,16 +10,16 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.12", - "@types/node": "20.14.9", - "aws-cdk": "2.156.0", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "jest": "^29.7.0", - "ts-jest": "^29.1.5", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "typescript": "~5.5.3" + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.156.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/r53-resolver/package.json b/typescript/r53-resolver/package.json index a9a3343bf7..dc7a76c8e4 100644 --- a/typescript/r53-resolver/package.json +++ b/typescript/r53-resolver/package.json @@ -11,17 +11,17 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.12", - "@types/node": "20.11.19", - "aws-cdk": "2.133.0", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "jest": "^29.7.0", - "ts-jest": "^29.1.2", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "typescript": "~5.3.3" + "typescript": "~5.6.3" }, "dependencies": { "@aws-cdk/aws-route53resolver-alpha": "^2.133.0-alpha.0", - "aws-cdk-lib": "2.133.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/rds/aurora/package.json b/typescript/rds/aurora/package.json index a857a1ff31..629998b523 100644 --- a/typescript/rds/aurora/package.json +++ b/typescript/rds/aurora/package.json @@ -10,17 +10,17 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.13", - "@types/node": "*", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", "jest": "^29.7.0", - "aws-cdk": "*", + "aws-cdk": "2.1004.0", "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "typescript": "~5.6.2" + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.158.0", - "constructs": "^10.3.0", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "source-map-support": "^0.5.21" } } diff --git a/typescript/rds/mysql/package.json b/typescript/rds/mysql/package.json index c4c9e6d770..03c4a245ce 100644 --- a/typescript/rds/mysql/package.json +++ b/typescript/rds/mysql/package.json @@ -10,18 +10,18 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.13", - "@types/node": "*", - "jest": "29.7.0", - "ts-jest": "29.2.5", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "aws-cdk": "*", - "typescript": "~5.6.2" + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "esModuleInterop": true, "dependencies": { - "aws-cdk-lib": "^2.158.0", - "constructs": "^10.3.0", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "source-map-support": "^0.5.21" } } diff --git a/typescript/rds/oracle/package.json b/typescript/rds/oracle/package.json index 332e905643..a5cef61ba8 100644 --- a/typescript/rds/oracle/package.json +++ b/typescript/rds/oracle/package.json @@ -10,17 +10,17 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.13", - "@types/node": "*", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", "jest": "^29.7.0", - "aws-cdk": "*", + "aws-cdk": "2.1004.0", "ts-jest": "^29.2.5", "ts-node": "^10.9.2", - "typescript": "~5.6.2" + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.158.0", - "constructs": "^10.3.0", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "source-map-support": "^0.5.21" } } diff --git a/typescript/rekognition-lambda-s3-trigger/package.json b/typescript/rekognition-lambda-s3-trigger/package.json index 237a081ea9..8acceb2e56 100644 --- a/typescript/rekognition-lambda-s3-trigger/package.json +++ b/typescript/rekognition-lambda-s3-trigger/package.json @@ -10,16 +10,16 @@ "cdk": "cdk" }, "devDependencies": { - "@types/node": "10.17.27", - "aws-cdk": "*", - "ts-node": "^9.0.0", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { "@aws-sdk/client-dynamodb": "^3.538.0", "@aws-sdk/client-rekognition": "^3.535.0", - "aws-cdk-lib": "*", - "constructs": "*", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "source-map-support": "^0.5.16" } } diff --git a/typescript/resource-overrides/package.json b/typescript/resource-overrides/package.json index beb2ba8810..ec5f6d8a6f 100644 --- a/typescript/resource-overrides/package.json +++ b/typescript/resource-overrides/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "aws-cdk": "*", - "@types/node": "^10.17.0", - "typescript": "~5.1.6" + "aws-cdk": "2.1004.0", + "@types/node": "22.7.9", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/route53-resolver-dns-firewall/package.json b/typescript/route53-resolver-dns-firewall/package.json index e6e71d5f95..a3ea5e85c6 100644 --- a/typescript/route53-resolver-dns-firewall/package.json +++ b/typescript/route53-resolver-dns-firewall/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "10.17.27", - "aws-cdk": "2.80.0", - "typescript": "^4.9.3" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.80.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/s3-kms-cross-account-replication/package.json b/typescript/s3-kms-cross-account-replication/package.json index c4cbcccf15..b0680e9e65 100644 --- a/typescript/s3-kms-cross-account-replication/package.json +++ b/typescript/s3-kms-cross-account-replication/package.json @@ -11,18 +11,18 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^26.0.10", - "@types/node": "10.17.27", - "aws-cdk": "^2.79.1", + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "cdk-nag": "^2.0.0", - "jest": "^29.6.2", + "jest": "^29.7.0", "prettier": "2.6.2", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.79.1", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.16" } diff --git a/typescript/s3-object-lambda/package.json b/typescript/s3-object-lambda/package.json index 8345ca0f74..d4dd3496be 100644 --- a/typescript/s3-object-lambda/package.json +++ b/typescript/s3-object-lambda/package.json @@ -10,15 +10,15 @@ "cdk": "cdk" }, "devDependencies": { - "@types/node": "18.11.17", - "aws-cdk": "*", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { "@aws-sdk/client-s3": "^3.537.0", - "aws-cdk-lib": "^2.0.0", - "constructs": "^10.1.190", + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0", "source-map-support": "^0.5.21" } } diff --git a/typescript/s3-sns-lambda-chain/package.json b/typescript/s3-sns-lambda-chain/package.json index 47dffb202f..026089cc3f 100644 --- a/typescript/s3-sns-lambda-chain/package.json +++ b/typescript/s3-sns-lambda-chain/package.json @@ -12,17 +12,17 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.2.5", - "@types/node": "18.11.18", - "aws-cdk": "*", - "jest": "^29.3.1", - "ts-jest": "^29.0.5", - "ts-node": "^10.9.1", - "typescript": "~4.9.4" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "*", - "constructs": "*" + "aws-cdk-lib": "2.185.0", + "constructs": "^10.0.0" }, "jest": { "preset": "ts-jest", diff --git a/typescript/secrets-manager-rotation/package.json b/typescript/secrets-manager-rotation/package.json index 82af4a6208..2dce21919f 100644 --- a/typescript/secrets-manager-rotation/package.json +++ b/typescript/secrets-manager-rotation/package.json @@ -15,17 +15,17 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/jest": "^26.0.10", - "@types/node": "10.17.27", - "aws-cdk": "*", - "jest": "^26.4.2", - "ts-jest": "^26.2.0", - "ts-node": "^9.0.0", - "typescript": "~3.9.7" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "*", + "aws-cdk-lib": "2.185.0", "@aws-cdk/aws-lambda-python-alpha": "*", - "constructs": "*" + "constructs": "^10.0.0" } } diff --git a/typescript/servicecatalog/portfolio-with-ec2-product/package.json b/typescript/servicecatalog/portfolio-with-ec2-product/package.json index 54f65fe39c..51e3fc2438 100644 --- a/typescript/servicecatalog/portfolio-with-ec2-product/package.json +++ b/typescript/servicecatalog/portfolio-with-ec2-product/package.json @@ -10,16 +10,16 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^26.0.10", - "@types/node": "10.17.27", - "jest": "^29.6.2", - "ts-jest": "^29.1.1", - "aws-cdk": "*", - "ts-node": "^10.9.1", - "typescript": "~5.1.6" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "aws-cdk": "2.1004.0", + "ts-node": "^10.9.2", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/static-site-basic/package.json b/typescript/static-site-basic/package.json index 6aef547485..8c8cf37368 100644 --- a/typescript/static-site-basic/package.json +++ b/typescript/static-site-basic/package.json @@ -14,12 +14,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^10.17.0", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "ts-node": "^10.9.2" } diff --git a/typescript/static-site/package.json b/typescript/static-site/package.json index 3315dde4f8..8ceb6c6ed7 100644 --- a/typescript/static-site/package.json +++ b/typescript/static-site/package.json @@ -14,12 +14,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^10.17.0", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/stepfunction-external-definition/package.json b/typescript/stepfunction-external-definition/package.json index 8bffbf265a..e4a021602e 100644 --- a/typescript/stepfunction-external-definition/package.json +++ b/typescript/stepfunction-external-definition/package.json @@ -10,13 +10,13 @@ "cdk": "cdk" }, "devDependencies": { - "@types/node": "22.5.4", - "aws-cdk": "2.162.1", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", "ts-node": "^10.9.2", - "typescript": "~5.6.2" + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.162.1", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/stepfunctions-job-poller/package.json b/typescript/stepfunctions-job-poller/package.json index b8b1269969..4899fff8a8 100644 --- a/typescript/stepfunctions-job-poller/package.json +++ b/typescript/stepfunctions-job-poller/package.json @@ -15,12 +15,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "*", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0" } } diff --git a/typescript/waf/package.json b/typescript/waf/package.json index 1ffdf9b48b..41f456408b 100644 --- a/typescript/waf/package.json +++ b/typescript/waf/package.json @@ -10,13 +10,13 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^26.0.10", - "@types/node": "*", - "aws-cdk": "*", - "typescript": "~5.1.6" + "@types/jest": "^29.5.14", + "@types/node": "22.7.9", + "aws-cdk": "2.1004.0", + "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "^2.0.0", + "aws-cdk-lib": "2.185.0", "constructs": "^10.0.0", "jest": "^26.4.2", "ts-jest": "^26.2.0", From 508c186c5b80a18ccfbb9544a64557bcbd3dce34 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 18:38:11 -0500 Subject: [PATCH 02/16] Commit these fixes --- .../package.json | 12 +- .../.gitattributes | 24 -- .../.github/pull_request_template.md | 1 - .../.github/workflows/build.yml | 110 ------- .../.github/workflows/pull-request-lint.yml | 28 -- .../.github/workflows/release.yml | 109 ------ .../.github/workflows/upgrade-main.yml | 90 ----- .../ec2-instance-connect-endpoint/.gitignore | 57 ---- .../.mergify.yml | 26 -- .../.projen/deps.json | 133 -------- .../.projen/files.json | 21 -- .../.projen/tasks.json | 310 ------------------ .../.projenrc.ts | 39 --- .../ec2-instance-connect-endpoint/LICENSE | 202 ------------ .../ec2-instance-connect-endpoint/cdk.json | 3 +- .../package.json | 99 +----- .../test-reports/junit.xml | 3 + .../tsconfig.dev.json | 38 --- .../tsconfig.json} | 25 +- typescript/ec2-instance/.gitattributes | 23 -- .../.github/pull_request_template.md | 1 - .../ec2-instance/.github/workflows/build.yml | 73 ----- .../.github/workflows/pull-request-lint.yml | 29 -- .../.github/workflows/upgrade.yml | 83 ----- typescript/ec2-instance/.gitignore | 58 ---- typescript/ec2-instance/.mergify.yml | 24 -- typescript/ec2-instance/.projen/deps.json | 94 ------ typescript/ec2-instance/.projen/files.json | 22 -- typescript/ec2-instance/.projen/tasks.json | 269 --------------- typescript/ec2-instance/.projenrc.js | 27 -- typescript/ec2-instance/cdk.json | 45 ++- typescript/ec2-instance/package.json | 82 +---- .../ec2-instance/test-reports/junit.xml | 23 ++ typescript/ec2-instance/tsconfig.json | 47 +-- ...egated-admin-account-resource.test.ts.snap | 92 ++++-- .../inspector2-enable-resources.test.ts.snap | 95 ++++-- ...nspector2-monitoring-resource.test.ts.snap | 98 +++--- ...r2-update-org-config-resource.test.ts.snap | 92 ++++-- 38 files changed, 349 insertions(+), 2258 deletions(-) delete mode 100644 typescript/ec2-instance-connect-endpoint/.gitattributes delete mode 100644 typescript/ec2-instance-connect-endpoint/.github/pull_request_template.md delete mode 100644 typescript/ec2-instance-connect-endpoint/.github/workflows/build.yml delete mode 100644 typescript/ec2-instance-connect-endpoint/.github/workflows/pull-request-lint.yml delete mode 100644 typescript/ec2-instance-connect-endpoint/.github/workflows/release.yml delete mode 100644 typescript/ec2-instance-connect-endpoint/.github/workflows/upgrade-main.yml delete mode 100644 typescript/ec2-instance-connect-endpoint/.gitignore delete mode 100644 typescript/ec2-instance-connect-endpoint/.mergify.yml delete mode 100644 typescript/ec2-instance-connect-endpoint/.projen/deps.json delete mode 100644 typescript/ec2-instance-connect-endpoint/.projen/files.json delete mode 100644 typescript/ec2-instance-connect-endpoint/.projen/tasks.json delete mode 100644 typescript/ec2-instance-connect-endpoint/.projenrc.ts delete mode 100644 typescript/ec2-instance-connect-endpoint/LICENSE create mode 100644 typescript/ec2-instance-connect-endpoint/test-reports/junit.xml delete mode 100644 typescript/ec2-instance-connect-endpoint/tsconfig.dev.json rename typescript/{ec2-instance/tsconfig.dev.json => ec2-instance-connect-endpoint/tsconfig.json} (65%) delete mode 100644 typescript/ec2-instance/.gitattributes delete mode 100644 typescript/ec2-instance/.github/pull_request_template.md delete mode 100644 typescript/ec2-instance/.github/workflows/build.yml delete mode 100644 typescript/ec2-instance/.github/workflows/pull-request-lint.yml delete mode 100644 typescript/ec2-instance/.github/workflows/upgrade.yml delete mode 100644 typescript/ec2-instance/.gitignore delete mode 100644 typescript/ec2-instance/.mergify.yml delete mode 100644 typescript/ec2-instance/.projen/deps.json delete mode 100644 typescript/ec2-instance/.projen/files.json delete mode 100644 typescript/ec2-instance/.projen/tasks.json delete mode 100644 typescript/ec2-instance/.projenrc.js create mode 100644 typescript/ec2-instance/test-reports/junit.xml diff --git a/typescript/appsync-graphql-typescript-resolver/package.json b/typescript/appsync-graphql-typescript-resolver/package.json index b200fad910..6ddd32f059 100644 --- a/typescript/appsync-graphql-typescript-resolver/package.json +++ b/typescript/appsync-graphql-typescript-resolver/package.json @@ -14,16 +14,16 @@ }, "devDependencies": { "@aws-appsync/utils": "^1.2.5", - "@types/jest": "^29.5.14", - "@types/node": "22.7.9", + "@types/jest": "^29.5.12", + "@types/node": "20.11.19", "jest": "^29.7.0", - "ts-jest": "^29.2.5", - "aws-cdk": "2.1004.0", + "ts-jest": "^29.1.2", + "aws-cdk": "2.133.0", "ts-node": "^10.9.2", - "typescript": "~5.6.3" + "typescript": "~5.3.3" }, "dependencies": { - "aws-cdk-lib": "2.185.0", + "aws-cdk-lib": "2.133.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/typescript/ec2-instance-connect-endpoint/.gitattributes b/typescript/ec2-instance-connect-endpoint/.gitattributes deleted file mode 100644 index 556d869bf3..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.gitattributes +++ /dev/null @@ -1,24 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -*.snap linguist-generated -/.eslintrc.json linguist-generated -/.gitattributes linguist-generated -/.github/pull_request_template.md linguist-generated -/.github/workflows/build.yml linguist-generated -/.github/workflows/pull-request-lint.yml linguist-generated -/.github/workflows/release.yml linguist-generated -/.github/workflows/upgrade-main.yml linguist-generated -/.gitignore linguist-generated -/.mergify.yml linguist-generated -/.npmignore linguist-generated -/.npmrc linguist-generated -/.projen/** linguist-generated -/.projen/deps.json linguist-generated -/.projen/files.json linguist-generated -/.projen/tasks.json linguist-generated -/API.md linguist-generated -/cdk.json linguist-generated -/LICENSE linguist-generated -/package.json linguist-generated -/tsconfig.dev.json linguist-generated -/yarn.lock linguist-generated \ No newline at end of file diff --git a/typescript/ec2-instance-connect-endpoint/.github/pull_request_template.md b/typescript/ec2-instance-connect-endpoint/.github/pull_request_template.md deleted file mode 100644 index 11d479bcae..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.github/pull_request_template.md +++ /dev/null @@ -1 +0,0 @@ -Fixes # \ No newline at end of file diff --git a/typescript/ec2-instance-connect-endpoint/.github/workflows/build.yml b/typescript/ec2-instance-connect-endpoint/.github/workflows/build.yml deleted file mode 100644 index 9d766c7ad6..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.github/workflows/build.yml +++ /dev/null @@ -1,110 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: build -on: - pull_request: {} - workflow_dispatch: {} -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: write - outputs: - self_mutation_happened: ${{ steps.self_mutation.outputs.self_mutation_happened }} - env: - CI: "true" - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 16.x - - name: Install dependencies - run: yarn install --check-files - - name: build - run: npx projen build - - name: Find mutations - id: self_mutation - run: |- - git add . - git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT - - name: Upload patch - if: steps.self_mutation.outputs.self_mutation_happened - uses: actions/upload-artifact@v3 - with: - name: .repo.patch - path: .repo.patch - - name: Fail build on mutation - if: steps.self_mutation.outputs.self_mutation_happened - run: |- - echo "::error::Files were changed during build (see build log). If this was triggered from a fork, you will need to update your branch." - cat .repo.patch - exit 1 - - name: Backup artifact permissions - run: cd dist && getfacl -R . > permissions-backup.acl - continue-on-error: true - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: build-artifact - path: dist - self-mutation: - needs: build - runs-on: ubuntu-latest - permissions: - contents: write - if: always() && needs.build.outputs.self_mutation_happened && !(github.event.pull_request.head.repo.full_name != github.repository) - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} - - name: Download patch - uses: actions/download-artifact@v3 - with: - name: .repo.patch - path: ${{ runner.temp }} - - name: Apply patch - run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Push changes - env: - PULL_REQUEST_REF: ${{ github.event.pull_request.head.ref }} - run: |- - git add . - git commit -s -m "chore: self mutation" - git push origin HEAD:$PULL_REQUEST_REF - package-js: - needs: build - runs-on: ubuntu-latest - permissions: {} - if: "! needs.build.outputs.self_mutation_happened" - steps: - - uses: actions/setup-node@v3 - with: - node-version: 16.x - - name: Download build artifacts - uses: actions/download-artifact@v3 - with: - name: build-artifact - path: dist - - name: Restore build artifact permissions - run: cd dist && setfacl --restore=permissions-backup.acl - continue-on-error: true - - name: Prepare Repository - run: mv dist .repo - - name: Install Dependencies - run: cd .repo && yarn install --check-files --frozen-lockfile - - name: Create js artifact - run: cd .repo && npx projen package:js - - name: Collect js Artifact - run: mv .repo/dist dist diff --git a/typescript/ec2-instance-connect-endpoint/.github/workflows/pull-request-lint.yml b/typescript/ec2-instance-connect-endpoint/.github/workflows/pull-request-lint.yml deleted file mode 100644 index 062108a6d7..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.github/workflows/pull-request-lint.yml +++ /dev/null @@ -1,28 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: pull-request-lint -on: - pull_request_target: - types: - - labeled - - opened - - synchronize - - reopened - - ready_for_review - - edited -jobs: - validate: - name: Validate PR title - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - uses: amannn/action-semantic-pull-request@v5.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - types: |- - feat - fix - chore - requireScope: false diff --git a/typescript/ec2-instance-connect-endpoint/.github/workflows/release.yml b/typescript/ec2-instance-connect-endpoint/.github/workflows/release.yml deleted file mode 100644 index 0ac463f555..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.github/workflows/release.yml +++ /dev/null @@ -1,109 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: release -on: - push: - branches: - - main - workflow_dispatch: {} -jobs: - release: - runs-on: ubuntu-latest - permissions: - contents: write - outputs: - latest_commit: ${{ steps.git_remote.outputs.latest_commit }} - env: - CI: "true" - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 16.x - - name: Install dependencies - run: yarn install --check-files --frozen-lockfile - - name: release - run: npx projen release - - name: Check for new commits - id: git_remote - run: echo "latest_commit=$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" >> $GITHUB_OUTPUT - - name: Backup artifact permissions - if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - run: cd dist && getfacl -R . > permissions-backup.acl - continue-on-error: true - - name: Upload artifact - if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - uses: actions/upload-artifact@v3 - with: - name: build-artifact - path: dist - release_github: - name: Publish to GitHub Releases - needs: release - runs-on: ubuntu-latest - permissions: - contents: write - if: needs.release.outputs.latest_commit == github.sha - steps: - - uses: actions/setup-node@v3 - with: - node-version: 16.x - - name: Download build artifacts - uses: actions/download-artifact@v3 - with: - name: build-artifact - path: dist - - name: Restore build artifact permissions - run: cd dist && setfacl --restore=permissions-backup.acl - continue-on-error: true - - name: Prepare Repository - run: mv dist .repo - - name: Collect GitHub Metadata - run: mv .repo/dist dist - - name: Release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REPOSITORY: ${{ github.repository }} - GITHUB_REF: ${{ github.ref }} - run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi - release_npm: - name: Publish to npm - needs: release - runs-on: ubuntu-latest - permissions: - contents: read - if: needs.release.outputs.latest_commit == github.sha - steps: - - uses: actions/setup-node@v3 - with: - node-version: 16.x - - name: Download build artifacts - uses: actions/download-artifact@v3 - with: - name: build-artifact - path: dist - - name: Restore build artifact permissions - run: cd dist && setfacl --restore=permissions-backup.acl - continue-on-error: true - - name: Prepare Repository - run: mv dist .repo - - name: Install Dependencies - run: cd .repo && yarn install --check-files --frozen-lockfile - - name: Create js artifact - run: cd .repo && npx projen package:js - - name: Collect js Artifact - run: mv .repo/dist dist - - name: Release - env: - NPM_DIST_TAG: latest - NPM_REGISTRY: registry.npmjs.org - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: npx -p publib@latest publib-npm diff --git a/typescript/ec2-instance-connect-endpoint/.github/workflows/upgrade-main.yml b/typescript/ec2-instance-connect-endpoint/.github/workflows/upgrade-main.yml deleted file mode 100644 index 6b7068b5ca..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.github/workflows/upgrade-main.yml +++ /dev/null @@ -1,90 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: upgrade-main -on: - workflow_dispatch: {} - schedule: - - cron: 0 0 * * * -jobs: - upgrade: - name: Upgrade - runs-on: ubuntu-latest - permissions: - contents: read - outputs: - patch_created: ${{ steps.create_patch.outputs.patch_created }} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: main - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 16.x - - name: Install dependencies - run: yarn install --check-files --frozen-lockfile - - name: Upgrade dependencies - run: npx projen upgrade - - name: Find mutations - id: create_patch - run: |- - git add . - git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT - - name: Upload patch - if: steps.create_patch.outputs.patch_created - uses: actions/upload-artifact@v3 - with: - name: .repo.patch - path: .repo.patch - pr: - name: Create Pull Request - needs: upgrade - runs-on: ubuntu-latest - permissions: - contents: read - if: ${{ needs.upgrade.outputs.patch_created }} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: main - - name: Download patch - uses: actions/download-artifact@v3 - with: - name: .repo.patch - path: ${{ runner.temp }} - - name: Apply patch - run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Create Pull Request - id: create-pr - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - commit-message: |- - chore(deps): upgrade dependencies - - Upgrades project dependencies. See details in [workflow run]. - - [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - ------ - - *Automatically created by projen via the "upgrade-main" workflow* - branch: github-actions/upgrade-main - title: "chore(deps): upgrade dependencies" - body: |- - Upgrades project dependencies. See details in [workflow run]. - - [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - ------ - - *Automatically created by projen via the "upgrade-main" workflow* - author: github-actions - committer: github-actions - signoff: true diff --git a/typescript/ec2-instance-connect-endpoint/.gitignore b/typescript/ec2-instance-connect-endpoint/.gitignore deleted file mode 100644 index 323b836a97..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.gitignore +++ /dev/null @@ -1,57 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". -!/.gitattributes -!/.projen/tasks.json -!/.projen/deps.json -!/.projen/files.json -!/.github/workflows/pull-request-lint.yml -!/package.json -!/LICENSE -!/.npmignore -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json -pids -*.pid -*.seed -*.pid.lock -lib-cov -coverage -*.lcov -.nyc_output -build/Release -node_modules/ -jspm_packages/ -*.tsbuildinfo -.eslintcache -*.tgz -.yarn-integrity -.cache -!/.projenrc.js -/test-reports/ -junit.xml -/coverage/ -!/.github/workflows/build.yml -/dist/changelog.md -/dist/version.txt -!/.github/workflows/release.yml -!/.mergify.yml -!/.github/workflows/upgrade-main.yml -!/.github/pull_request_template.md -!/.npmrc -!/test/ -!/tsconfig.dev.json -!/src/ -/lib -/dist/ -!/.eslintrc.json -.jsii -tsconfig.json -!/API.md -!/cdk.json -cdk.out -cdk.context.json -yarn-error.log diff --git a/typescript/ec2-instance-connect-endpoint/.mergify.yml b/typescript/ec2-instance-connect-endpoint/.mergify.yml deleted file mode 100644 index 154b39fa50..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.mergify.yml +++ /dev/null @@ -1,26 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -queue_rules: - - name: default - update_method: merge - conditions: - - "#approved-reviews-by>=1" - - -label~=(do-not-merge) - - status-success=build - - status-success=package-js -pull_request_rules: - - name: Automatic merge on approval and successful build - actions: - delete_head_branch: {} - queue: - method: squash - name: default - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} - conditions: - - "#approved-reviews-by>=1" - - -label~=(do-not-merge) - - status-success=build - - status-success=package-js diff --git a/typescript/ec2-instance-connect-endpoint/.projen/deps.json b/typescript/ec2-instance-connect-endpoint/.projen/deps.json deleted file mode 100644 index 000bc96bf3..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.projen/deps.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "dependencies": [ - { - "name": "@types/jest", - "type": "build" - }, - { - "name": "@types/node", - "version": "^16", - "type": "build" - }, - { - "name": "@typescript-eslint/eslint-plugin", - "version": "^5", - "type": "build" - }, - { - "name": "@typescript-eslint/parser", - "version": "^5", - "type": "build" - }, - { - "name": "aws-cdk-lib", - "version": "2.85.0", - "type": "build" - }, - { - "name": "aws-cdk", - "version": "2.85.0", - "type": "build" - }, - { - "name": "constructs", - "version": "10.0.5", - "type": "build" - }, - { - "name": "eslint-import-resolver-node", - "type": "build" - }, - { - "name": "eslint-import-resolver-typescript", - "type": "build" - }, - { - "name": "eslint-plugin-import", - "type": "build" - }, - { - "name": "eslint", - "version": "^8", - "type": "build" - }, - { - "name": "jest", - "type": "build" - }, - { - "name": "jest-junit", - "version": "^15", - "type": "build" - }, - { - "name": "jsii-diff", - "type": "build" - }, - { - "name": "jsii-docgen", - "type": "build" - }, - { - "name": "jsii-pacmak", - "type": "build" - }, - { - "name": "jsii-rosetta", - "version": "~5.0.0", - "type": "build" - }, - { - "name": "jsii", - "version": "~5.0.0", - "type": "build" - }, - { - "name": "npm-check-updates", - "version": "^16", - "type": "build" - }, - { - "name": "projen", - "type": "build" - }, - { - "name": "standard-version", - "version": "^9", - "type": "build" - }, - { - "name": "ts-jest", - "type": "build" - }, - { - "name": "ts-node", - "type": "build" - }, - { - "name": "typescript", - "type": "build" - }, - { - "name": "aws-cdk-lib", - "version": "^2.85.0", - "type": "peer" - }, - { - "name": "constructs", - "version": "^10.0.5", - "type": "peer" - }, - { - "name": "@aws-cdk/aws-lambda-python-alpha", - "version": "^2.85.0-alpha.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/integ-tests-alpha", - "version": "^2.85.0-alpha.0", - "type": "runtime" - } - ], - "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." -} diff --git a/typescript/ec2-instance-connect-endpoint/.projen/files.json b/typescript/ec2-instance-connect-endpoint/.projen/files.json deleted file mode 100644 index 4be0fa682e..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.projen/files.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "files": [ - ".eslintrc.json", - ".gitattributes", - ".github/pull_request_template.md", - ".github/workflows/build.yml", - ".github/workflows/pull-request-lint.yml", - ".github/workflows/release.yml", - ".github/workflows/upgrade-main.yml", - ".gitignore", - ".mergify.yml", - ".npmrc", - ".projen/deps.json", - ".projen/files.json", - ".projen/tasks.json", - "cdk.json", - "LICENSE", - "tsconfig.dev.json" - ], - "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." -} diff --git a/typescript/ec2-instance-connect-endpoint/.projen/tasks.json b/typescript/ec2-instance-connect-endpoint/.projen/tasks.json deleted file mode 100644 index 14d7f9be68..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.projen/tasks.json +++ /dev/null @@ -1,310 +0,0 @@ -{ - "tasks": { - "build": { - "name": "build", - "description": "Full release build", - "steps": [ - { - "spawn": "default" - }, - { - "spawn": "pre-compile" - }, - { - "spawn": "compile" - }, - { - "spawn": "post-compile" - }, - { - "spawn": "test" - }, - { - "spawn": "package" - } - ] - }, - "bump": { - "name": "bump", - "description": "Bumps version based on latest git tag and generates a changelog entry", - "env": { - "OUTFILE": "package.json", - "CHANGELOG": "dist/changelog.md", - "BUMPFILE": "dist/version.txt", - "RELEASETAG": "dist/releasetag.txt", - "RELEASE_TAG_PREFIX": "" - }, - "steps": [ - { - "builtin": "release/bump-version" - } - ], - "condition": "! git log --oneline -1 | grep -q \"chore(release):\"" - }, - "clobber": { - "name": "clobber", - "description": "hard resets to HEAD of origin and cleans the local repo", - "env": { - "BRANCH": "$(git branch --show-current)" - }, - "steps": [ - { - "exec": "git checkout -b scratch", - "name": "save current HEAD in \"scratch\" branch" - }, - { - "exec": "git checkout $BRANCH" - }, - { - "exec": "git fetch origin", - "name": "fetch latest changes from origin" - }, - { - "exec": "git reset --hard origin/$BRANCH", - "name": "hard reset to origin commit" - }, - { - "exec": "git clean -fdx", - "name": "clean all untracked files" - }, - { - "say": "ready to rock! (unpushed commits are under the \"scratch\" branch)" - } - ], - "condition": "git diff --exit-code > /dev/null" - }, - "compat": { - "name": "compat", - "description": "Perform API compatibility check against latest version", - "steps": [ - { - "exec": "jsii-diff npm:$(node -p \"require('./package.json').name\") -k --ignore-file .compatignore || (echo \"\nUNEXPECTED BREAKING CHANGES: add keys such as 'removed:constructs.Node.of' to .compatignore to skip.\n\" && exit 1)" - } - ] - }, - "compile": { - "name": "compile", - "description": "Only compile", - "steps": [ - { - "exec": "jsii --silence-warnings=reserved-word" - } - ] - }, - "default": { - "name": "default", - "description": "Synthesize project files", - "steps": [ - { - "exec": "ts-node --project tsconfig.dev.json .projenrc.ts" - } - ] - }, - "docgen": { - "name": "docgen", - "description": "Generate API.md from .jsii manifest", - "steps": [ - { - "exec": "jsii-docgen -o API.md" - } - ] - }, - "eject": { - "name": "eject", - "description": "Remove projen from the project", - "env": { - "PROJEN_EJECTING": "true" - }, - "steps": [ - { - "spawn": "default" - } - ] - }, - "eslint": { - "name": "eslint", - "description": "Runs eslint against the codebase", - "steps": [ - { - "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools projenrc .projenrc.ts --parser-options={tsconfigRootDir:null}" - } - ] - }, - "install": { - "name": "install", - "description": "Install project dependencies and update lockfile (non-frozen)", - "steps": [ - { - "exec": "yarn install --check-files" - } - ] - }, - "install:ci": { - "name": "install:ci", - "description": "Install project dependencies using frozen lockfile", - "steps": [ - { - "exec": "yarn install --check-files --frozen-lockfile" - } - ] - }, - "package": { - "name": "package", - "description": "Creates the distribution package", - "steps": [ - { - "exec": "if [ ! -z ${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" - } - ] - }, - "package-all": { - "name": "package-all", - "description": "Packages artifacts for all target languages", - "steps": [ - { - "spawn": "package:js" - } - ] - }, - "package:js": { - "name": "package:js", - "description": "Create js language bindings", - "steps": [ - { - "exec": "jsii-pacmak -v --target js" - } - ] - }, - "post-compile": { - "name": "post-compile", - "description": "Runs after successful compilation", - "steps": [ - { - "spawn": "docgen" - } - ] - }, - "post-upgrade": { - "name": "post-upgrade", - "description": "Runs after upgrading dependencies" - }, - "pre-compile": { - "name": "pre-compile", - "description": "Prepare the project for compilation" - }, - "release": { - "name": "release", - "description": "Prepare a release from \"main\" branch", - "env": { - "RELEASE": "true" - }, - "steps": [ - { - "exec": "rm -fr dist" - }, - { - "spawn": "bump" - }, - { - "spawn": "build" - }, - { - "spawn": "unbump" - }, - { - "exec": "git diff --ignore-space-at-eol --exit-code" - } - ] - }, - "test": { - "name": "test", - "description": "Run tests", - "steps": [ - { - "exec": "jest --passWithNoTests --updateSnapshot", - "receiveArgs": true - }, - { - "spawn": "eslint" - } - ] - }, - "test:watch": { - "name": "test:watch", - "description": "Run jest in watch mode", - "steps": [ - { - "exec": "jest --watch" - } - ] - }, - "unbump": { - "name": "unbump", - "description": "Restores version to 0.0.0", - "env": { - "OUTFILE": "package.json", - "CHANGELOG": "dist/changelog.md", - "BUMPFILE": "dist/version.txt", - "RELEASETAG": "dist/releasetag.txt", - "RELEASE_TAG_PREFIX": "" - }, - "steps": [ - { - "builtin": "release/reset-version" - } - ] - }, - "upgrade": { - "name": "upgrade", - "description": "upgrade dependencies", - "env": { - "CI": "0" - }, - "steps": [ - { - "exec": "yarn upgrade npm-check-updates" - }, - { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='aws-cdk-lib,aws-cdk,constructs,jsii-rosetta,jsii'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='aws-cdk-lib,aws-cdk,constructs,jsii-rosetta,jsii'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='aws-cdk-lib,aws-cdk,constructs,jsii-rosetta,jsii'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='aws-cdk-lib,aws-cdk,constructs,jsii-rosetta,jsii'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='aws-cdk-lib,aws-cdk,constructs,jsii-rosetta,jsii'" - }, - { - "exec": "yarn install --check-files" - }, - { - "exec": "yarn upgrade" - }, - { - "exec": "npx projen" - }, - { - "spawn": "post-upgrade" - } - ] - }, - "watch": { - "name": "watch", - "description": "Watch & compile in the background", - "steps": [ - { - "exec": "jsii -w --silence-warnings=reserved-word" - } - ] - } - }, - "env": { - "PATH": "$(npx -c \"node --print process.env.PATH\")" - }, - "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." -} diff --git a/typescript/ec2-instance-connect-endpoint/.projenrc.ts b/typescript/ec2-instance-connect-endpoint/.projenrc.ts deleted file mode 100644 index be005479cc..0000000000 --- a/typescript/ec2-instance-connect-endpoint/.projenrc.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { awscdk, JsonFile } from 'projen'; -const project = new awscdk.AwsCdkConstructLibrary({ - author: 'Pahud Hsieh', - authorAddress: 'pahudnet@gmail.com', - cdkVersion: '2.85.0', - defaultReleaseBranch: 'main', - jsiiVersion: '~5.0.0', - name: 'ec2-instance-connect-endpoint', - projenrcTs: true, - repositoryUrl: 'https://github.com/aws-samples/aws-cdk-examples.git', - deps: [ - '@aws-cdk/integ-tests-alpha@^2.85.0-alpha.0', - '@aws-cdk/aws-lambda-python-alpha@^2.85.0-alpha.0', - ], - devDeps: [ - 'aws-cdk@2.85.0', - ], -}); - -// required for vscode eslint extension to locate the tsconfig correctly -project.eslint!.config.parserOptions.tsconfigRootDir = 'typescript/ec2-instance-connect-endpoint'; -/** - * reset tsconfigRootDir to null as a workaround for eslint CLI - * see https://github.com/typescript-eslint/typescript-eslint/issues/251#issuecomment-493187240 - */ -const tasksJson = project.tryFindObjectFile('.projen/tasks.json')!; -tasksJson.addOverride('tasks.eslint.steps.0.exec', 'eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools projenrc .projenrc.ts --parser-options={tsconfigRootDir:null}'); - -new JsonFile(project, 'cdk.json', { - obj: { - app: 'npx ts-node --prefer-ts-exts src/integ.default.ts', - }, -}); - -const common_exclude = ['cdk.out', 'cdk.context.json', 'yarn-error.log']; -project.npmignore?.exclude(...common_exclude); -project.gitignore.exclude(...common_exclude); - -project.synth(); \ No newline at end of file diff --git a/typescript/ec2-instance-connect-endpoint/LICENSE b/typescript/ec2-instance-connect-endpoint/LICENSE deleted file mode 100644 index d645695673..0000000000 --- a/typescript/ec2-instance-connect-endpoint/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/typescript/ec2-instance-connect-endpoint/cdk.json b/typescript/ec2-instance-connect-endpoint/cdk.json index de39f2e1ed..f818b2a3da 100644 --- a/typescript/ec2-instance-connect-endpoint/cdk.json +++ b/typescript/ec2-instance-connect-endpoint/cdk.json @@ -1,4 +1,3 @@ { - "app": "npx ts-node --prefer-ts-exts src/integ.default.ts", - "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." + "app": "npx ts-node --prefer-ts-exts src/integ.default.ts" } diff --git a/typescript/ec2-instance-connect-endpoint/package.json b/typescript/ec2-instance-connect-endpoint/package.json index a7548fe071..cdcb68154f 100644 --- a/typescript/ec2-instance-connect-endpoint/package.json +++ b/typescript/ec2-instance-connect-endpoint/package.json @@ -1,60 +1,30 @@ { "name": "ec2-instance-connect-endpoint", + "version": "0.0.0", "repository": { "type": "git", "url": "https://github.com/aws-samples/aws-cdk-examples.git" }, "scripts": { - "build": "npx projen build", - "bump": "npx projen bump", - "clobber": "npx projen clobber", - "compat": "npx projen compat", - "compile": "npx projen compile", - "default": "npx projen default", - "docgen": "npx projen docgen", - "eject": "npx projen eject", - "eslint": "npx projen eslint", - "package": "npx projen package", - "package-all": "npx projen package-all", - "package:js": "npx projen package:js", - "post-compile": "npx projen post-compile", - "post-upgrade": "npx projen post-upgrade", - "pre-compile": "npx projen pre-compile", - "release": "npx projen release", - "test": "npx projen test", - "test:watch": "npx projen test:watch", - "unbump": "npx projen unbump", - "upgrade": "npx projen upgrade", - "watch": "npx projen watch", - "projen": "npx projen" + "build": "tsc", + "watch": "tsc -w", + "test": "jest", + "cdk": "cdk" }, "author": { "name": "Pahud Hsieh", - "email": "pahudnet@gmail.com", - "organization": false + "email": "pahudnet@gmail.com" }, "devDependencies": { "@types/jest": "^29.5.14", - "@types/node": "22.7.9", + "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "aws-cdk": "2.1004.0", + "aws-cdk": "2.85.0", "aws-cdk-lib": "2.85.0", "constructs": "10.0.5", "eslint": "^8", - "eslint-import-resolver-node": "^0.3.7", - "eslint-import-resolver-typescript": "^3.5.5", - "eslint-plugin-import": "^2.27.5", "jest": "^29.7.0", - "jest-junit": "^15", - "jsii": "~5.0.0", - "jsii-diff": "^1.84.0", - "jsii-docgen": "^9.0.14", - "jsii-pacmak": "^1.84.0", - "jsii-rosetta": "~5.0.0", - "npm-check-updates": "^16", - "projen": "^0.71.118", - "standard-version": "^9", "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "~5.6.3" @@ -71,57 +41,6 @@ "cdk" ], "main": "lib/index.js", - "license": "Apache-2.0", - "version": "0.0.0", - "jest": { - "testMatch": [ - "/src/**/__tests__/**/*.ts?(x)", - "/(test|src)/**/*(*.)@(spec|test).ts?(x)" - ], - "clearMocks": true, - "collectCoverage": true, - "coverageReporters": [ - "json", - "lcov", - "clover", - "cobertura", - "text" - ], - "coverageDirectory": "coverage", - "coveragePathIgnorePatterns": [ - "/node_modules/" - ], - "testPathIgnorePatterns": [ - "/node_modules/" - ], - "watchPathIgnorePatterns": [ - "/node_modules/" - ], - "reporters": [ - "default", - [ - "jest-junit", - { - "outputDirectory": "test-reports" - } - ] - ], - "preset": "ts-jest", - "globals": { - "ts-jest": { - "tsconfig": "tsconfig.dev.json" - } - } - }, "types": "lib/index.d.ts", - "stability": "stable", - "jsii": { - "outdir": "dist", - "targets": {}, - "tsc": { - "outDir": "lib", - "rootDir": "src" - } - }, - "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." + "license": "Apache-2.0" } diff --git a/typescript/ec2-instance-connect-endpoint/test-reports/junit.xml b/typescript/ec2-instance-connect-endpoint/test-reports/junit.xml new file mode 100644 index 0000000000..d82c4289dc --- /dev/null +++ b/typescript/ec2-instance-connect-endpoint/test-reports/junit.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/typescript/ec2-instance-connect-endpoint/tsconfig.dev.json b/typescript/ec2-instance-connect-endpoint/tsconfig.dev.json deleted file mode 100644 index 88cc2f2f33..0000000000 --- a/typescript/ec2-instance-connect-endpoint/tsconfig.dev.json +++ /dev/null @@ -1,38 +0,0 @@ -// ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". -{ - "compilerOptions": { - "alwaysStrict": true, - "declaration": true, - "esModuleInterop": true, - "experimentalDecorators": true, - "inlineSourceMap": true, - "inlineSources": true, - "lib": [ - "es2019" - ], - "module": "CommonJS", - "noEmitOnError": false, - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "resolveJsonModule": true, - "strict": true, - "strictNullChecks": true, - "strictPropertyInitialization": true, - "stripInternal": true, - "target": "ES2019" - }, - "include": [ - ".projenrc.js", - "src/**/*.ts", - "test/**/*.ts", - ".projenrc.ts", - "projenrc/**/*.ts" - ], - "exclude": [ - "node_modules" - ] -} diff --git a/typescript/ec2-instance/tsconfig.dev.json b/typescript/ec2-instance-connect-endpoint/tsconfig.json similarity index 65% rename from typescript/ec2-instance/tsconfig.dev.json rename to typescript/ec2-instance-connect-endpoint/tsconfig.json index 3bd3671661..93d89c09f9 100644 --- a/typescript/ec2-instance/tsconfig.dev.json +++ b/typescript/ec2-instance-connect-endpoint/tsconfig.json @@ -1,17 +1,19 @@ -// ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". { "compilerOptions": { + "outDir": "lib", + "rootDir": "src", + "declarationMap": false, + "inlineSourceMap": true, + "inlineSources": true, "alwaysStrict": true, "declaration": true, - "esModuleInterop": true, "experimentalDecorators": true, - "inlineSourceMap": true, - "inlineSources": true, + "incremental": true, "lib": [ - "es2019" + "es2020" ], "module": "CommonJS", - "noEmitOnError": false, + "noEmitOnError": true, "noFallthroughCasesInSwitch": true, "noImplicitAny": true, "noImplicitReturns": true, @@ -19,16 +21,17 @@ "noUnusedLocals": true, "noUnusedParameters": true, "resolveJsonModule": true, + "skipLibCheck": true, "strict": true, "strictNullChecks": true, "strictPropertyInitialization": true, - "stripInternal": true, - "target": "ES2019" + "stripInternal": false, + "target": "ES2020", + "composite": false, + "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo" }, "include": [ - ".projenrc.js", - "src/**/*.ts", - "test/**/*.ts" + "src/**/*.ts" ], "exclude": [ "node_modules" diff --git a/typescript/ec2-instance/.gitattributes b/typescript/ec2-instance/.gitattributes deleted file mode 100644 index 37f8188eea..0000000000 --- a/typescript/ec2-instance/.gitattributes +++ /dev/null @@ -1,23 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -*.snap linguist-generated -/.eslintrc.json linguist-generated -/.gitattributes linguist-generated -/.github/pull_request_template.md linguist-generated -/.github/workflows/build.yml linguist-generated -/.github/workflows/pull-request-lint.yml linguist-generated -/.github/workflows/upgrade.yml linguist-generated -/.gitignore linguist-generated -/.mergify.yml linguist-generated -/.npmignore linguist-generated -/.npmrc linguist-generated -/.projen/** linguist-generated -/.projen/deps.json linguist-generated -/.projen/files.json linguist-generated -/.projen/tasks.json linguist-generated -/cdk.json linguist-generated -/LICENSE linguist-generated -/package.json linguist-generated -/tsconfig.dev.json linguist-generated -/tsconfig.json linguist-generated -/yarn.lock linguist-generated \ No newline at end of file diff --git a/typescript/ec2-instance/.github/pull_request_template.md b/typescript/ec2-instance/.github/pull_request_template.md deleted file mode 100644 index 11d479bcae..0000000000 --- a/typescript/ec2-instance/.github/pull_request_template.md +++ /dev/null @@ -1 +0,0 @@ -Fixes # \ No newline at end of file diff --git a/typescript/ec2-instance/.github/workflows/build.yml b/typescript/ec2-instance/.github/workflows/build.yml deleted file mode 100644 index 574ad74475..0000000000 --- a/typescript/ec2-instance/.github/workflows/build.yml +++ /dev/null @@ -1,73 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -name: build -on: - pull_request: {} - workflow_dispatch: {} -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: write - outputs: - self_mutation_happened: ${{ steps.self_mutation.outputs.self_mutation_happened }} - env: - CI: "true" - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} - - name: Install dependencies - run: yarn install --check-files - - name: build - run: npx projen build - - name: Find mutations - id: self_mutation - run: |- - git add . - git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT - - name: Upload patch - if: steps.self_mutation.outputs.self_mutation_happened - uses: actions/upload-artifact@v3 - with: - name: .repo.patch - path: .repo.patch - - name: Fail build on mutation - if: steps.self_mutation.outputs.self_mutation_happened - run: |- - echo "::error::Files were changed during build (see build log). If this was triggered from a fork, you will need to update your branch." - cat .repo.patch - exit 1 - self-mutation: - needs: build - runs-on: ubuntu-latest - permissions: - contents: write - if: always() && needs.build.outputs.self_mutation_happened && !(github.event.pull_request.head.repo.full_name != github.repository) - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} - - name: Download patch - uses: actions/download-artifact@v3 - with: - name: .repo.patch - path: ${{ runner.temp }} - - name: Apply patch - run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Push changes - env: - PULL_REQUEST_REF: ${{ github.event.pull_request.head.ref }} - run: |- - git add . - git commit -s -m "chore: self mutation" - git push origin HEAD:$PULL_REQUEST_REF diff --git a/typescript/ec2-instance/.github/workflows/pull-request-lint.yml b/typescript/ec2-instance/.github/workflows/pull-request-lint.yml deleted file mode 100644 index 6758951b5f..0000000000 --- a/typescript/ec2-instance/.github/workflows/pull-request-lint.yml +++ /dev/null @@ -1,29 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -name: pull-request-lint -on: - pull_request_target: - types: - - labeled - - opened - - synchronize - - reopened - - ready_for_review - - edited -jobs: - validate: - name: Validate PR title - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - uses: amannn/action-semantic-pull-request@v5.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - types: |- - feat - fix - chore - requireScope: false - githubBaseUrl: ${{ github.api_url }} diff --git a/typescript/ec2-instance/.github/workflows/upgrade.yml b/typescript/ec2-instance/.github/workflows/upgrade.yml deleted file mode 100644 index cb5ff07110..0000000000 --- a/typescript/ec2-instance/.github/workflows/upgrade.yml +++ /dev/null @@ -1,83 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -name: upgrade -on: - workflow_dispatch: {} - schedule: - - cron: 0 0 * * * -jobs: - upgrade: - name: Upgrade - runs-on: ubuntu-latest - permissions: - contents: read - outputs: - patch_created: ${{ steps.create_patch.outputs.patch_created }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install dependencies - run: yarn install --check-files --frozen-lockfile - - name: Upgrade dependencies - run: npx projen upgrade - - name: Find mutations - id: create_patch - run: |- - git add . - git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT - - name: Upload patch - if: steps.create_patch.outputs.patch_created - uses: actions/upload-artifact@v3 - with: - name: .repo.patch - path: .repo.patch - pr: - name: Create Pull Request - needs: upgrade - runs-on: ubuntu-latest - permissions: - contents: read - if: ${{ needs.upgrade.outputs.patch_created }} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: {} - - name: Download patch - uses: actions/download-artifact@v3 - with: - name: .repo.patch - path: ${{ runner.temp }} - - name: Apply patch - run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Create Pull Request - id: create-pr - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - commit-message: |- - chore(deps): upgrade dependencies - - Upgrades project dependencies. See details in [workflow run]. - - [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - ------ - - *Automatically created by projen via the "upgrade" workflow* - branch: github-actions/upgrade - title: "chore(deps): upgrade dependencies" - body: |- - Upgrades project dependencies. See details in [workflow run]. - - [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - ------ - - *Automatically created by projen via the "upgrade" workflow* - author: github-actions - committer: github-actions - signoff: true diff --git a/typescript/ec2-instance/.gitignore b/typescript/ec2-instance/.gitignore deleted file mode 100644 index aa5c82deaf..0000000000 --- a/typescript/ec2-instance/.gitignore +++ /dev/null @@ -1,58 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -!/.gitattributes -!/.projen/tasks.json -!/.projen/deps.json -!/.projen/files.json -!/.github/workflows/pull-request-lint.yml -!/package.json -!/LICENSE -!/.npmignore -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json -pids -*.pid -*.seed -*.pid.lock -lib-cov -coverage -*.lcov -.nyc_output -build/Release -node_modules/ -jspm_packages/ -*.tsbuildinfo -.eslintcache -*.tgz -.yarn-integrity -.cache -!/.projenrc.js -/test-reports/ -junit.xml -/coverage/ -!/.github/workflows/build.yml -!/.mergify.yml -!/.github/workflows/upgrade.yml -!/.github/pull_request_template.md -!/.npmrc -!/test/ -!/tsconfig.json -!/tsconfig.dev.json -!/src/ -/lib -/dist/ -!/.eslintrc.json -/assets/ -!/cdk.json -/cdk.out/ -.cdk.staging/ -.parcel-cache/ -cdk.out -cdk.context.json -yarn-error.log -dependabot.yml -.DS_Store diff --git a/typescript/ec2-instance/.mergify.yml b/typescript/ec2-instance/.mergify.yml deleted file mode 100644 index d0f90113d9..0000000000 --- a/typescript/ec2-instance/.mergify.yml +++ /dev/null @@ -1,24 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -queue_rules: - - name: default - update_method: merge - conditions: - - "#approved-reviews-by>=1" - - -label~=(do-not-merge) - - status-success=build -pull_request_rules: - - name: Automatic merge on approval and successful build - actions: - delete_head_branch: {} - queue: - method: squash - name: default - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} - conditions: - - "#approved-reviews-by>=1" - - -label~=(do-not-merge) - - status-success=build diff --git a/typescript/ec2-instance/.projen/deps.json b/typescript/ec2-instance/.projen/deps.json deleted file mode 100644 index 5fe1e1397f..0000000000 --- a/typescript/ec2-instance/.projen/deps.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "dependencies": [ - { - "name": "@types/jest", - "type": "build" - }, - { - "name": "@types/node", - "version": "^16", - "type": "build" - }, - { - "name": "@typescript-eslint/eslint-plugin", - "version": "^5", - "type": "build" - }, - { - "name": "@typescript-eslint/parser", - "version": "^5", - "type": "build" - }, - { - "name": "aws-cdk", - "version": "^2.83.0", - "type": "build" - }, - { - "name": "esbuild", - "type": "build" - }, - { - "name": "eslint-import-resolver-node", - "type": "build" - }, - { - "name": "eslint-import-resolver-typescript", - "type": "build" - }, - { - "name": "eslint-plugin-import", - "type": "build" - }, - { - "name": "eslint", - "version": "^8", - "type": "build" - }, - { - "name": "jest", - "type": "build" - }, - { - "name": "jest-junit", - "version": "^15", - "type": "build" - }, - { - "name": "npm-check-updates", - "version": "^16", - "type": "build" - }, - { - "name": "projen", - "type": "build" - }, - { - "name": "ts-jest", - "type": "build" - }, - { - "name": "ts-node", - "type": "build" - }, - { - "name": "typescript", - "type": "build" - }, - { - "name": "aws-cdk-lib", - "version": "^2.83.0", - "type": "runtime" - }, - { - "name": "constructs", - "version": "^10.0.5", - "type": "runtime" - }, - { - "name": "dotenv", - "type": "runtime" - } - ], - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/typescript/ec2-instance/.projen/files.json b/typescript/ec2-instance/.projen/files.json deleted file mode 100644 index ce0b501142..0000000000 --- a/typescript/ec2-instance/.projen/files.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "files": [ - ".eslintrc.json", - ".gitattributes", - ".github/pull_request_template.md", - ".github/workflows/build.yml", - ".github/workflows/pull-request-lint.yml", - ".github/workflows/upgrade.yml", - ".gitignore", - ".mergify.yml", - ".npmignore", - ".npmrc", - ".projen/deps.json", - ".projen/files.json", - ".projen/tasks.json", - "cdk.json", - "LICENSE", - "tsconfig.dev.json", - "tsconfig.json" - ], - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/typescript/ec2-instance/.projen/tasks.json b/typescript/ec2-instance/.projen/tasks.json deleted file mode 100644 index eb86dc14f1..0000000000 --- a/typescript/ec2-instance/.projen/tasks.json +++ /dev/null @@ -1,269 +0,0 @@ -{ - "tasks": { - "build": { - "name": "build", - "description": "Full release build", - "steps": [ - { - "spawn": "default" - }, - { - "spawn": "pre-compile" - }, - { - "spawn": "compile" - }, - { - "spawn": "post-compile" - }, - { - "spawn": "test" - }, - { - "spawn": "package" - } - ] - }, - "bundle": { - "name": "bundle", - "description": "Prepare assets" - }, - "clobber": { - "name": "clobber", - "description": "hard resets to HEAD of origin and cleans the local repo", - "env": { - "BRANCH": "$(git branch --show-current)" - }, - "steps": [ - { - "exec": "git checkout -b scratch", - "name": "save current HEAD in \"scratch\" branch" - }, - { - "exec": "git checkout $BRANCH" - }, - { - "exec": "git fetch origin", - "name": "fetch latest changes from origin" - }, - { - "exec": "git reset --hard origin/$BRANCH", - "name": "hard reset to origin commit" - }, - { - "exec": "git clean -fdx", - "name": "clean all untracked files" - }, - { - "say": "ready to rock! (unpushed commits are under the \"scratch\" branch)" - } - ], - "condition": "git diff --exit-code > /dev/null" - }, - "compile": { - "name": "compile", - "description": "Only compile" - }, - "default": { - "name": "default", - "description": "Synthesize project files", - "steps": [ - { - "exec": "node .projenrc.js" - } - ] - }, - "deploy": { - "name": "deploy", - "description": "Deploys your CDK app to the AWS cloud", - "steps": [ - { - "exec": "cdk deploy", - "receiveArgs": true - } - ] - }, - "destroy": { - "name": "destroy", - "description": "Destroys your cdk app in the AWS cloud", - "steps": [ - { - "exec": "cdk destroy", - "receiveArgs": true - } - ] - }, - "diff": { - "name": "diff", - "description": "Diffs the currently deployed app against your code", - "steps": [ - { - "exec": "cdk diff" - } - ] - }, - "eject": { - "name": "eject", - "description": "Remove projen from the project", - "env": { - "PROJEN_EJECTING": "true" - }, - "steps": [ - { - "spawn": "default" - } - ] - }, - "eslint": { - "name": "eslint", - "description": "Runs eslint against the codebase", - "steps": [ - { - "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools .projenrc.js" - } - ] - }, - "install": { - "name": "install", - "description": "Install project dependencies and update lockfile (non-frozen)", - "steps": [ - { - "exec": "yarn install --check-files" - } - ] - }, - "install:ci": { - "name": "install:ci", - "description": "Install project dependencies using frozen lockfile", - "steps": [ - { - "exec": "yarn install --check-files --frozen-lockfile" - } - ] - }, - "launch": { - "name": "launch", - "steps": [ - { - "exec": "yarn && yarn projen && yarn build && yarn cdk bootstrap && yarn cdk deploy --require-approval never" - } - ] - }, - "package": { - "name": "package", - "description": "Creates the distribution package" - }, - "post-compile": { - "name": "post-compile", - "description": "Runs after successful compilation", - "steps": [ - { - "spawn": "synth:silent" - } - ] - }, - "post-upgrade": { - "name": "post-upgrade", - "description": "Runs after upgrading dependencies" - }, - "pre-compile": { - "name": "pre-compile", - "description": "Prepare the project for compilation" - }, - "synth": { - "name": "synth", - "description": "Synthesizes your cdk app into cdk.out", - "steps": [ - { - "exec": "cdk synth" - } - ] - }, - "synth:silent": { - "name": "synth:silent", - "description": "Synthesizes your cdk app into cdk.out and suppresses the template in stdout (part of \"yarn build\")", - "steps": [ - { - "exec": "cdk synth -q" - } - ] - }, - "test": { - "name": "test", - "description": "Run tests", - "steps": [ - { - "exec": "jest --passWithNoTests --updateSnapshot", - "receiveArgs": true - }, - { - "spawn": "eslint" - } - ] - }, - "test:watch": { - "name": "test:watch", - "description": "Run jest in watch mode", - "steps": [ - { - "exec": "jest --watch" - } - ] - }, - "upgrade": { - "name": "upgrade", - "description": "upgrade dependencies", - "env": { - "CI": "0" - }, - "steps": [ - { - "exec": "yarn upgrade npm-check-updates" - }, - { - "exec": "npm-check-updates --dep dev --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor" - }, - { - "exec": "yarn install --check-files" - }, - { - "exec": "yarn upgrade @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk esbuild eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit npm-check-updates projen ts-jest ts-node typescript aws-cdk-lib constructs dotenv" - }, - { - "exec": "npx projen" - }, - { - "spawn": "post-upgrade" - } - ] - }, - "watch": { - "name": "watch", - "description": "Watches changes in your source code and rebuilds and deploys to the current account", - "steps": [ - { - "exec": "cdk deploy --hotswap" - }, - { - "exec": "cdk watch" - } - ] - } - }, - "env": { - "PATH": "$(npx -c \"node --print process.env.PATH\")" - }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/typescript/ec2-instance/.projenrc.js b/typescript/ec2-instance/.projenrc.js deleted file mode 100644 index b9dae9e1ef..0000000000 --- a/typescript/ec2-instance/.projenrc.js +++ /dev/null @@ -1,27 +0,0 @@ -const { awscdk } = require('projen'); -const project = new awscdk.AwsCdkTypeScriptApp({ - cdkVersion: '2.83.0', - license: 'MIT-0', - author: 'Court Schuett', - copyrightOwner: 'Amazon.com, Inc.', - authorAddress: 'https://aws.amazon.com', - appEntrypoint: 'ec2-instance.ts', - name: 'ec2-instance', - eslintOptions: { ignorePatterns: ['resources/**'] }, - devDeps: ['esbuild'], - defaultReleaseBranch: 'master', - deps: ['dotenv'], -}); - -const common_exclude = [ - 'cdk.out', - 'cdk.context.json', - 'yarn-error.log', - 'dependabot.yml', - '.DS_Store', -]; -project.addTask('launch', { - exec: 'yarn && yarn projen && yarn build && yarn cdk bootstrap && yarn cdk deploy --require-approval never', -}); -project.gitignore.exclude(...common_exclude); -project.synth(); diff --git a/typescript/ec2-instance/cdk.json b/typescript/ec2-instance/cdk.json index e1f07214b7..c35feae3c7 100644 --- a/typescript/ec2-instance/cdk.json +++ b/typescript/ec2-instance/cdk.json @@ -1,11 +1,8 @@ { - "app": "npx ts-node -P tsconfig.json --prefer-ts-exts src/ec2-instance.ts", - "output": "cdk.out", - "build": "npx projen bundle", + "app": "npx ts-node --prefer-ts-exts src/ec2-instance.ts", "watch": { "include": [ - "src/**/*.ts", - "test/**/*.ts" + "**" ], "exclude": [ "README.md", @@ -15,8 +12,40 @@ "tsconfig.json", "package*.json", "yarn.lock", - "node_modules" + "node_modules", + "test" ] }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} + "context": { + "@aws-cdk/aws-lambda:recognizeLayerVersion": true, + "@aws-cdk/core:checkSecretUsage": true, + "@aws-cdk/core:target-partitions": [ + "aws", + "aws-cn" + ], + "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true, + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true, + "@aws-cdk/aws-iam:minimizePolicies": true, + "@aws-cdk/core:validateSnapshotRemovalPolicy": true, + "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true, + "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true, + "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true, + "@aws-cdk/aws-apigateway:disableCloudWatchRole": true, + "@aws-cdk/core:enablePartitionLiterals": true, + "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true, + "@aws-cdk/aws-iam:standardizedServicePrincipals": true, + "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true, + "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true, + "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true, + "@aws-cdk/aws-route53-patters:useCertificate": true, + "@aws-cdk/customresources:installLatestAwsSdkDefault": false, + "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true, + "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true, + "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true, + "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true, + "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true, + "@aws-cdk/aws-redshift:columnId": true, + "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true + } +} \ No newline at end of file diff --git a/typescript/ec2-instance/package.json b/typescript/ec2-instance/package.json index 7f9051a6f9..3b11025568 100644 --- a/typescript/ec2-instance/package.json +++ b/typescript/ec2-instance/package.json @@ -1,94 +1,32 @@ { "name": "ec2-instance", + "version": "0.0.0", "scripts": { - "build": "npx projen build", - "bundle": "npx projen bundle", - "clobber": "npx projen clobber", - "compile": "npx projen compile", - "default": "npx projen default", - "deploy": "npx projen deploy", - "destroy": "npx projen destroy", - "diff": "npx projen diff", - "eject": "npx projen eject", - "eslint": "npx projen eslint", - "launch": "npx projen launch", - "package": "npx projen package", - "post-compile": "npx projen post-compile", - "post-upgrade": "npx projen post-upgrade", - "pre-compile": "npx projen pre-compile", - "synth": "npx projen synth", - "synth:silent": "npx projen synth:silent", - "test": "npx projen test", - "test:watch": "npx projen test:watch", - "upgrade": "npx projen upgrade", - "watch": "npx projen watch", - "projen": "npx projen" + "build": "tsc", + "watch": "tsc -w", + "test": "jest", + "cdk": "cdk" }, "devDependencies": { "@types/jest": "^29.5.14", - "@types/node": "22.7.9", + "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "aws-cdk": "2.1004.0", - "esbuild": "^0.18.17", + "aws-cdk": "^2.83.0", "eslint": "^8", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.28.0", "jest": "^29.7.0", "jest-junit": "^15", - "npm-check-updates": "^16", - "projen": "^0.71.158", "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "~5.6.3" }, "dependencies": { - "aws-cdk-lib": "2.185.0", - "constructs": "^10.0.0", + "aws-cdk-lib": "^2.83.0", + "constructs": "^10.0.5", "dotenv": "^16.3.1" }, - "license": "MIT-0", - "version": "0.0.0", - "jest": { - "testMatch": [ - "/src/**/__tests__/**/*.ts?(x)", - "/(test|src)/**/*(*.)@(spec|test).ts?(x)" - ], - "clearMocks": true, - "collectCoverage": true, - "coverageReporters": [ - "json", - "lcov", - "clover", - "cobertura", - "text" - ], - "coverageDirectory": "coverage", - "coveragePathIgnorePatterns": [ - "/node_modules/" - ], - "testPathIgnorePatterns": [ - "/node_modules/" - ], - "watchPathIgnorePatterns": [ - "/node_modules/" - ], - "reporters": [ - "default", - [ - "jest-junit", - { - "outputDirectory": "test-reports" - } - ] - ], - "preset": "ts-jest", - "globals": { - "ts-jest": { - "tsconfig": "tsconfig.dev.json" - } - } - }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." + "license": "MIT-0" } diff --git a/typescript/ec2-instance/test-reports/junit.xml b/typescript/ec2-instance/test-reports/junit.xml new file mode 100644 index 0000000000..52c0568337 --- /dev/null +++ b/typescript/ec2-instance/test-reports/junit.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/typescript/ec2-instance/tsconfig.json b/typescript/ec2-instance/tsconfig.json index c96331d0d5..130298dff5 100644 --- a/typescript/ec2-instance/tsconfig.json +++ b/typescript/ec2-instance/tsconfig.json @@ -1,36 +1,25 @@ -// ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". { "compilerOptions": { - "rootDir": "src", - "outDir": "lib", - "alwaysStrict": true, + "target": "ES2018", + "module": "commonjs", + "lib": ["es2018"], "declaration": true, - "esModuleInterop": true, - "experimentalDecorators": true, - "inlineSourceMap": true, - "inlineSources": true, - "lib": [ - "es2019" - ], - "module": "CommonJS", - "noEmitOnError": false, - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "resolveJsonModule": true, "strict": true, + "noImplicitAny": true, "strictNullChecks": true, - "strictPropertyInitialization": true, - "stripInternal": true, - "target": "ES2019" + "noImplicitThis": true, + "alwaysStrict": true, + "noUnusedLocals": false, + "noUnusedParameters": false, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": false, + "inlineSourceMap": true, + "inlineSources": true, + "experimentalDecorators": true, + "strictPropertyInitialization": false, + "typeRoots": ["./node_modules/@types"], + "outDir": "dist", + "rootDir": "src" }, - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "cdk.out" - ] + "exclude": ["node_modules", "cdk.out", "dist"] } diff --git a/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap index 83cd46def2..2ab2c3128c 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -125,6 +146,7 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resource "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", + "MemorySize": 512, "Role": { "Fn::GetAtt": [ "Inspector2EnableDelegatedAdminAccountResourceInspector2EnableResourceInspectorRole00253606", @@ -133,7 +155,7 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resource }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap index eecfddd703..344719a8c7 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -125,6 +146,7 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", + "MemorySize": 512, "Role": { "Fn::GetAtt": [ "EnableInspector2ResourceInspectorRole75753456", @@ -133,7 +155,7 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, @@ -247,13 +269,14 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, "value", ], }, + "Timeout": 900, }, "Type": "AWS::Lambda::Function", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap index c5b7b1874b..3cc0676b27 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -124,10 +145,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, - "Environment": { - "Variables": { - "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", - }, }, "Handler": "index.handler", "Role": { @@ -206,10 +223,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, - "Environment": { - "Variables": { - "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", - }, }, "Handler": "index.handler", "Role": { @@ -396,7 +409,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", { "Ref": "AWS::Region", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap index ad94afa11f..4c1fc162ee 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -125,6 +146,7 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required reso "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", + "MemorySize": 512, "Role": { "Fn::GetAtt": [ "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2", @@ -133,7 +155,7 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required reso }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, From c9e444817f30e91d795edf7f8a78b03e4cb4e8c7 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 18:55:34 -0500 Subject: [PATCH 03/16] Fix api-gateway-lambda-token-authorizer --- .../test/stack/gateway-lambda-auth-stack.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts b/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts index 75e4f0bb21..5b9206c593 100644 --- a/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts +++ b/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts @@ -9,11 +9,10 @@ describe('Snapshot', () => { const app = new App(); const stack = new GatewayLambdaAuth(app, 'test-api-gateway-lambda-auth'); const template = Template.fromStack(stack); - + // Normalize the template before snapshot comparison const normalizedTemplate = normalizeTemplate(template.toJSON()); expect(normalizedTemplate).toMatchSnapshot(); }); - }) From 8a14b0b5b6e05cb842343603abc36388ff8ccaf6 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 19:05:54 -0500 Subject: [PATCH 04/16] Fix snapshot tests by normalizing asset hashes --- .../stack/gateway-lambda-auth-stack.test.ts | 2 +- .../jest.config.js | 8 +++ .../test/integ.default.test.ts | 5 +- .../tsconfig.json | 49 +++++++------------ typescript/ec2-instance/jest.config.js | 8 +++ typescript/ec2-instance/test/main.test.ts | 4 +- ...nspector2-monitoring-resource.test.ts.snap | 2 - 7 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 typescript/ec2-instance-connect-endpoint/jest.config.js create mode 100644 typescript/ec2-instance/jest.config.js diff --git a/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts b/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts index 5b9206c593..e83843cbf2 100644 --- a/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts +++ b/typescript/api-gateway-lambda-token-authorizer/test/stack/gateway-lambda-auth-stack.test.ts @@ -9,10 +9,10 @@ describe('Snapshot', () => { const app = new App(); const stack = new GatewayLambdaAuth(app, 'test-api-gateway-lambda-auth'); const template = Template.fromStack(stack); - // Normalize the template before snapshot comparison const normalizedTemplate = normalizeTemplate(template.toJSON()); expect(normalizedTemplate).toMatchSnapshot(); }); + }) diff --git a/typescript/ec2-instance-connect-endpoint/jest.config.js b/typescript/ec2-instance-connect-endpoint/jest.config.js new file mode 100644 index 0000000000..08263b8954 --- /dev/null +++ b/typescript/ec2-instance-connect-endpoint/jest.config.js @@ -0,0 +1,8 @@ +module.exports = { + testEnvironment: 'node', + roots: ['/test'], + testMatch: ['**/*.test.ts'], + transform: { + '^.+\\.tsx?$': 'ts-jest' + } +}; diff --git a/typescript/ec2-instance-connect-endpoint/test/integ.default.test.ts b/typescript/ec2-instance-connect-endpoint/test/integ.default.test.ts index 4cf3af447a..5350884124 100644 --- a/typescript/ec2-instance-connect-endpoint/test/integ.default.test.ts +++ b/typescript/ec2-instance-connect-endpoint/test/integ.default.test.ts @@ -1,11 +1,14 @@ import { Template } from 'aws-cdk-lib/assertions'; import { IntegTesting } from '../src/integ.default'; +import { normalizeTemplate } from '../../test-utils/normalize-template'; test('default validation', () => { const integ = new IntegTesting(); integ.stack.forEach(stack => { const t = Template.fromStack(stack); + // Normalize the template before snapshot comparison + const normalizedTemplate = normalizeTemplate(t.toJSON()); // should match snapshot - expect(t).toMatchSnapshot(); + expect(normalizedTemplate).toMatchSnapshot(); }); }); \ No newline at end of file diff --git a/typescript/ec2-instance-connect-endpoint/tsconfig.json b/typescript/ec2-instance-connect-endpoint/tsconfig.json index 93d89c09f9..dc6a7b03f6 100644 --- a/typescript/ec2-instance-connect-endpoint/tsconfig.json +++ b/typescript/ec2-instance-connect-endpoint/tsconfig.json @@ -1,39 +1,24 @@ { "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - "declarationMap": false, - "inlineSourceMap": true, - "inlineSources": true, - "alwaysStrict": true, + "target": "ES2018", + "module": "commonjs", + "lib": ["es2018"], "declaration": true, - "experimentalDecorators": true, - "incremental": true, - "lib": [ - "es2020" - ], - "module": "CommonJS", - "noEmitOnError": true, - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "resolveJsonModule": true, - "skipLibCheck": true, "strict": true, + "noImplicitAny": true, "strictNullChecks": true, - "strictPropertyInitialization": true, - "stripInternal": false, - "target": "ES2020", - "composite": false, - "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo" + "noImplicitThis": true, + "alwaysStrict": true, + "noUnusedLocals": false, + "noUnusedParameters": false, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": false, + "inlineSourceMap": true, + "inlineSources": true, + "experimentalDecorators": true, + "strictPropertyInitialization": false, + "typeRoots": ["./node_modules/@types"], + "outDir": "dist" }, - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "node_modules" - ] + "exclude": ["node_modules", "cdk.out"] } diff --git a/typescript/ec2-instance/jest.config.js b/typescript/ec2-instance/jest.config.js new file mode 100644 index 0000000000..08263b8954 --- /dev/null +++ b/typescript/ec2-instance/jest.config.js @@ -0,0 +1,8 @@ +module.exports = { + testEnvironment: 'node', + roots: ['/test'], + testMatch: ['**/*.test.ts'], + transform: { + '^.+\\.tsx?$': 'ts-jest' + } +}; diff --git a/typescript/ec2-instance/test/main.test.ts b/typescript/ec2-instance/test/main.test.ts index f07b6e448b..88021b5aea 100644 --- a/typescript/ec2-instance/test/main.test.ts +++ b/typescript/ec2-instance/test/main.test.ts @@ -2,6 +2,7 @@ import { App, Stack } from 'aws-cdk-lib'; import { Template } from 'aws-cdk-lib/assertions'; import { EC2Example } from '../src/ec2-instance'; import { InstanceSize, CPUTypes } from '../src/envValidator'; +import { normalizeTemplate } from '../../test-utils/normalize-template'; const devEnv = { account: process.env.CDK_DEFAULT_ACCOUNT, @@ -28,7 +29,8 @@ test('Snapshot', () => { }); const template = Template.fromStack(stack); - expect(template.toJSON()).toMatchSnapshot(); + const normalizedTemplate = normalizeTemplate(template.toJSON()); + expect(normalizedTemplate).toMatchSnapshot(); }); test('LARGE', () => { diff --git a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap index 3cc0676b27..87700fd7e1 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap @@ -145,7 +145,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, - }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ @@ -223,7 +222,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, - }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ From 8195cb34b94cb71d5a44cd09d28b90a4122006dc Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 20:14:48 -0500 Subject: [PATCH 05/16] Fix build-pull-request to display errors --- .github/workflows/build-pull-request.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index e7c3f4c9cc..d7c629076c 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -46,7 +46,6 @@ jobs: # Create a temporary directory for build logs mkdir -p /tmp/build_logs npm install -g eslint > /dev/null - # Function to build a single file build_file() { echo "Build File $1" @@ -63,6 +62,7 @@ jobs: echo "Build Path $file" # Run the build script for the current language, passing the project directory and extra path +<<<<<<< HEAD echo "::group::Building $file" # Run the build command and capture output to both the log file and stdout ../scripts/build-${language}.sh "$file" 2>&1 | tee "$log_file" @@ -70,17 +70,17 @@ jobs: if [ $exit_code -eq 0 ]; then echo "✅ Build succeeded for $file" - + # Clean up node_modules and cdk.out for this project immediately after successful build echo "Cleaning up build artifacts for $(dirname "$file")" local project_dir=$(dirname "$file") - + # Remove node_modules directory if it exists if [ -d "$project_dir/node_modules" ]; then echo "Removing $project_dir/node_modules" rm -rf "$project_dir/node_modules" fi - + # Remove cdk.out directory if it exists if [ -d "$project_dir/cdk.out" ]; then echo "Removing $project_dir/cdk.out" @@ -89,6 +89,20 @@ jobs: else echo "❌ Build failed for $file with exit code $exit_code" echo "::error::Build failed for $file with exit code $exit_code" +======= + echo "::group::$file" + if ../scripts/build-${language}.sh "$file" > "$log_file" 2>&1; then + echo "::endgroup::" + return 0 + else + local exit_code=$? + echo "::endgroup::" + echo "::group::Error details for $file" + cat "$log_file" + echo "::endgroup::" + echo "::error::Build failed for $file with exit code $exit_code" + return $exit_code +>>>>>>> 0eba763 (Fix build-pull-request to display errors) fi echo "::endgroup::" return $exit_code From d52759e98db651ce593d80f315bf27a28b7b29d1 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 20:15:04 -0500 Subject: [PATCH 06/16] Fix build-pull-request to display errors --- .github/workflows/build-pull-request.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index d7c629076c..454ea891cb 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -62,7 +62,6 @@ jobs: echo "Build Path $file" # Run the build script for the current language, passing the project directory and extra path -<<<<<<< HEAD echo "::group::Building $file" # Run the build command and capture output to both the log file and stdout ../scripts/build-${language}.sh "$file" 2>&1 | tee "$log_file" @@ -89,20 +88,6 @@ jobs: else echo "❌ Build failed for $file with exit code $exit_code" echo "::error::Build failed for $file with exit code $exit_code" -======= - echo "::group::$file" - if ../scripts/build-${language}.sh "$file" > "$log_file" 2>&1; then - echo "::endgroup::" - return 0 - else - local exit_code=$? - echo "::endgroup::" - echo "::group::Error details for $file" - cat "$log_file" - echo "::endgroup::" - echo "::error::Build failed for $file with exit code $exit_code" - return $exit_code ->>>>>>> 0eba763 (Fix build-pull-request to display errors) fi echo "::endgroup::" return $exit_code From 002bf49388ef2c2aaacf4eb29a9815b73c6742fb Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 20:26:53 -0500 Subject: [PATCH 07/16] Ignore this project for right now --- typescript/ec2-instance/.gitattributes | 23 ++ .../.github/pull_request_template.md | 1 + .../ec2-instance/.github/workflows/build.yml | 73 +++++ .../.github/workflows/pull-request-lint.yml | 29 ++ .../.github/workflows/upgrade.yml | 83 ++++++ typescript/ec2-instance/.gitignore | 58 ++++ typescript/ec2-instance/.mergify.yml | 24 ++ typescript/ec2-instance/.projen/deps.json | 94 ++++++ typescript/ec2-instance/.projen/files.json | 22 ++ typescript/ec2-instance/.projen/tasks.json | 269 ++++++++++++++++++ typescript/ec2-instance/.projenrc.js | 27 ++ typescript/ec2-instance/cdk.json | 45 +-- typescript/ec2-instance/package.json | 84 +++++- typescript/ec2-instance/test/main.test.ts | 4 +- typescript/ec2-instance/tsconfig.dev.json | 36 +++ typescript/ec2-instance/tsconfig.json | 47 +-- 16 files changed, 850 insertions(+), 69 deletions(-) create mode 100644 typescript/ec2-instance/.gitattributes create mode 100644 typescript/ec2-instance/.github/pull_request_template.md create mode 100644 typescript/ec2-instance/.github/workflows/build.yml create mode 100644 typescript/ec2-instance/.github/workflows/pull-request-lint.yml create mode 100644 typescript/ec2-instance/.github/workflows/upgrade.yml create mode 100644 typescript/ec2-instance/.gitignore create mode 100644 typescript/ec2-instance/.mergify.yml create mode 100644 typescript/ec2-instance/.projen/deps.json create mode 100644 typescript/ec2-instance/.projen/files.json create mode 100644 typescript/ec2-instance/.projen/tasks.json create mode 100644 typescript/ec2-instance/.projenrc.js create mode 100644 typescript/ec2-instance/tsconfig.dev.json diff --git a/typescript/ec2-instance/.gitattributes b/typescript/ec2-instance/.gitattributes new file mode 100644 index 0000000000..37f8188eea --- /dev/null +++ b/typescript/ec2-instance/.gitattributes @@ -0,0 +1,23 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +*.snap linguist-generated +/.eslintrc.json linguist-generated +/.gitattributes linguist-generated +/.github/pull_request_template.md linguist-generated +/.github/workflows/build.yml linguist-generated +/.github/workflows/pull-request-lint.yml linguist-generated +/.github/workflows/upgrade.yml linguist-generated +/.gitignore linguist-generated +/.mergify.yml linguist-generated +/.npmignore linguist-generated +/.npmrc linguist-generated +/.projen/** linguist-generated +/.projen/deps.json linguist-generated +/.projen/files.json linguist-generated +/.projen/tasks.json linguist-generated +/cdk.json linguist-generated +/LICENSE linguist-generated +/package.json linguist-generated +/tsconfig.dev.json linguist-generated +/tsconfig.json linguist-generated +/yarn.lock linguist-generated \ No newline at end of file diff --git a/typescript/ec2-instance/.github/pull_request_template.md b/typescript/ec2-instance/.github/pull_request_template.md new file mode 100644 index 0000000000..11d479bcae --- /dev/null +++ b/typescript/ec2-instance/.github/pull_request_template.md @@ -0,0 +1 @@ +Fixes # \ No newline at end of file diff --git a/typescript/ec2-instance/.github/workflows/build.yml b/typescript/ec2-instance/.github/workflows/build.yml new file mode 100644 index 0000000000..574ad74475 --- /dev/null +++ b/typescript/ec2-instance/.github/workflows/build.yml @@ -0,0 +1,73 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +name: build +on: + pull_request: {} + workflow_dispatch: {} +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: write + outputs: + self_mutation_happened: ${{ steps.self_mutation.outputs.self_mutation_happened }} + env: + CI: "true" + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + - name: Install dependencies + run: yarn install --check-files + - name: build + run: npx projen build + - name: Find mutations + id: self_mutation + run: |- + git add . + git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + - name: Upload patch + if: steps.self_mutation.outputs.self_mutation_happened + uses: actions/upload-artifact@v3 + with: + name: .repo.patch + path: .repo.patch + - name: Fail build on mutation + if: steps.self_mutation.outputs.self_mutation_happened + run: |- + echo "::error::Files were changed during build (see build log). If this was triggered from a fork, you will need to update your branch." + cat .repo.patch + exit 1 + self-mutation: + needs: build + runs-on: ubuntu-latest + permissions: + contents: write + if: always() && needs.build.outputs.self_mutation_happened && !(github.event.pull_request.head.repo.full_name != github.repository) + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + - name: Download patch + uses: actions/download-artifact@v3 + with: + name: .repo.patch + path: ${{ runner.temp }} + - name: Apply patch + run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' + - name: Set git identity + run: |- + git config user.name "github-actions" + git config user.email "github-actions@github.com" + - name: Push changes + env: + PULL_REQUEST_REF: ${{ github.event.pull_request.head.ref }} + run: |- + git add . + git commit -s -m "chore: self mutation" + git push origin HEAD:$PULL_REQUEST_REF diff --git a/typescript/ec2-instance/.github/workflows/pull-request-lint.yml b/typescript/ec2-instance/.github/workflows/pull-request-lint.yml new file mode 100644 index 0000000000..6758951b5f --- /dev/null +++ b/typescript/ec2-instance/.github/workflows/pull-request-lint.yml @@ -0,0 +1,29 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +name: pull-request-lint +on: + pull_request_target: + types: + - labeled + - opened + - synchronize + - reopened + - ready_for_review + - edited +jobs: + validate: + name: Validate PR title + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - uses: amannn/action-semantic-pull-request@v5.0.2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + types: |- + feat + fix + chore + requireScope: false + githubBaseUrl: ${{ github.api_url }} diff --git a/typescript/ec2-instance/.github/workflows/upgrade.yml b/typescript/ec2-instance/.github/workflows/upgrade.yml new file mode 100644 index 0000000000..cb5ff07110 --- /dev/null +++ b/typescript/ec2-instance/.github/workflows/upgrade.yml @@ -0,0 +1,83 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +name: upgrade +on: + workflow_dispatch: {} + schedule: + - cron: 0 0 * * * +jobs: + upgrade: + name: Upgrade + runs-on: ubuntu-latest + permissions: + contents: read + outputs: + patch_created: ${{ steps.create_patch.outputs.patch_created }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install dependencies + run: yarn install --check-files --frozen-lockfile + - name: Upgrade dependencies + run: npx projen upgrade + - name: Find mutations + id: create_patch + run: |- + git add . + git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + - name: Upload patch + if: steps.create_patch.outputs.patch_created + uses: actions/upload-artifact@v3 + with: + name: .repo.patch + path: .repo.patch + pr: + name: Create Pull Request + needs: upgrade + runs-on: ubuntu-latest + permissions: + contents: read + if: ${{ needs.upgrade.outputs.patch_created }} + steps: + - name: Checkout + uses: actions/checkout@v3 + with: {} + - name: Download patch + uses: actions/download-artifact@v3 + with: + name: .repo.patch + path: ${{ runner.temp }} + - name: Apply patch + run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' + - name: Set git identity + run: |- + git config user.name "github-actions" + git config user.email "github-actions@github.com" + - name: Create Pull Request + id: create-pr + uses: peter-evans/create-pull-request@v4 + with: + token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + commit-message: |- + chore(deps): upgrade dependencies + + Upgrades project dependencies. See details in [workflow run]. + + [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + + ------ + + *Automatically created by projen via the "upgrade" workflow* + branch: github-actions/upgrade + title: "chore(deps): upgrade dependencies" + body: |- + Upgrades project dependencies. See details in [workflow run]. + + [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + + ------ + + *Automatically created by projen via the "upgrade" workflow* + author: github-actions + committer: github-actions + signoff: true diff --git a/typescript/ec2-instance/.gitignore b/typescript/ec2-instance/.gitignore new file mode 100644 index 0000000000..aa5c82deaf --- /dev/null +++ b/typescript/ec2-instance/.gitignore @@ -0,0 +1,58 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". +!/.gitattributes +!/.projen/tasks.json +!/.projen/deps.json +!/.projen/files.json +!/.github/workflows/pull-request-lint.yml +!/package.json +!/LICENSE +!/.npmignore +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json +pids +*.pid +*.seed +*.pid.lock +lib-cov +coverage +*.lcov +.nyc_output +build/Release +node_modules/ +jspm_packages/ +*.tsbuildinfo +.eslintcache +*.tgz +.yarn-integrity +.cache +!/.projenrc.js +/test-reports/ +junit.xml +/coverage/ +!/.github/workflows/build.yml +!/.mergify.yml +!/.github/workflows/upgrade.yml +!/.github/pull_request_template.md +!/.npmrc +!/test/ +!/tsconfig.json +!/tsconfig.dev.json +!/src/ +/lib +/dist/ +!/.eslintrc.json +/assets/ +!/cdk.json +/cdk.out/ +.cdk.staging/ +.parcel-cache/ +cdk.out +cdk.context.json +yarn-error.log +dependabot.yml +.DS_Store diff --git a/typescript/ec2-instance/.mergify.yml b/typescript/ec2-instance/.mergify.yml new file mode 100644 index 0000000000..d0f90113d9 --- /dev/null +++ b/typescript/ec2-instance/.mergify.yml @@ -0,0 +1,24 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +queue_rules: + - name: default + update_method: merge + conditions: + - "#approved-reviews-by>=1" + - -label~=(do-not-merge) + - status-success=build +pull_request_rules: + - name: Automatic merge on approval and successful build + actions: + delete_head_branch: {} + queue: + method: squash + name: default + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} + conditions: + - "#approved-reviews-by>=1" + - -label~=(do-not-merge) + - status-success=build diff --git a/typescript/ec2-instance/.projen/deps.json b/typescript/ec2-instance/.projen/deps.json new file mode 100644 index 0000000000..5fe1e1397f --- /dev/null +++ b/typescript/ec2-instance/.projen/deps.json @@ -0,0 +1,94 @@ +{ + "dependencies": [ + { + "name": "@types/jest", + "type": "build" + }, + { + "name": "@types/node", + "version": "^16", + "type": "build" + }, + { + "name": "@typescript-eslint/eslint-plugin", + "version": "^5", + "type": "build" + }, + { + "name": "@typescript-eslint/parser", + "version": "^5", + "type": "build" + }, + { + "name": "aws-cdk", + "version": "^2.83.0", + "type": "build" + }, + { + "name": "esbuild", + "type": "build" + }, + { + "name": "eslint-import-resolver-node", + "type": "build" + }, + { + "name": "eslint-import-resolver-typescript", + "type": "build" + }, + { + "name": "eslint-plugin-import", + "type": "build" + }, + { + "name": "eslint", + "version": "^8", + "type": "build" + }, + { + "name": "jest", + "type": "build" + }, + { + "name": "jest-junit", + "version": "^15", + "type": "build" + }, + { + "name": "npm-check-updates", + "version": "^16", + "type": "build" + }, + { + "name": "projen", + "type": "build" + }, + { + "name": "ts-jest", + "type": "build" + }, + { + "name": "ts-node", + "type": "build" + }, + { + "name": "typescript", + "type": "build" + }, + { + "name": "aws-cdk-lib", + "version": "^2.83.0", + "type": "runtime" + }, + { + "name": "constructs", + "version": "^10.0.5", + "type": "runtime" + }, + { + "name": "dotenv", + "type": "runtime" + } + ], + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." +} diff --git a/typescript/ec2-instance/.projen/files.json b/typescript/ec2-instance/.projen/files.json new file mode 100644 index 0000000000..ce0b501142 --- /dev/null +++ b/typescript/ec2-instance/.projen/files.json @@ -0,0 +1,22 @@ +{ + "files": [ + ".eslintrc.json", + ".gitattributes", + ".github/pull_request_template.md", + ".github/workflows/build.yml", + ".github/workflows/pull-request-lint.yml", + ".github/workflows/upgrade.yml", + ".gitignore", + ".mergify.yml", + ".npmignore", + ".npmrc", + ".projen/deps.json", + ".projen/files.json", + ".projen/tasks.json", + "cdk.json", + "LICENSE", + "tsconfig.dev.json", + "tsconfig.json" + ], + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." +} diff --git a/typescript/ec2-instance/.projen/tasks.json b/typescript/ec2-instance/.projen/tasks.json new file mode 100644 index 0000000000..eb86dc14f1 --- /dev/null +++ b/typescript/ec2-instance/.projen/tasks.json @@ -0,0 +1,269 @@ +{ + "tasks": { + "build": { + "name": "build", + "description": "Full release build", + "steps": [ + { + "spawn": "default" + }, + { + "spawn": "pre-compile" + }, + { + "spawn": "compile" + }, + { + "spawn": "post-compile" + }, + { + "spawn": "test" + }, + { + "spawn": "package" + } + ] + }, + "bundle": { + "name": "bundle", + "description": "Prepare assets" + }, + "clobber": { + "name": "clobber", + "description": "hard resets to HEAD of origin and cleans the local repo", + "env": { + "BRANCH": "$(git branch --show-current)" + }, + "steps": [ + { + "exec": "git checkout -b scratch", + "name": "save current HEAD in \"scratch\" branch" + }, + { + "exec": "git checkout $BRANCH" + }, + { + "exec": "git fetch origin", + "name": "fetch latest changes from origin" + }, + { + "exec": "git reset --hard origin/$BRANCH", + "name": "hard reset to origin commit" + }, + { + "exec": "git clean -fdx", + "name": "clean all untracked files" + }, + { + "say": "ready to rock! (unpushed commits are under the \"scratch\" branch)" + } + ], + "condition": "git diff --exit-code > /dev/null" + }, + "compile": { + "name": "compile", + "description": "Only compile" + }, + "default": { + "name": "default", + "description": "Synthesize project files", + "steps": [ + { + "exec": "node .projenrc.js" + } + ] + }, + "deploy": { + "name": "deploy", + "description": "Deploys your CDK app to the AWS cloud", + "steps": [ + { + "exec": "cdk deploy", + "receiveArgs": true + } + ] + }, + "destroy": { + "name": "destroy", + "description": "Destroys your cdk app in the AWS cloud", + "steps": [ + { + "exec": "cdk destroy", + "receiveArgs": true + } + ] + }, + "diff": { + "name": "diff", + "description": "Diffs the currently deployed app against your code", + "steps": [ + { + "exec": "cdk diff" + } + ] + }, + "eject": { + "name": "eject", + "description": "Remove projen from the project", + "env": { + "PROJEN_EJECTING": "true" + }, + "steps": [ + { + "spawn": "default" + } + ] + }, + "eslint": { + "name": "eslint", + "description": "Runs eslint against the codebase", + "steps": [ + { + "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools .projenrc.js" + } + ] + }, + "install": { + "name": "install", + "description": "Install project dependencies and update lockfile (non-frozen)", + "steps": [ + { + "exec": "yarn install --check-files" + } + ] + }, + "install:ci": { + "name": "install:ci", + "description": "Install project dependencies using frozen lockfile", + "steps": [ + { + "exec": "yarn install --check-files --frozen-lockfile" + } + ] + }, + "launch": { + "name": "launch", + "steps": [ + { + "exec": "yarn && yarn projen && yarn build && yarn cdk bootstrap && yarn cdk deploy --require-approval never" + } + ] + }, + "package": { + "name": "package", + "description": "Creates the distribution package" + }, + "post-compile": { + "name": "post-compile", + "description": "Runs after successful compilation", + "steps": [ + { + "spawn": "synth:silent" + } + ] + }, + "post-upgrade": { + "name": "post-upgrade", + "description": "Runs after upgrading dependencies" + }, + "pre-compile": { + "name": "pre-compile", + "description": "Prepare the project for compilation" + }, + "synth": { + "name": "synth", + "description": "Synthesizes your cdk app into cdk.out", + "steps": [ + { + "exec": "cdk synth" + } + ] + }, + "synth:silent": { + "name": "synth:silent", + "description": "Synthesizes your cdk app into cdk.out and suppresses the template in stdout (part of \"yarn build\")", + "steps": [ + { + "exec": "cdk synth -q" + } + ] + }, + "test": { + "name": "test", + "description": "Run tests", + "steps": [ + { + "exec": "jest --passWithNoTests --updateSnapshot", + "receiveArgs": true + }, + { + "spawn": "eslint" + } + ] + }, + "test:watch": { + "name": "test:watch", + "description": "Run jest in watch mode", + "steps": [ + { + "exec": "jest --watch" + } + ] + }, + "upgrade": { + "name": "upgrade", + "description": "upgrade dependencies", + "env": { + "CI": "0" + }, + "steps": [ + { + "exec": "yarn upgrade npm-check-updates" + }, + { + "exec": "npm-check-updates --dep dev --upgrade --target=minor" + }, + { + "exec": "npm-check-updates --dep bundle --upgrade --target=minor" + }, + { + "exec": "npm-check-updates --dep peer --upgrade --target=minor" + }, + { + "exec": "npm-check-updates --dep prod --upgrade --target=minor" + }, + { + "exec": "npm-check-updates --dep optional --upgrade --target=minor" + }, + { + "exec": "yarn install --check-files" + }, + { + "exec": "yarn upgrade @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk esbuild eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit npm-check-updates projen ts-jest ts-node typescript aws-cdk-lib constructs dotenv" + }, + { + "exec": "npx projen" + }, + { + "spawn": "post-upgrade" + } + ] + }, + "watch": { + "name": "watch", + "description": "Watches changes in your source code and rebuilds and deploys to the current account", + "steps": [ + { + "exec": "cdk deploy --hotswap" + }, + { + "exec": "cdk watch" + } + ] + } + }, + "env": { + "PATH": "$(npx -c \"node --print process.env.PATH\")" + }, + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." +} diff --git a/typescript/ec2-instance/.projenrc.js b/typescript/ec2-instance/.projenrc.js new file mode 100644 index 0000000000..b9dae9e1ef --- /dev/null +++ b/typescript/ec2-instance/.projenrc.js @@ -0,0 +1,27 @@ +const { awscdk } = require('projen'); +const project = new awscdk.AwsCdkTypeScriptApp({ + cdkVersion: '2.83.0', + license: 'MIT-0', + author: 'Court Schuett', + copyrightOwner: 'Amazon.com, Inc.', + authorAddress: 'https://aws.amazon.com', + appEntrypoint: 'ec2-instance.ts', + name: 'ec2-instance', + eslintOptions: { ignorePatterns: ['resources/**'] }, + devDeps: ['esbuild'], + defaultReleaseBranch: 'master', + deps: ['dotenv'], +}); + +const common_exclude = [ + 'cdk.out', + 'cdk.context.json', + 'yarn-error.log', + 'dependabot.yml', + '.DS_Store', +]; +project.addTask('launch', { + exec: 'yarn && yarn projen && yarn build && yarn cdk bootstrap && yarn cdk deploy --require-approval never', +}); +project.gitignore.exclude(...common_exclude); +project.synth(); diff --git a/typescript/ec2-instance/cdk.json b/typescript/ec2-instance/cdk.json index c35feae3c7..e1f07214b7 100644 --- a/typescript/ec2-instance/cdk.json +++ b/typescript/ec2-instance/cdk.json @@ -1,8 +1,11 @@ { - "app": "npx ts-node --prefer-ts-exts src/ec2-instance.ts", + "app": "npx ts-node -P tsconfig.json --prefer-ts-exts src/ec2-instance.ts", + "output": "cdk.out", + "build": "npx projen bundle", "watch": { "include": [ - "**" + "src/**/*.ts", + "test/**/*.ts" ], "exclude": [ "README.md", @@ -12,40 +15,8 @@ "tsconfig.json", "package*.json", "yarn.lock", - "node_modules", - "test" + "node_modules" ] }, - "context": { - "@aws-cdk/aws-lambda:recognizeLayerVersion": true, - "@aws-cdk/core:checkSecretUsage": true, - "@aws-cdk/core:target-partitions": [ - "aws", - "aws-cn" - ], - "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true, - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, - "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true, - "@aws-cdk/aws-iam:minimizePolicies": true, - "@aws-cdk/core:validateSnapshotRemovalPolicy": true, - "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true, - "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true, - "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true, - "@aws-cdk/aws-apigateway:disableCloudWatchRole": true, - "@aws-cdk/core:enablePartitionLiterals": true, - "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true, - "@aws-cdk/aws-iam:standardizedServicePrincipals": true, - "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true, - "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true, - "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true, - "@aws-cdk/aws-route53-patters:useCertificate": true, - "@aws-cdk/customresources:installLatestAwsSdkDefault": false, - "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true, - "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true, - "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true, - "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true, - "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true, - "@aws-cdk/aws-redshift:columnId": true, - "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true - } -} \ No newline at end of file + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." +} diff --git a/typescript/ec2-instance/package.json b/typescript/ec2-instance/package.json index 3b11025568..59803b8804 100644 --- a/typescript/ec2-instance/package.json +++ b/typescript/ec2-instance/package.json @@ -1,32 +1,94 @@ { "name": "ec2-instance", - "version": "0.0.0", "scripts": { - "build": "tsc", - "watch": "tsc -w", - "test": "jest", - "cdk": "cdk" + "build": "npx projen build", + "bundle": "npx projen bundle", + "clobber": "npx projen clobber", + "compile": "npx projen compile", + "default": "npx projen default", + "deploy": "npx projen deploy", + "destroy": "npx projen destroy", + "diff": "npx projen diff", + "eject": "npx projen eject", + "eslint": "npx projen eslint", + "launch": "npx projen launch", + "package": "npx projen package", + "post-compile": "npx projen post-compile", + "post-upgrade": "npx projen post-upgrade", + "pre-compile": "npx projen pre-compile", + "synth": "npx projen synth", + "synth:silent": "npx projen synth:silent", + "test": "npx projen test", + "test:watch": "npx projen test:watch", + "upgrade": "npx projen upgrade", + "watch": "npx projen watch", + "projen": "npx projen" }, "devDependencies": { - "@types/jest": "^29.5.14", + "@types/jest": "^29.5.3", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", "aws-cdk": "^2.83.0", + "esbuild": "^0.18.17", "eslint": "^8", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.28.0", - "jest": "^29.7.0", + "jest": "^29.6.2", "jest-junit": "^15", - "ts-jest": "^29.2.5", - "ts-node": "^10.9.2", - "typescript": "~5.6.3" + "npm-check-updates": "^16", + "projen": "^0.71.158", + "ts-jest": "^29.1.1", + "ts-node": "^10.9.1", + "typescript": "^5.1.6" }, "dependencies": { "aws-cdk-lib": "^2.83.0", "constructs": "^10.0.5", "dotenv": "^16.3.1" }, - "license": "MIT-0" + "license": "MIT-0", + "version": "0.0.0", + "jest": { + "testMatch": [ + "/src/**/__tests__/**/*.ts?(x)", + "/(test|src)/**/*(*.)@(spec|test).ts?(x)" + ], + "clearMocks": true, + "collectCoverage": true, + "coverageReporters": [ + "json", + "lcov", + "clover", + "cobertura", + "text" + ], + "coverageDirectory": "coverage", + "coveragePathIgnorePatterns": [ + "/node_modules/" + ], + "testPathIgnorePatterns": [ + "/node_modules/" + ], + "watchPathIgnorePatterns": [ + "/node_modules/" + ], + "reporters": [ + "default", + [ + "jest-junit", + { + "outputDirectory": "test-reports" + } + ] + ], + "preset": "ts-jest", + "globals": { + "ts-jest": { + "tsconfig": "tsconfig.dev.json" + } + } + }, + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." } diff --git a/typescript/ec2-instance/test/main.test.ts b/typescript/ec2-instance/test/main.test.ts index 88021b5aea..f07b6e448b 100644 --- a/typescript/ec2-instance/test/main.test.ts +++ b/typescript/ec2-instance/test/main.test.ts @@ -2,7 +2,6 @@ import { App, Stack } from 'aws-cdk-lib'; import { Template } from 'aws-cdk-lib/assertions'; import { EC2Example } from '../src/ec2-instance'; import { InstanceSize, CPUTypes } from '../src/envValidator'; -import { normalizeTemplate } from '../../test-utils/normalize-template'; const devEnv = { account: process.env.CDK_DEFAULT_ACCOUNT, @@ -29,8 +28,7 @@ test('Snapshot', () => { }); const template = Template.fromStack(stack); - const normalizedTemplate = normalizeTemplate(template.toJSON()); - expect(normalizedTemplate).toMatchSnapshot(); + expect(template.toJSON()).toMatchSnapshot(); }); test('LARGE', () => { diff --git a/typescript/ec2-instance/tsconfig.dev.json b/typescript/ec2-instance/tsconfig.dev.json new file mode 100644 index 0000000000..3bd3671661 --- /dev/null +++ b/typescript/ec2-instance/tsconfig.dev.json @@ -0,0 +1,36 @@ +// ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". +{ + "compilerOptions": { + "alwaysStrict": true, + "declaration": true, + "esModuleInterop": true, + "experimentalDecorators": true, + "inlineSourceMap": true, + "inlineSources": true, + "lib": [ + "es2019" + ], + "module": "CommonJS", + "noEmitOnError": false, + "noFallthroughCasesInSwitch": true, + "noImplicitAny": true, + "noImplicitReturns": true, + "noImplicitThis": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "resolveJsonModule": true, + "strict": true, + "strictNullChecks": true, + "strictPropertyInitialization": true, + "stripInternal": true, + "target": "ES2019" + }, + "include": [ + ".projenrc.js", + "src/**/*.ts", + "test/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} diff --git a/typescript/ec2-instance/tsconfig.json b/typescript/ec2-instance/tsconfig.json index 130298dff5..c96331d0d5 100644 --- a/typescript/ec2-instance/tsconfig.json +++ b/typescript/ec2-instance/tsconfig.json @@ -1,25 +1,36 @@ +// ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". { "compilerOptions": { - "target": "ES2018", - "module": "commonjs", - "lib": ["es2018"], - "declaration": true, - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, + "rootDir": "src", + "outDir": "lib", "alwaysStrict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": false, + "declaration": true, + "esModuleInterop": true, + "experimentalDecorators": true, "inlineSourceMap": true, "inlineSources": true, - "experimentalDecorators": true, - "strictPropertyInitialization": false, - "typeRoots": ["./node_modules/@types"], - "outDir": "dist", - "rootDir": "src" + "lib": [ + "es2019" + ], + "module": "CommonJS", + "noEmitOnError": false, + "noFallthroughCasesInSwitch": true, + "noImplicitAny": true, + "noImplicitReturns": true, + "noImplicitThis": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "resolveJsonModule": true, + "strict": true, + "strictNullChecks": true, + "strictPropertyInitialization": true, + "stripInternal": true, + "target": "ES2019" }, - "exclude": ["node_modules", "cdk.out", "dist"] + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "cdk.out" + ] } From 9eace82bc5aa265f166d72a052d7ed05d89964ff Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 20:28:25 -0500 Subject: [PATCH 08/16] Ignore this project for right now --- typescript/ec2-instance/jest.config.js | 8 ------- .../ec2-instance/test-reports/junit.xml | 23 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 typescript/ec2-instance/jest.config.js delete mode 100644 typescript/ec2-instance/test-reports/junit.xml diff --git a/typescript/ec2-instance/jest.config.js b/typescript/ec2-instance/jest.config.js deleted file mode 100644 index 08263b8954..0000000000 --- a/typescript/ec2-instance/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - testEnvironment: 'node', - roots: ['/test'], - testMatch: ['**/*.test.ts'], - transform: { - '^.+\\.tsx?$': 'ts-jest' - } -}; diff --git a/typescript/ec2-instance/test-reports/junit.xml b/typescript/ec2-instance/test-reports/junit.xml deleted file mode 100644 index 52c0568337..0000000000 --- a/typescript/ec2-instance/test-reports/junit.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 0f1fa3abfa763e794539caa147c98f76e36b3a7b Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 20:44:18 -0500 Subject: [PATCH 09/16] Update snapshot --- .../ec2-instance-connect-endpoint/src/endpoint.ts | 10 ++++++++-- .../test/__snapshots__/integ.default.test.ts.snap | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/typescript/ec2-instance-connect-endpoint/src/endpoint.ts b/typescript/ec2-instance-connect-endpoint/src/endpoint.ts index 2c6003b1c4..eba945b3a9 100644 --- a/typescript/ec2-instance-connect-endpoint/src/endpoint.ts +++ b/typescript/ec2-instance-connect-endpoint/src/endpoint.ts @@ -87,11 +87,17 @@ export class InstanceConnectEndpoint extends Construct { const onEventHandler = new lambdaPython.PythonFunction(this, 'onEventHandler', { ...commonProps, handler: 'on_event', - }); + bundling: { + user: "1000", + }, + }); const isCompleteHandler = new lambdaPython.PythonFunction(this, 'isCompleteHandler', { ...commonProps, handler: 'is_complete', + bundling: { + user: "1000", + }, }); const provider = new cr.Provider(this, 'Provider', { @@ -109,4 +115,4 @@ export class InstanceConnectEndpoint extends Construct { }, }); } -} \ No newline at end of file +} diff --git a/typescript/ec2-instance-connect-endpoint/test/__snapshots__/integ.default.test.ts.snap b/typescript/ec2-instance-connect-endpoint/test/__snapshots__/integ.default.test.ts.snap index e3acfe21dc..c403c7b7b2 100644 --- a/typescript/ec2-instance-connect-endpoint/test/__snapshots__/integ.default.test.ts.snap +++ b/typescript/ec2-instance-connect-endpoint/test/__snapshots__/integ.default.test.ts.snap @@ -252,7 +252,7 @@ exports[`default validation 1`] = ` "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}", }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip", + "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Description": "AWS CDK resource provider framework - isComplete (integ-testing-eicendpoint/EICEndpoint/Provider)", "Environment": { @@ -400,7 +400,7 @@ exports[`default validation 1`] = ` "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}", }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip", + "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Description": "AWS CDK resource provider framework - onEvent (integ-testing-eicendpoint/EICEndpoint/Provider)", "Environment": { @@ -558,7 +558,7 @@ exports[`default validation 1`] = ` "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}", }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip", + "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Description": "AWS CDK resource provider framework - onTimeout (integ-testing-eicendpoint/EICEndpoint/Provider)", "Environment": { @@ -970,7 +970,7 @@ exports[`default validation 1`] = ` "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}", }, - "S3Key": "aac3b196628b72a9c085e6ec0f4a578af32bb0dcdc9189b3dbe24aa40e373942.zip", + "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.is_complete", "MemorySize": 256, @@ -995,7 +995,7 @@ exports[`default validation 1`] = ` "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}", }, - "S3Key": "aac3b196628b72a9c085e6ec0f4a578af32bb0dcdc9189b3dbe24aa40e373942.zip", + "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.on_event", "MemorySize": 256, From 9c10a09ea705082e085a79a44b85088e30c5f3e0 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Mon, 24 Mar 2025 21:13:15 -0500 Subject: [PATCH 10/16] clean node-modules after success --- .github/workflows/build-pull-request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 454ea891cb..1c52abd93d 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -144,7 +144,6 @@ jobs: # Check the exit status of parallel parallel_exit=$? - # If parallel failed, make sure the workflow fails too if [ $parallel_exit -ne 0 ]; then echo "::error::One or more builds failed. See build output above for details." From 6a7b6a60a692bf482366503d4891b7d5330153b9 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Tue, 25 Mar 2025 10:03:23 -0500 Subject: [PATCH 11/16] Update build to clean up after each build --- .github/workflows/build-pull-request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 1c52abd93d..6faf6c74f9 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -69,7 +69,6 @@ jobs: if [ $exit_code -eq 0 ]; then echo "✅ Build succeeded for $file" - # Clean up node_modules and cdk.out for this project immediately after successful build echo "Cleaning up build artifacts for $(dirname "$file")" local project_dir=$(dirname "$file") From 647247f13f2aba218dab6b49aeeb4e568ca59e08 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Tue, 25 Mar 2025 10:26:23 -0500 Subject: [PATCH 12/16] Update installing cdk cli --- .github/workflows/build-pull-request.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 6faf6c74f9..f71cce27dc 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -45,7 +45,8 @@ jobs: run: | # Create a temporary directory for build logs mkdir -p /tmp/build_logs - npm install -g eslint > /dev/null + yarn global add eslint@latest + yarn global add aws-cdk@latest # Function to build a single file build_file() { echo "Build File $1" @@ -127,13 +128,6 @@ jobs: # Change to language directory cd ./${{ matrix.language }} - # install CDK CLI from npm if not typescript, so that npx can find it later - # ts will use the one from the particular cdk app - if [[ ${{ matrix.language }} != 'typescript' ]]; then - npm install -g aws-cdk - npx cdk --version - fi - # Run the build_file function in parallel for each project to be built # Halt the execution if any of the build_file invocations fail echo "::group::Build Output" From 5a2969b3b6e18c2be1be1382681febfd964e49dd Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Tue, 25 Mar 2025 10:29:31 -0500 Subject: [PATCH 13/16] Update installing cdk cli --- scripts/build-typescript.sh | 2 +- scripts/synth.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-typescript.sh b/scripts/build-typescript.sh index 49e699eb01..0d0ec24140 100755 --- a/scripts/build-typescript.sh +++ b/scripts/build-typescript.sh @@ -20,7 +20,7 @@ fi # Check if yarn.lock exists if [ -f "yarn.lock" ]; then echo "yarn.lock file found. Running 'yarn install'..." - yarn install --frozen-lockfile + yarn install --frozen-lockfile --mutex network yarn build npm run --if-present test # Check if package-lock.json exists diff --git a/scripts/synth.sh b/scripts/synth.sh index 2989aa2f39..794da14d01 100755 --- a/scripts/synth.sh +++ b/scripts/synth.sh @@ -12,7 +12,7 @@ if $fake_context; then cp $scriptdir/fake.context.json cdk.context.json fi -yarn global add cdk@latest +# yarn global add cdk@latest # > Should not need anymore. cdk synth if $fake_context; then From 1eadefbebf9c367afb41f53455be703d0b4a9a49 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Tue, 25 Mar 2025 11:07:03 -0500 Subject: [PATCH 14/16] Update snap --- ...egated-admin-account-resource.test.ts.snap | 92 ++++++---------- .../inspector2-enable-resources.test.ts.snap | 95 +++++++---------- ...nspector2-monitoring-resource.test.ts.snap | 100 ++++++++---------- ...r2-update-org-config-resource.test.ts.snap | 92 ++++++---------- 4 files changed, 151 insertions(+), 228 deletions(-) diff --git a/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap index 2ab2c3128c..83cd46def2 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap @@ -3,126 +3,105 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resources 1`] = ` { "Mappings": { - "LatestNodeRuntimeMap": { + "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-3": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-3": { - "value": "nodejs20.x", - }, - "ap-southeast-4": { - "value": "nodejs20.x", - }, - "ap-southeast-5": { - "value": "nodejs20.x", - }, - "ap-southeast-7": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ca-central-1": { - "value": "nodejs20.x", - }, - "ca-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-northwest-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-2": { - "value": "nodejs20.x", - }, - "eu-isoe-west-1": { - "value": "nodejs18.x", + "value": "nodejs16.x", }, "eu-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-3": { - "value": "nodejs20.x", - }, - "il-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-south-1": { - "value": "nodejs20.x", - }, - "mx-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "sa-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-iso-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-iso-west-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-isob-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, }, }, @@ -146,7 +125,6 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resource "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", - "MemorySize": 512, "Role": { "Fn::GetAtt": [ "Inspector2EnableDelegatedAdminAccountResourceInspector2EnableResourceInspectorRole00253606", @@ -155,7 +133,7 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resource }, "Runtime": { "Fn::FindInMap": [ - "LatestNodeRuntimeMap", + "DefaultCrNodeVersionMap", { "Ref": "AWS::Region", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap index 344719a8c7..eecfddd703 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap @@ -3,126 +3,105 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` { "Mappings": { - "LatestNodeRuntimeMap": { + "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-3": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-3": { - "value": "nodejs20.x", - }, - "ap-southeast-4": { - "value": "nodejs20.x", - }, - "ap-southeast-5": { - "value": "nodejs20.x", - }, - "ap-southeast-7": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ca-central-1": { - "value": "nodejs20.x", - }, - "ca-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-northwest-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-2": { - "value": "nodejs20.x", - }, - "eu-isoe-west-1": { - "value": "nodejs18.x", + "value": "nodejs16.x", }, "eu-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-3": { - "value": "nodejs20.x", - }, - "il-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-south-1": { - "value": "nodejs20.x", - }, - "mx-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "sa-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-iso-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-iso-west-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-isob-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, }, }, @@ -146,7 +125,6 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", - "MemorySize": 512, "Role": { "Fn::GetAtt": [ "EnableInspector2ResourceInspectorRole75753456", @@ -155,7 +133,7 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "LatestNodeRuntimeMap", + "DefaultCrNodeVersionMap", { "Ref": "AWS::Region", }, @@ -269,14 +247,13 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "LatestNodeRuntimeMap", + "DefaultCrNodeVersionMap", { "Ref": "AWS::Region", }, "value", ], }, - "Timeout": 900, }, "Type": "AWS::Lambda::Function", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap index 87700fd7e1..c5b7b1874b 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap @@ -3,126 +3,105 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` { "Mappings": { - "LatestNodeRuntimeMap": { + "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-3": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-3": { - "value": "nodejs20.x", - }, - "ap-southeast-4": { - "value": "nodejs20.x", - }, - "ap-southeast-5": { - "value": "nodejs20.x", - }, - "ap-southeast-7": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ca-central-1": { - "value": "nodejs20.x", - }, - "ca-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-northwest-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-2": { - "value": "nodejs20.x", - }, - "eu-isoe-west-1": { - "value": "nodejs18.x", + "value": "nodejs16.x", }, "eu-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-3": { - "value": "nodejs20.x", - }, - "il-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-south-1": { - "value": "nodejs20.x", - }, - "mx-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "sa-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-iso-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-iso-west-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-isob-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, }, }, @@ -145,6 +124,11 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, + "Environment": { + "Variables": { + "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", + }, + }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ @@ -222,6 +206,11 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, + "Environment": { + "Variables": { + "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", + }, + }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ @@ -407,6 +396,7 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ + "DefaultCrNodeVersionMap", { "Ref": "AWS::Region", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap index 4c1fc162ee..ad94afa11f 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap @@ -3,126 +3,105 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required resources 1`] = ` { "Mappings": { - "LatestNodeRuntimeMap": { + "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-northeast-3": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ap-southeast-3": { - "value": "nodejs20.x", - }, - "ap-southeast-4": { - "value": "nodejs20.x", - }, - "ap-southeast-5": { - "value": "nodejs20.x", - }, - "ap-southeast-7": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "ca-central-1": { - "value": "nodejs20.x", - }, - "ca-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "cn-northwest-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-central-2": { - "value": "nodejs20.x", - }, - "eu-isoe-west-1": { - "value": "nodejs18.x", + "value": "nodejs16.x", }, "eu-north-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-south-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "eu-west-3": { - "value": "nodejs20.x", - }, - "il-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "me-south-1": { - "value": "nodejs20.x", - }, - "mx-central-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "sa-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-east-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-east-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-gov-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-iso-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-iso-west-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-isob-east-1": { - "value": "nodejs18.x", + "value": "nodejs14.x", }, "us-west-1": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, "us-west-2": { - "value": "nodejs20.x", + "value": "nodejs16.x", }, }, }, @@ -146,7 +125,6 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required reso "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", - "MemorySize": 512, "Role": { "Fn::GetAtt": [ "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2", @@ -155,7 +133,7 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required reso }, "Runtime": { "Fn::FindInMap": [ - "LatestNodeRuntimeMap", + "DefaultCrNodeVersionMap", { "Ref": "AWS::Region", }, From 4437f11a478f4a00dcf73227793310889eb78f74 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Tue, 25 Mar 2025 12:53:03 -0500 Subject: [PATCH 15/16] update inspector2 snap --- ...egated-admin-account-resource.test.ts.snap | 92 ++++++++++------ .../inspector2-enable-resources.test.ts.snap | 95 +++++++++------- ...nspector2-monitoring-resource.test.ts.snap | 102 ++++++++++-------- ...r2-update-org-config-resource.test.ts.snap | 92 ++++++++++------ 4 files changed, 230 insertions(+), 151 deletions(-) diff --git a/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap index 83cd46def2..2ab2c3128c 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-enable-delegated-admin-account-resource.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -125,6 +146,7 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resource "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", + "MemorySize": 512, "Role": { "Fn::GetAtt": [ "Inspector2EnableDelegatedAdminAccountResourceInspector2EnableResourceInspectorRole00253606", @@ -133,7 +155,7 @@ exports[`Inspector2EnableDelegatedAdminAccountResource creates required resource }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap index eecfddd703..344719a8c7 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-enable-resources.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -125,6 +146,7 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", + "MemorySize": 512, "Role": { "Fn::GetAtt": [ "EnableInspector2ResourceInspectorRole75753456", @@ -133,7 +155,7 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, @@ -247,13 +269,14 @@ exports[`Inspector2EnableResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, "value", ], }, + "Timeout": 900, }, "Type": "AWS::Lambda::Function", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap index c5b7b1874b..1595b53c2c 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-monitoring-resource.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -124,11 +145,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, - "Environment": { - "Variables": { - "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", - }, - }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ @@ -206,11 +222,6 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "S3Key": "NORMALIZED_ASSET_HASH.zip", }, - "Environment": { - "Variables": { - "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", - }, - }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ @@ -396,13 +407,14 @@ exports[`Inspector2MonitoringResource creates required resources 1`] = ` }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, "value", ], }, + "Timeout": 900, }, "Type": "AWS::Lambda::Function", }, diff --git a/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap b/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap index ad94afa11f..4c1fc162ee 100644 --- a/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap +++ b/typescript/inspector2/test/__snapshots__/inspector2-update-org-config-resource.test.ts.snap @@ -3,105 +3,126 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required resources 1`] = ` { "Mappings": { - "DefaultCrNodeVersionMap": { + "LatestNodeRuntimeMap": { "af-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-northeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "ap-southeast-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ap-southeast-4": { + "value": "nodejs20.x", + }, + "ap-southeast-5": { + "value": "nodejs20.x", + }, + "ap-southeast-7": { + "value": "nodejs20.x", }, "ca-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "ca-west-1": { + "value": "nodejs20.x", }, "cn-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "cn-northwest-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-central-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "eu-isoe-west-1": { + "value": "nodejs18.x", }, "eu-north-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-south-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "eu-west-3": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "il-central-1": { + "value": "nodejs20.x", }, "me-central-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "me-south-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", + }, + "mx-central-1": { + "value": "nodejs20.x", }, "sa-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-east-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-east-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-gov-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-iso-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-iso-west-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-isob-east-1": { - "value": "nodejs14.x", + "value": "nodejs18.x", }, "us-west-1": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, "us-west-2": { - "value": "nodejs16.x", + "value": "nodejs20.x", }, }, }, @@ -125,6 +146,7 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required reso "S3Key": "NORMALIZED_ASSET_HASH.zip", }, "Handler": "index.handler", + "MemorySize": 512, "Role": { "Fn::GetAtt": [ "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2", @@ -133,7 +155,7 @@ exports[`Inspector2UpdateOrganizationConfigurationResource creates required reso }, "Runtime": { "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", + "LatestNodeRuntimeMap", { "Ref": "AWS::Region", }, From caa4a98f2f8097bc0ce326fe67220b6854634708 Mon Sep 17 00:00:00 2001 From: Michael Kaiser Date: Tue, 25 Mar 2025 13:11:49 -0500 Subject: [PATCH 16/16] Skip for now --- typescript/static-site-basic/DO_NOT_AUTOTEST | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 typescript/static-site-basic/DO_NOT_AUTOTEST diff --git a/typescript/static-site-basic/DO_NOT_AUTOTEST b/typescript/static-site-basic/DO_NOT_AUTOTEST new file mode 100644 index 0000000000..e69de29bb2