chore(deps): bumping cdk from 2.70 to 2.89 (#1074)

Updated various deps including yargs, lerna, cdk-lib, jest, and many more.
aws · Aug 3, 2023 · 638e820 · 638e820
1 parent 650a087
commit 638e820
Show file tree

Hide file tree

Showing 20 changed files with 2,884 additions and 4,010 deletions.
diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.70.0",
+        "aws-cdk-lib==2.89.0",
         "aws-rfdk==1.2.0"
     ],
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json
@@ -13,13 +13,13 @@
     "watch": "tsc -w"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0",
-    "aws-cdk": "2.70.0",
-    "ts-node": "^10.8.1",
-    "typescript": "~5.1.3"
+    "@types/node": "18.11.19",
+    "aws-cdk": "2.89.0",
+    "ts-node": "^10.9.1",
+    "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.70.0",
+    "aws-cdk-lib": "2.89.0",
     "aws-rfdk": "1.2.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.70.0",
+        "aws-cdk-lib==2.89.0",
         "aws-rfdk==1.2.0"
     ],
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json
@@ -18,13 +18,13 @@
     "watch": "tsc -w"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0",
-    "aws-cdk": "2.70.0",
-    "ts-node": "^10.8.1",
-    "typescript": "~5.1.3"
+    "@types/node": "18.11.19",
+    "aws-cdk": "2.89.0",
+    "ts-node": "^10.9.1",
+    "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.70.0",
+    "aws-cdk-lib": "2.89.0",
     "aws-rfdk": "1.2.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/examples/deadline/EC2-Image-Builder/python/setup.py b/examples/deadline/EC2-Image-Builder/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.70.0",
+        "aws-cdk-lib==2.89.0",
         "aws-rfdk==1.2.0",
     ],
 

diff --git a/examples/deadline/EC2-Image-Builder/ts/package.json b/examples/deadline/EC2-Image-Builder/ts/package.json
@@ -14,13 +14,13 @@
     "watch": "tsc -w"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0",
-    "aws-cdk": "2.70.0",
-    "ts-node": "^10.8.1",
-    "typescript": "~5.1.3"
+    "@types/node": "18.11.19",
+    "aws-cdk": "2.89.0",
+    "ts-node": "^10.9.1",
+    "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.70.0",
+    "aws-cdk-lib": "2.89.0",
     "aws-rfdk": "1.2.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/examples/deadline/Local-Zone/python/setup.py b/examples/deadline/Local-Zone/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.70.0",
+        "aws-cdk-lib==2.89.0",
         "aws-rfdk==1.2.0"
     ],
 

diff --git a/examples/deadline/Local-Zone/ts/package.json b/examples/deadline/Local-Zone/ts/package.json
@@ -13,13 +13,13 @@
     "watch": "tsc -w"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0",
-    "aws-cdk": "2.70.0",
-    "ts-node": "^10.8.1",
-    "typescript": "~5.1.3"
+    "@types/node": "18.11.19",
+    "aws-cdk": "2.89.0",
+    "ts-node": "^10.9.1",
+    "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.70.0",
+    "aws-cdk-lib": "2.89.0",
     "aws-rfdk": "1.2.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/integ/package.json b/integ/package.json
@@ -54,33 +54,33 @@
   },
   "devDependencies": {
     "@types/jest": "^27.5.2",
-    "@types/node": "^18.0.0",
+    "@types/node": "18.11.19",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.60.1",
-    "aws-cdk": "2.70.0",
+    "aws-cdk": "2.89.0",
     "eslint": "^8.42.0",
     "eslint-import-resolver-node": "^0.3.7",
     "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-deprecation": "^1.3.3",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-license-header": "^0.6.0",
-    "jest": "^27.5.1",
+    "jest": "^29.6.2",
     "pkglint": "1.2.0",
-    "ts-jest": "^29.1.0",
-    "typescript": "~5.1.3"
+    "ts-jest": "^29.1.1",
+    "typescript": "~5.1.6"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudformation": "^3.299.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.359.0",
-    "@aws-sdk/client-secrets-manager": "^3.359.0",
-    "@aws-sdk/client-ssm": "^3.300.0",
-    "aws-cdk-lib": "2.70.0",
+    "@aws-sdk/client-cloudformation": "^3.378.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.378.0",
+    "@aws-sdk/client-secrets-manager": "^3.378.0",
+    "@aws-sdk/client-ssm": "^3.378.0",
+    "aws-cdk-lib": "2.89.0",
     "aws-rfdk": "1.2.0",
     "constructs": "^10.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "2.70.0",
+    "aws-cdk-lib": "2.89.0",
     "aws-rfdk": "1.2.0",
     "constructs": "^10.0.0"
   },

diff --git a/lambda-layers/package.json b/lambda-layers/package.json
@@ -29,10 +29,10 @@
   "stability": "stable",
   "maturity": "stable",
   "devDependencies": {
-    "@types/node": "^18.0.0",
-    "typescript": "~5.1.3"
+    "@types/node": "18.11.19",
+    "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-sdk": "^2.1391.0"
+    "aws-sdk": "^2.1423.0"
   }
 }
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,5 @@
 {
   "npmClient": "yarn",
-  "useWorkspaces": true,
   "rejectCycles": "true",
   "version": "1.2.0"
 }
diff --git a/package.json b/package.json
@@ -25,27 +25,23 @@
       "precommit": "git add ."
     }
   },
-  "resolutions-json5": "json5 <= 2.2.1 has a security vulnerability, and is a transitive dep of several packages. Remove the resolution when able.",
-  "resolutions": {
-    "json5": "^2.2.2"
-  },
   "devDependencies": {
-    "@aws-sdk/client-ssm": "^3.300.0",
-    "@aws-sdk/client-cloudformation": "^3.299.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.359.0",
-    "@aws-sdk/client-secrets-manager": "^3.359.0",
+    "@aws-sdk/client-ssm": "^3.378.0",
+    "@aws-sdk/client-cloudformation": "^3.378.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.378.0",
+    "@aws-sdk/client-secrets-manager": "^3.378.0",
     "@types/jest": "^27.5.2",
-    "@types/node": "^18.6.2",
-    "aws-cdk-lib": "2.70.0",
-    "aws-sdk": "^2.1391.0",
+    "@types/node": "18.11.19",
+    "aws-cdk-lib": "2.89.0",
+    "aws-sdk": "^2.1423.0",
     "constructs": "^10.0.0",
     "fs-extra": "^11.1.0",
-    "jest": "^27.5.1",
+    "jest": "^29.6.2",
     "jest-junit": "^15.0.0",
-    "lerna": "^6.6.1",
+    "lerna": "^7.1.4",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.1.0",
-    "typescript": "~5.1.3"
+    "ts-jest": "^29.1.1",
+    "typescript": "~5.1.6"
   },
   "workspaces": {
     "packages": [

diff --git a/packages/aws-rfdk/bin/stage-deadline.ts b/packages/aws-rfdk/bin/stage-deadline.ts
@@ -153,7 +153,7 @@ function getDeadlineInstaller(deadlineInstallerUri: string) {
     if (types.isNativeError(e)) {
       errorMsg = e.message;
     } else {
-      errorMsg = e.toString();
+      errorMsg = String(e);
     }
     console.error(`ERROR: ${errorMsg}`);
     exitAndCleanup(1);
@@ -190,7 +190,7 @@ function getDockerRecipe(dockerRecipesUri: string) {
     if (types.isNativeError(e)) {
       errorMsg = e.message;
     } else {
-      errorMsg = e.toString();
+      errorMsg = String(e);
     }
     console.error(`ERROR: ${errorMsg}`);
     exitAndCleanup(1);
@@ -216,7 +216,7 @@ function makeExecutable(filePath: string) {
     if (e instanceof Error) {
       errorDetail = e.message;
     } else {
-      errorDetail = e.toString();
+      errorDetail = String(e);
     }
     throw new Error(`Could not add executable permission to Deadline installer: ${errorDetail}`);
   }

diff --git a/packages/aws-rfdk/lib/core/test/pad-efs-storage.test.ts b/packages/aws-rfdk/lib/core/test/pad-efs-storage.test.ts
@@ -124,6 +124,7 @@ describe('Test PadEfsStorage', () => {
       Retry: [
         {
           ErrorEquals: [
+            'Lambda.ClientExecutionTimeoutException',
             'Lambda.ServiceException',
             'Lambda.AWSLambdaException',
             'Lambda.SdkClientException',

diff --git a/packages/aws-rfdk/lib/deadline/test/render-queue.test.ts b/packages/aws-rfdk/lib/deadline/test/render-queue.test.ts
@@ -1972,14 +1972,7 @@ describe('RenderQueue', () => {
               },
             },
             {
-              Action: [
-                's3:PutObject',
-                's3:PutObjectLegalHold',
-                's3:PutObjectRetention',
-                's3:PutObjectTagging',
-                's3:PutObjectVersionTagging',
-                's3:Abort*',
-              ],
+              Action: 's3:PutObject',
               Effect: 'Allow',
               Principal: {
                 AWS: {
@@ -2128,14 +2121,7 @@ describe('RenderQueue', () => {
               },
             },
             {
-              Action: [
-                's3:PutObject',
-                's3:PutObjectLegalHold',
-                's3:PutObjectRetention',
-                's3:PutObjectTagging',
-                's3:PutObjectVersionTagging',
-                's3:Abort*',
-              ],
+              Action: 's3:PutObject',
               Effect: 'Allow',
               Principal: {
                 AWS: {

diff --git a/packages/aws-rfdk/lib/lambdas/nodejs/unhealthyFleetAction/test/unhealthyFleetAction.test.ts b/packages/aws-rfdk/lib/lambdas/nodejs/unhealthyFleetAction/test/unhealthyFleetAction.test.ts
@@ -25,8 +25,8 @@ const sampleEvent = {
       Message: '{"AlarmName":"testAlarm","AlarmDescription":null,"NewStateValue":"ALARM","NewStateReason":"Threshold Crossed: 5 out of the last 5 datapoints were less than the threshold (65.0). The most recent datapoints which crossed the threshold: [0.0 (29/04/20 23:32:00), 0.0 (29/04/20 23:31:00), 0.0 (29/04/20 23:30:00), 0.0 (29/04/20 23:29:00), 0.0 (29/04/20 23:28:00)] (minimum 5 datapoints for OK -> ALARM transition).","StateChangeTime":"2020-04-29T23:33:34.876+0000","Region":"US West (Oregon)","AlarmArn":"test-arn","OldStateValue":"INSUFFICIENT_DATA","Trigger":{"Period":60,"EvaluationPeriods":5,"ComparisonOperator":"LessThanThreshold","Threshold":65.0,"TreatMissingData":"- TreatMissingData:                    missing","EvaluateLowSampleCountPercentile":"","Metrics":[{"Expression":"100*(healthyHostCount/fleetCapacity)","Id":"expr_1","ReturnData":true},{"Id":"healthyHostCount","Label":"HealthyHostCount","MetricStat":{"Metric":{"Dimensions":[{"value":"testTargetGroup","name":"TargetGroup"},{"value":"testLoadBalancer","name":"LoadBalancer"}],"MetricName":"HealthyHostCount","Namespace":"AWS/NetworkELB"},"Period":60,"Stat":"Average"},"ReturnData":false},{"Id":"fleetCapacity","Label":"GroupDesiredCapacity","MetricStat":{"Metric":{"Dimensions":[{"value":"testFleetId","name":"AutoScalingGroupName"}],"MetricName":"GroupDesiredCapacity","Namespace":"AWS/AutoScaling"},"Period":60,"Stat":"Average"},"ReturnData":false}]}}',
       SignatureVersion: '1',
       Signature: 'testSignature',
-      SigningCertUrl: 'testSigningCertUrl',
-      UnsubscribeUrl: 'testUnsubscribeURL',
+      SigningCertURL: 'testSigningCertUrl',
+      UnsubscribeURL: 'testUnsubscribeURL',
       MessageAttributes: {},
     },
   }],

diff --git a/packages/aws-rfdk/package.json b/packages/aws-rfdk/package.json
@@ -66,41 +66,37 @@
     "deadline"
   ],
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.114",
+    "@types/aws-lambda": "^8.10.119",
     "@types/jest": "^27.5.2",
     "@types/sinon": "^10.0.13",
-    "aws-cdk-lib": "2.70.0",
-    "aws-sdk": "^2.1391.0",
+    "aws-cdk-lib": "2.89.0",
+    "aws-sdk": "^2.1423.0",
     "aws-sdk-mock": "5.5.0",
     "awslint": "2.68.0",
     "constructs": "^10.0.0",
     "dynalite": "^3.2.2",
     "eslint": "^8.42.0",
     "eslint-import-resolver-node": "^0.3.7",
     "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-deprecation": "^1.3.3",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-license-header": "^0.6.0",
-    "jest": "^27.5.1",
+    "jest": "^29.6.2",
     "jsii": "^1.77.0",
-    "jsii-pacmak": "^1.77.0",
-    "jsii-reflect": "^1.77.0",
+    "jsii-pacmak": "1.86.0",
+    "jsii-reflect": "1.86.0",
     "pkglint": "1.2.0",
     "sinon": "^15.0.3",
-    "ts-jest": "^29.1.0",
-    "typescript": "~5.1.3"
-  },
-  "resolutions-aws-sdk-mock-aws-sdk": "xml2js < 0.5.0 has a security vulnerability, and is a transitive dep of aws-sdk-mock. Upgrading aws-sdk-mock gives TS compile errors. Remove the resolution when able.",
-  "resolutions": {
-    "aws-sdk-mock/aws-sdk": "^2.1391.0"
+    "ts-jest": "^29.1.1",
+    "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.70.0",
+    "aws-cdk-lib": "2.89.0",
     "constructs": "^10.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "2.70.0",
+    "aws-cdk-lib": "2.89.0",
     "constructs": "^10.0.0"
   },
   "engines": {

diff --git a/tools/pkglint/bin/pkglint.ts b/tools/pkglint/bin/pkglint.ts
@@ -4,10 +4,10 @@ import * as yargs from 'yargs';
 import { findPackageJsons, ValidationRule } from '../lib';
 
 /* eslint-disable no-shadow */
-const argv = yargs
+const argv = yargs()
   .usage('$0 [directory]')
   .option('fix', { type: 'boolean', alias: 'f', desc: 'Fix package.json in addition to reporting mistakes' })
-  .argv;
+  .parseSync();
 
 // Our version of yargs doesn't support positional arguments yet
 const directory = argv._[0] as string || '.';

diff --git a/tools/pkglint/package.json b/tools/pkglint/package.json
@@ -39,13 +39,13 @@
     "@types/glob": "^8.1.0",
     "@types/jest": "^27.5.2",
     "@types/semver": "^7.5.0",
-    "@types/yargs": "^15.0.14",
+    "@types/yargs": "^17.0.24",
     "eslint": "^8.42.0",
     "eslint-import-resolver-node": "^0.3.7",
     "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-jest": "^27.2.1",
-    "typescript": "~5.1.3"
+    "typescript": "~5.1.6"
   },
   "nozem": {
     "ostools": [
@@ -57,7 +57,7 @@
     "case": "^1.6.3",
     "colors": "1.4.0",
     "fs-extra": "^11.1.0",
-    "semver": "^7.5.3",
-    "yargs": "^16.2.0"
+    "semver": "^7.5.4",
+    "yargs": "^17.7.2"
   }
 }