Merge pull request #2360 from guardian/update-aws-cdk-2.148.0

fix(deps): Update AWS CDK libraries to 2.148.0, and constructs to 10.3.0

.changeset/aws-cdk-update-v2.148.0.md

@@ -0,0 +1,6 @@
+---
+"@guardian/cdk": patch
+---
+
+Update aws-cdk to 2.148.0, aws-cdk-lib to 2.148.0, constructs to 10.3.0
+

.changeset/lucky-news-guess.md

@@ -0,0 +1,5 @@
+---
+"@guardian/cdk": patch
+---
+
+fix(ec2-app): Use `clientSecretValue` prop over deprecated `clientSecret`

.changeset/shaggy-ties-deliver.md

@@ -0,0 +1,5 @@
+---
+"@guardian/cdk": patch
+---
+
+fix(lambda): Use `loggingFormat` prop over deprecated `logFormat`

package.json

@@ -40,8 +40,8 @@
     "@types/lodash.upperfirst": "^4.3.9",
     "@types/node": "20.14.9",
     "@types/yargs": "^17.0.32",
-    "aws-cdk": "2.145.0",
-    "aws-cdk-lib": "2.145.0",
+    "aws-cdk": "2.148.0",
+    "aws-cdk-lib": "2.148.0",
     "constructs": "10.3.0",
     "eslint": "^8.57.0",
     "eslint-plugin-custom-rules": "file:tools/eslint",
@@ -68,8 +68,8 @@
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
-    "aws-cdk": "2.145.0",
-    "aws-cdk-lib": "2.145.0",
+    "aws-cdk": "2.148.0",
+    "aws-cdk-lib": "2.148.0",
     "constructs": "10.3.0"
   }
 }

src/constructs/ecs/__snapshots__/ecs-task.test.ts.snap

@@ -37,9 +37,18 @@ exports[`The GuEcsTask pattern should create the correct resources with lots of
       "ap-southeast-4": {
         "states": "states.ap-southeast-4.amazonaws.com",
       },
+      "ap-southeast-5": {
+        "states": "states.ap-southeast-5.amazonaws.com",
+      },
+      "ap-southeast-7": {
+        "states": "states.ap-southeast-7.amazonaws.com",
+      },
       "ca-central-1": {
         "states": "states.ca-central-1.amazonaws.com",
       },
+      "ca-west-1": {
+        "states": "states.ca-west-1.amazonaws.com",
+      },
       "cn-north-1": {
         "states": "states.cn-north-1.amazonaws.com",
       },
@@ -52,6 +61,9 @@ exports[`The GuEcsTask pattern should create the correct resources with lots of
       "eu-central-2": {
         "states": "states.eu-central-2.amazonaws.com",
       },
+      "eu-isoe-west-1": {
+        "states": "states.eu-isoe-west-1.amazonaws.com",
+      },
       "eu-north-1": {
         "states": "states.eu-north-1.amazonaws.com",
       },
@@ -79,6 +91,9 @@ exports[`The GuEcsTask pattern should create the correct resources with lots of
       "me-south-1": {
         "states": "states.me-south-1.amazonaws.com",
       },
+      "mx-central-1": {
+        "states": "states.mx-central-1.amazonaws.com",
+      },
       "sa-east-1": {
         "states": "states.sa-east-1.amazonaws.com",
       },

src/constructs/lambda/lambda.test.ts

@@ -223,7 +223,7 @@ describe("The GuLambdaFunction class", () => {
       handler: "handler.ts",
       runtime: Runtime.JAVA_17,
       app: "testing",
-      logFormat: "JSON",
+      loggingFormat: LoggingFormat.JSON,
     });
 
     hasLoggingFormat(stack, LoggingFormat.JSON);
@@ -236,7 +236,7 @@ describe("The GuLambdaFunction class", () => {
       handler: "handler.ts",
       runtime: Runtime.JAVA_17,
       app: "testing",
-      logFormat: "Text",
+      loggingFormat: LoggingFormat.TEXT,
     });
 
     hasLoggingFormat(stack, LoggingFormat.TEXT);

src/constructs/lambda/lambda.ts

@@ -124,7 +124,7 @@ export class GuLambdaFunction extends Function {
       bucketNamePath,
       withoutFilePrefix = false,
       withoutArtifactUpload = false,
-      logFormat = LoggingFormat.JSON,
+      loggingFormat = LoggingFormat.JSON,
     } = props;
 
     const bucketName = bucketNamePath
@@ -142,7 +142,7 @@ export class GuLambdaFunction extends Function {
     const code = Code.fromBucket(bucket, objectKey);
     super(scope, id, {
       ...props,
-      logFormat,
+      loggingFormat,
       environment: {
         ...props.environment,
         ...defaultEnvironmentVariables,

src/constructs/rds/instance.test.ts

@@ -79,7 +79,7 @@ describe("The GuDatabaseInstance class", () => {
       app: "testing",
       devXBackups: { enabled: true },
     });
-    console.log(JSON.stringify(stack.tags.tagValues()));
+
     GuTemplate.fromStack(stack).hasResourceWithTag("AWS::RDS::DBInstance", {
       Key: "devx-backup-enabled",
       Value: "true",

src/patterns/ec2-app/base.ts

@@ -586,7 +586,7 @@ export class GuEc2App extends Construct {
       const userPoolIdp = new UserPoolIdentityProviderGoogle(scope, "google-idp", {
         userPool: userPool,
         clientId: clientId.toString(),
-        clientSecret: clientSecret.toString(),
+        clientSecretValue: clientSecret,
         attributeMapping: {
           email: ProviderAttribute.GOOGLE_EMAIL,
           givenName: ProviderAttribute.GOOGLE_GIVEN_NAME,

tools/integration-test/package.json

@@ -20,8 +20,8 @@
     "@guardian/tsconfig": "^0.2.0",
     "@types/jest": "^29.1.2",
     "@types/node": "20.8.7",
-    "aws-cdk": "2.145.0",
-    "aws-cdk-lib": "2.145.0",
+    "aws-cdk": "2.148.0",
+    "aws-cdk-lib": "2.148.0",
     "constructs": "10.3.0",
     "eslint": "^8.8.0",
     "eslint-plugin-custom-rules": "file:../eslint",