From a93c594829cd329abcd8b4f7193b9c951bf69101 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Sun, 23 Jul 2023 11:59:21 +0200 Subject: [PATCH 1/4] fix(lambda): updated default node runtime for lambdas in default, China, and Gov regions --- .../AppSyncJsResolverTestStack.template.json | 60 +++++++++---------- .../AppSyncIntegLogRetention.template.json | 60 +++++++++---------- .../ChatbotLogRetentionInteg.template.json | 60 +++++++++---------- .../replace-depends-on-test.template.json | 60 +++++++++---------- ...aws-cdk-lambda-log-retention.template.json | 60 +++++++++---------- .../aws-cdk-log-retention-integ.template.json | 60 +++++++++---------- .../aws-cdk-rds-instance.template.json | 60 +++++++++---------- .../aws-cdk-neptune-integ.template.json | 60 +++++++++---------- .../aws-cdk-lib/aws-logs/lib/log-retention.ts | 2 +- .../custom-resource-provider.ts | 4 +- .../custom-resource-provider.test.ts | 4 +- .../aws-custom-resource.ts | 4 +- .../aws-custom-resource.test.ts | 4 +- .../region-info/build-tools/fact-tables.ts | 6 +- 14 files changed, 252 insertions(+), 252 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json index 9817605df06ec..dc795b4d0bf1a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json @@ -412,88 +412,88 @@ "Mappings": { "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -505,10 +505,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json index dbb52dc4c7715..3bd68c08d1c63 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json @@ -189,88 +189,88 @@ "Mappings": { "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -282,10 +282,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json index ebd5c5fcee55a..aabbe040207e9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json @@ -157,88 +157,88 @@ "Mappings": { "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -250,10 +250,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json index cb14fe1081261..e8b3b6936e4d0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json @@ -162,88 +162,88 @@ "Mappings": { "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -255,10 +255,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json index 5a7bbbc305ad3..45544b4dccda5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json @@ -309,88 +309,88 @@ "Mappings": { "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -402,10 +402,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json index 90813e2494e0c..e0cbdd75d2d88 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json @@ -164,88 +164,88 @@ "Mappings": { "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -257,10 +257,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json index 0ca3307c6a477..af895aae4a0fe 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json @@ -1158,88 +1158,88 @@ }, "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -1251,10 +1251,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json b/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json index 9686688e2de37..7dc70f27e290f 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json +++ b/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json @@ -676,88 +676,88 @@ "Mappings": { "DefaultCrNodeVersionMap": { "af-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-northeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ap-southeast-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "ca-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "cn-northwest-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-central-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-north-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-south-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "eu-west-3": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-central-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "me-south-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "sa-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-east-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-east-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-gov-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-iso-east-1": { "value": "nodejs14.x" @@ -769,10 +769,10 @@ "value": "nodejs14.x" }, "us-west-1": { - "value": "nodejs16.x" + "value": "nodejs18.x" }, "us-west-2": { - "value": "nodejs16.x" + "value": "nodejs18.x" } } }, diff --git a/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts b/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts index 1a5ca3d893c0f..14f84bb370708 100644 --- a/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts +++ b/packages/aws-cdk-lib/aws-logs/lib/log-retention.ts @@ -171,7 +171,7 @@ class LogRetentionFunction extends Construct implements cdk.ITaggable { type: 'AWS::Lambda::Function', properties: { Handler: 'index.handler', - Runtime: cdk.Stack.of(scope).regionalFact(FactName.DEFAULT_CR_NODE_VERSION, 'nodejs16.x'), // Equivalent to Runtime.NODEJS_16_X + Runtime: cdk.Stack.of(scope).regionalFact(FactName.DEFAULT_CR_NODE_VERSION, 'nodejs18.x'), // Equivalent to Runtime.NODEJS_18_X Code: { S3Bucket: asset.s3BucketName, S3Key: asset.s3ObjectKey, diff --git a/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts b/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts index 5901724caae22..cd1c4a94206a6 100644 --- a/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts +++ b/packages/aws-cdk-lib/core/lib/custom-resource-provider/custom-resource-provider.ts @@ -23,8 +23,8 @@ export const INLINE_CUSTOM_RESOURCE_CONTEXT = '@aws-cdk/core:inlineCustomResourc * based on region. */ export function builtInCustomResourceProviderNodeRuntime(scope: Construct): CustomResourceProviderRuntime { - const runtimeName = Stack.of(scope).regionalFact(FactName.DEFAULT_CR_NODE_VERSION, 'nodejs16.x'); - return Object.values(CustomResourceProviderRuntime).find(value => value === runtimeName) ?? CustomResourceProviderRuntime.NODEJS_16_X; + const runtimeName = Stack.of(scope).regionalFact(FactName.DEFAULT_CR_NODE_VERSION, 'nodejs18.x'); + return Object.values(CustomResourceProviderRuntime).find(value => value === runtimeName) ?? CustomResourceProviderRuntime.NODEJS_18_X; } /** diff --git a/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts b/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts index 81a6ad56b8594..7cfd88c9ae857 100644 --- a/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts +++ b/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts @@ -458,12 +458,12 @@ describe('custom resource provider', () => { }); describe('builtInCustomResourceProviderNodeRuntime', () => { - test('returns node16 for commercial region', () => { + test('returns node18 for commercial region', () => { const app = new App(); const stack = new Stack(app, 'MyStack', { env: { region: 'us-east-1' } }); const rt = builtInCustomResourceProviderNodeRuntime(stack); - expect(rt).toEqual(CustomResourceProviderRuntime.NODEJS_16_X); + expect(rt).toEqual(CustomResourceProviderRuntime.NODEJS_18_X); }); test('returns node14 for iso region', () => { diff --git a/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts b/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts index 31a9045961742..a9b6f80c6a9b5 100644 --- a/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts +++ b/packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts @@ -18,10 +18,10 @@ import { FactName } from '../../../region-info'; export function builtInCustomResourceNodeRuntime(scope: Construct): lambda.Runtime { // Runtime regional fact should always return a known runtime string that lambda.Runtime // can index off, but for type safety we also default it here. - const runtimeName = cdk.Stack.of(scope).regionalFact(FactName.DEFAULT_CR_NODE_VERSION, 'nodejs16.x'); + const runtimeName = cdk.Stack.of(scope).regionalFact(FactName.DEFAULT_CR_NODE_VERSION, 'nodejs18.x'); return runtimeName ? new lambda.Runtime(runtimeName, lambda.RuntimeFamily.NODEJS, { supportsInlineCode: true }) - : lambda.Runtime.NODEJS_16_X; + : lambda.Runtime.NODEJS_18_X; } /** diff --git a/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts b/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts index 50e015deddec5..de8f262c274b7 100644 --- a/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts +++ b/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts @@ -1282,12 +1282,12 @@ test('can specify removal policy', () => { }); describe('builtInCustomResourceNodeRuntime', () => { - test('returns node16 for commercial region', () => { + test('returns node18 for commercial region', () => { const app = new App(); const stack = new Stack(app, 'MyStack', { env: { region: 'us-east-1' } }); const rt = builtInCustomResourceNodeRuntime(stack); - expect(rt).toEqual(lambda.Runtime.NODEJS_16_X); + expect(rt).toEqual(lambda.Runtime.NODEJS_18_X); }); test('returns node14 for iso region', () => { diff --git a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts index 834329ba8bf61..c93c52bcf516a 100644 --- a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts +++ b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts @@ -123,9 +123,9 @@ export const PARTITION_MAP: { [region: string]: Region } = { }; export const CR_DEFAULT_RUNTIME_MAP: Record = { - [Partition.Default]: 'nodejs16.x', - [Partition.Cn]: 'nodejs16.x', - [Partition.UsGov]: 'nodejs16.x', + [Partition.Default]: 'nodejs18.x', + [Partition.Cn]: 'nodejs18.x', + [Partition.UsGov]: 'nodejs18.x', [Partition.UsIso]: 'nodejs14.x', [Partition.UsIsoB]: 'nodejs14.x', }; From 9892e622bb1fd429fb00d23ce263033f86efe63f Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Thu, 3 Aug 2023 10:31:40 +0200 Subject: [PATCH 2/4] updated iso regions to Node 18 --- .../AppSyncJsResolverTestStack.template.json | 6 +++--- .../AppSyncIntegLogRetention.template.json | 6 +++--- .../ChatbotLogRetentionInteg.template.json | 6 +++--- .../replace-depends-on-test.template.json | 6 +++--- .../aws-cdk-lambda-log-retention.template.json | 6 +++--- .../aws-cdk-log-retention-integ.template.json | 6 +++--- .../aws-cdk-rds-instance.template.json | 6 +++--- .../aws-cdk-neptune-integ.template.json | 6 +++--- .../custom-resource-provider.test.ts | 4 ++-- .../test/aws-custom-resource/aws-custom-resource.test.ts | 4 ++-- packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json index dc795b4d0bf1a..781673ba6f22e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json @@ -496,13 +496,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json index 3bd68c08d1c63..88fa39700cd9e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json @@ -273,13 +273,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json index aabbe040207e9..0f576139f9207 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json @@ -241,13 +241,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json index e8b3b6936e4d0..95293781fe113 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json @@ -246,13 +246,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json index 45544b4dccda5..60012fa42f75a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json @@ -393,13 +393,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json index e0cbdd75d2d88..fdc07e17baa92 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json @@ -248,13 +248,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json index af895aae4a0fe..539fcddba1bb9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json @@ -1242,13 +1242,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json b/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json index 7dc70f27e290f..0d0e5808d7761 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json +++ b/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json @@ -760,13 +760,13 @@ "value": "nodejs18.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": "nodejs18.x" diff --git a/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts b/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts index 7cfd88c9ae857..b5a3b16e4c6b4 100644 --- a/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts +++ b/packages/aws-cdk-lib/core/test/custom-resource-provider/custom-resource-provider.test.ts @@ -466,12 +466,12 @@ describe('custom resource provider', () => { expect(rt).toEqual(CustomResourceProviderRuntime.NODEJS_18_X); }); - test('returns node14 for iso region', () => { + test('returns node18 for iso region', () => { const app = new App(); const stack = new Stack(app, 'MyStack', { env: { region: 'us-iso-east-1' } }); const rt = builtInCustomResourceProviderNodeRuntime(stack); - expect(rt).toEqual(CustomResourceProviderRuntime.NODEJS_14_X); + expect(rt).toEqual(CustomResourceProviderRuntime.NODEJS_18_X); }); }); }); diff --git a/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts b/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts index de8f262c274b7..1b2ba2fe3e9b9 100644 --- a/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts +++ b/packages/aws-cdk-lib/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts @@ -1290,12 +1290,12 @@ describe('builtInCustomResourceNodeRuntime', () => { expect(rt).toEqual(lambda.Runtime.NODEJS_18_X); }); - test('returns node14 for iso region', () => { + test('returns node18 for iso region', () => { const app = new App(); const stack = new Stack(app, 'MyStack', { env: { region: 'us-iso-east-1' } }); const rt = builtInCustomResourceNodeRuntime(stack); - expect(rt).toEqual(lambda.Runtime.NODEJS_14_X); + expect(rt).toEqual(lambda.Runtime.NODEJS_18_X); }); }); diff --git a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts index c93c52bcf516a..f3811a32a4274 100644 --- a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts +++ b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts @@ -126,8 +126,8 @@ export const CR_DEFAULT_RUNTIME_MAP: Record = { [Partition.Default]: 'nodejs18.x', [Partition.Cn]: 'nodejs18.x', [Partition.UsGov]: 'nodejs18.x', - [Partition.UsIso]: 'nodejs14.x', - [Partition.UsIsoB]: 'nodejs14.x', + [Partition.UsIso]: 'nodejs18.x', + [Partition.UsIsoB]: 'nodejs18.x', }; // https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-access-logs.html#access-logging-bucket-permissions From d644796ebcfb419a9e72f73e2e2d7ff0220b6de3 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Thu, 3 Aug 2023 11:27:38 +0200 Subject: [PATCH 3/4] fixed integration tests --- .../AppSyncJsResolverTestStack.template.json | 113 +----------------- .../AppSyncIntegLogRetention.template.json | 113 +----------------- .../ChatbotLogRetentionInteg.template.json | 113 +----------------- .../replace-depends-on-test.template.json | 113 +----------------- ...aws-cdk-lambda-log-retention.template.json | 113 +----------------- .../aws-cdk-log-retention-integ.template.json | 113 +----------------- .../aws-cdk-rds-instance.template.json | 111 +---------------- .../aws-cdk-neptune-integ.template.json | 113 +----------------- .../aws-logs/test/log-retention.test.ts | 10 +- 9 files changed, 9 insertions(+), 903 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json index 781673ba6f22e..d3fd4cddcd42a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json @@ -271,15 +271,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -409,109 +401,6 @@ ] } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } - } - }, "Outputs": { "ExportsOutputRefInvokeApi313C8B4949AC2AFC": { "Value": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json index 88fa39700cd9e..1e055da775ead 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json @@ -158,15 +158,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -186,109 +178,6 @@ ] } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } - } - }, "Outputs": { "ExportsOutputFnGetAttGraphqlApi1B6CF24CApiIdE34D50AD": { "Value": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json index 0f576139f9207..8cbfc2c633bc0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-chatbot/test/integ.chatbot-logretention.js.snapshot/ChatbotLogRetentionInteg.template.json @@ -126,15 +126,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -154,109 +146,6 @@ ] } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json index 95293781fe113..a945725c6406f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json @@ -108,15 +108,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "node18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -159,109 +151,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json index 60012fa42f75a..5b1ba86a75c11 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json @@ -132,15 +132,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -306,109 +298,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json index fdc07e17baa92..58cf20d9eec9e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json @@ -119,15 +119,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -161,109 +153,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json index 539fcddba1bb9..74e84adacf4fd 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance.lit.js.snapshot/aws-cdk-rds-instance.template.json @@ -1043,15 +1043,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -1155,107 +1147,6 @@ "applicationId": "arn:aws-us-gov:serverlessrepo:us-gov-west-1:023102451235:applications/SecretsManagerRDSOracleRotationSingleUser", "semanticVersion": "1.1.93" } - }, - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } } }, "Parameters": { diff --git a/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json b/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json index 0d0e5808d7761..be38a0e0eb3a9 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json +++ b/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster.js.snapshot/aws-cdk-neptune-integ.template.json @@ -625,15 +625,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": { - "Fn::FindInMap": [ - "DefaultCrNodeVersionMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" @@ -673,109 +665,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs18.x" - }, - "ap-east-1": { - "value": "nodejs18.x" - }, - "ap-northeast-1": { - "value": "nodejs18.x" - }, - "ap-northeast-2": { - "value": "nodejs18.x" - }, - "ap-northeast-3": { - "value": "nodejs18.x" - }, - "ap-south-1": { - "value": "nodejs18.x" - }, - "ap-south-2": { - "value": "nodejs18.x" - }, - "ap-southeast-1": { - "value": "nodejs18.x" - }, - "ap-southeast-2": { - "value": "nodejs18.x" - }, - "ap-southeast-3": { - "value": "nodejs18.x" - }, - "ca-central-1": { - "value": "nodejs18.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs18.x" - }, - "eu-central-2": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs18.x" - }, - "eu-south-1": { - "value": "nodejs18.x" - }, - "eu-south-2": { - "value": "nodejs18.x" - }, - "eu-west-1": { - "value": "nodejs18.x" - }, - "eu-west-2": { - "value": "nodejs18.x" - }, - "eu-west-3": { - "value": "nodejs18.x" - }, - "me-central-1": { - "value": "nodejs18.x" - }, - "me-south-1": { - "value": "nodejs18.x" - }, - "sa-east-1": { - "value": "nodejs18.x" - }, - "us-east-1": { - "value": "nodejs18.x" - }, - "us-east-2": { - "value": "nodejs18.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs18.x" - }, - "us-west-2": { - "value": "nodejs18.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts b/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts index 373a0e303cdad..487f3f0550c2b 100644 --- a/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts +++ b/packages/aws-cdk-lib/aws-logs/test/log-retention.test.ts @@ -43,15 +43,7 @@ describe('log retention', () => { Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { Handler: 'index.handler', - Runtime: { - 'Fn::FindInMap': [ - 'DefaultCrNodeVersionMap', - { - 'Ref': 'AWS::Region', - }, - 'value', - ], - }, + Runtime: 'nodejs18.x', }); Template.fromStack(stack).hasResourceProperties('Custom::LogRetention', { From abc31119e2f18b57325ea5d73ce5a7a37dae0926 Mon Sep 17 00:00:00 2001 From: Luca Pizzini Date: Thu, 3 Aug 2023 12:46:09 +0200 Subject: [PATCH 4/4] fixed integration tests --- .../replace-depends-on-test.template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json index a945725c6406f..caeac1608f1f7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-deps.js.snapshot/replace-depends-on-test.template.json @@ -108,7 +108,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": "node18.x", + "Runtime": "nodejs18.x", "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"