Merge pull request #2307 from guardian/update-aws-cdk-2.141.0

fix(deps): Update AWS CDK libraries to 2.141.0, and constructs to 10.3.0
guardian · May 13, 2024 · 19779d7 · 19779d7
2 parents 481a99d + b57a2dd
commit 19779d7
Show file tree

Hide file tree

Showing 10 changed files with 185 additions and 23 deletions.
diff --git a/.changeset/aws-cdk-update-v2.141.0.md b/.changeset/aws-cdk-update-v2.141.0.md
@@ -0,0 +1,6 @@
+---
+"@guardian/cdk": patch
+---
+
+Update aws-cdk to 2.141.0, aws-cdk-lib to 2.141.0, constructs to 10.3.0
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,8 +40,8 @@
     "@types/lodash.upperfirst": "^4.3.9",
     "@types/node": "20.12.10",
     "@types/yargs": "^17.0.32",
-    "aws-cdk": "2.136.1",
-    "aws-cdk-lib": "2.136.1",
+    "aws-cdk": "2.141.0",
+    "aws-cdk-lib": "2.141.0",
     "constructs": "10.3.0",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.57.0",
@@ -69,8 +69,8 @@
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
-    "aws-cdk": "2.136.1",
-    "aws-cdk-lib": "2.136.1",
+    "aws-cdk": "2.141.0",
+    "aws-cdk-lib": "2.141.0",
     "constructs": "10.3.0"
   },
   "config": {

diff --git a/src/constructs/cloudwatch/__snapshots__/api-gateway-alarms.test.ts.snap b/src/constructs/cloudwatch/__snapshots__/api-gateway-alarms.test.ts.snap
@@ -106,6 +106,24 @@ exports[`The GuApiGateway5xxPercentageAlarm construct should create the correct
             "ReturnData": false,
           },
         ],
+        "Tags": [
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 1,
         "TreatMissingData": "notBreaching",
       },

diff --git a/src/constructs/cloudwatch/__snapshots__/ec2-alarms.test.ts.snap b/src/constructs/cloudwatch/__snapshots__/ec2-alarms.test.ts.snap
@@ -215,6 +215,24 @@ exports[`The GuAlb4xxPercentageAlarm construct should create the correct alarm r
             "ReturnData": false,
           },
         ],
+        "Tags": [
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 1,
         "TreatMissingData": "notBreaching",
       },
@@ -439,6 +457,24 @@ exports[`The GuAlb5xxPercentageAlarm construct should create the correct alarm r
             "ReturnData": false,
           },
         ],
+        "Tags": [
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 1,
         "TreatMissingData": "notBreaching",
       },
@@ -732,6 +768,24 @@ exports[`The GuUnhealthyInstancesAlarm construct should create the correct alarm
         "Namespace": "AWS/ApplicationELB",
         "Period": 60,
         "Statistic": "Maximum",
+        "Tags": [
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 1,
         "TreatMissingData": "notBreaching",
       },

diff --git a/src/constructs/cloudwatch/__snapshots__/lambda-alarms.test.ts.snap b/src/constructs/cloudwatch/__snapshots__/lambda-alarms.test.ts.snap
@@ -277,6 +277,24 @@ exports[`GuLambdaThrottlingAlarm construct should match snapshot 1`] = `
         "Namespace": "AWS/Lambda",
         "Period": 60,
         "Statistic": "Sum",
+        "Tags": [
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 0,
         "TreatMissingData": "notBreaching",
       },
@@ -618,6 +636,24 @@ exports[`The GuLambdaErrorPercentageAlarm construct should create the correct al
             "ReturnData": false,
           },
         ],
+        "Tags": [
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 80,
         "TreatMissingData": "notBreaching",
       },

diff --git a/src/constructs/ecs/__snapshots__/ecs-task.test.ts.snap b/src/constructs/ecs/__snapshots__/ecs-task.test.ts.snap
@@ -155,6 +155,28 @@ exports[`The GuEcsTask pattern should create the correct resources with lots of
         "Namespace": "AWS/States",
         "Period": 3600,
         "Statistic": "Sum",
+        "Tags": [
+          {
+            "Key": "App",
+            "Value": "ecs-test",
+          },
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 1,
         "TreatMissingData": "notBreaching",
       },
@@ -181,6 +203,28 @@ exports[`The GuEcsTask pattern should create the correct resources with lots of
         "Namespace": "AWS/States",
         "Period": 3600,
         "Statistic": "Sum",
+        "Tags": [
+          {
+            "Key": "App",
+            "Value": "ecs-test",
+          },
+          {
+            "Key": "gu:cdk:version",
+            "Value": "TEST",
+          },
+          {
+            "Key": "gu:repo",
+            "Value": "guardian/cdk",
+          },
+          {
+            "Key": "Stack",
+            "Value": "test-stack",
+          },
+          {
+            "Key": "Stage",
+            "Value": "TEST",
+          },
+        ],
         "Threshold": 1,
         "TreatMissingData": "notBreaching",
       },

diff --git a/src/experimental/constructs/iam/roles/__snapshots__/fastly-kinesis-log.test.ts.snap b/src/experimental/constructs/iam/roles/__snapshots__/fastly-kinesis-log.test.ts.snap
@@ -126,6 +126,7 @@ exports[`The GuFastlyKinesisLogRole construct correctly wires up the policy 1`]
       "Type": "AWS::IAM::Role",
     },
     "testStream8BCA7523": {
+      "DeletionPolicy": "Retain",
       "Properties": {
         "RetentionPeriodHours": 24,
         "ShardCount": 1,
@@ -161,6 +162,7 @@ exports[`The GuFastlyKinesisLogRole construct correctly wires up the policy 1`]
         ],
       },
       "Type": "AWS::Kinesis::Stream",
+      "UpdateReplacePolicy": "Retain",
     },
   },
 }

diff --git a/src/experimental/patterns/__snapshots__/kinesis-lambda.test.ts.snap b/src/experimental/patterns/__snapshots__/kinesis-lambda.test.ts.snap
@@ -20,6 +20,7 @@ exports[`The GuKinesisLambda pattern should create the correct resources for a n
   },
   "Resources": {
     "KinesisStream46752A3E": {
+      "DeletionPolicy": "Retain",
       "Properties": {
         "RetentionPeriodHours": 24,
         "ShardCount": 1,
@@ -51,6 +52,7 @@ exports[`The GuKinesisLambda pattern should create the correct resources for a n
         ],
       },
       "Type": "AWS::Kinesis::Stream",
+      "UpdateReplacePolicy": "Retain",
     },
     "mylambdafunction8D341B54": {
       "DependsOn": [

diff --git a/tools/integration-test/package.json b/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.136.1",
-    "aws-cdk-lib": "2.136.1",
+    "aws-cdk": "2.141.0",
+    "aws-cdk-lib": "2.141.0",
     "constructs": "10.3.0",
     "eslint": "^8.8.0",
     "eslint-plugin-custom-rules": "file:../eslint",