chore(deps): bump CDK to 2.133.0

Signed-off-by: Samuel Anderson <[email protected]>
aws · Mar 22, 2024 · 75d5aa4 · 75d5aa4
1 parent 04e4ab8
commit 75d5aa4
Show file tree

Hide file tree

Showing 21 changed files with 2,827 additions and 3,358 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ the minimum officially supported version that RFDK now supports. See our documen
 
 ### Officially Supported Deadline Versions
 
-* [10.1.9.2 to 10.3.1.4](https://docs.thinkboxsoftware.com/products/deadline/10.3/1_User%20Manual/manual/release-notes.html)
+* [10.1.9.2 to 10.3.2.1](https://docs.thinkboxsoftware.com/products/deadline/10.3/1_User%20Manual/manual/release-notes.html)
 
 
 ### Features

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py
@@ -39,10 +39,10 @@ def __init__(self):
         # to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.12"
         self.deadline_version: Optional[str] = None
 
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID
         # from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
         # Deadline used in any connected Deadline constructs.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0b2bbe30ea8642cdd'}
 
         # A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
         # This must be in the format `arn:<partition>:secretsmanager:<region>:<accountId>:secret:<secretName>-<6RandomCharacters`

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.114.1",
+        "aws-cdk-lib==2.133.0",
         "aws-rfdk==1.3.0"
     ],
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts
@@ -40,11 +40,11 @@ class AppConfig {
   public readonly deadlineVersion?: string;
 
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
    * Deadline used in any connected Deadline constructs.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0b2bbe30ea8642cdd'};
 
   /**
    * (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json
@@ -14,12 +14,12 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.114.1",
+    "aws-cdk": "2.133.0",
     "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.114.1",
+    "aws-cdk-lib": "2.133.0",
     "aws-rfdk": "1.3.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py
@@ -12,10 +12,10 @@ class AppConfig:
     TODO: Fill these in with your own values.
     """
     def __init__(self):
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID
         # from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
         #  should match the one used for staging the render queue and usage based licensing recipes.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0b2bbe30ea8642cdd'}
 
         # Whether the DeadlineResourceTrackerAccessRole IAM role required by Deadline's Resource Tracker should be created in this CDK app.
         #

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.114.1",
+        "aws-cdk-lib==2.133.0",
         "aws-rfdk==1.3.0"
     ],
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts
@@ -12,10 +12,10 @@ import 'source-map-support/register';
  */
 class AppConfig {
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0b2bbe30ea8642cdd'};
 
   /**
    * Whether the DeadlineResourceTrackerAccessRole IAM role required by Deadline's Resource Tracker should be created in this CDK app.

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json
@@ -19,12 +19,12 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.114.1",
+    "aws-cdk": "2.133.0",
     "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.114.1",
+    "aws-cdk-lib": "2.133.0",
     "aws-rfdk": "1.3.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.114.1",
+        "aws-cdk-lib==2.133.0",
         "aws-rfdk==1.3.0",
     ],
 

diff --git a/examples/deadline/EC2-Image-Builder/ts/package.json b/examples/deadline/EC2-Image-Builder/ts/package.json
@@ -15,12 +15,12 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.114.1",
+    "aws-cdk": "2.133.0",
     "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.114.1",
+    "aws-cdk-lib": "2.133.0",
     "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/examples/deadline/Local-Zone/python/package/lib/config.py b/examples/deadline/Local-Zone/python/package/lib/config.py
@@ -36,13 +36,13 @@ def __init__(self):
 
         # The version of Deadline to use on the render farm. Leave as None for the latest release or specify a version
         # to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.16"
-        # The default value of 10.3.1 is used, to match the worker AMI ID provided below
-        self.deadline_version: Optional[str] = '10.3.1'
+        # The default value of 10.3.2 is used, to match the worker AMI ID provided below
+        self.deadline_version: Optional[str] = '10.3.2'
 
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID
         # from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
         # should match the one used for staging the render queue and usage based licensing recipes.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0b2bbe30ea8642cdd'}
 
         # (Optional) The name of the EC2 keypair to associate with the instances.
         self.key_pair_name: Optional[str] = None

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.114.1",
+        "aws-cdk-lib==2.133.0",
         "aws-rfdk==1.3.0"
     ],
 

diff --git a/examples/deadline/Local-Zone/ts/bin/config.ts b/examples/deadline/Local-Zone/ts/bin/config.ts
@@ -36,16 +36,16 @@ class AppConfig {
   /**
    * The version of Deadline to use on the render farm. Some examples of pinned version values are "10", "10.1", or
    * "10.1.16"
-   * @default 10.3.1 is used, to match the worker AMI ID provided below
+   * @default 10.3.2 is used, to match the worker AMI ID provided below
    */
-  public readonly deadlineVersion: string = '10.3.1';
+  public readonly deadlineVersion: string = '10.3.2';
 
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.3.1.3 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.3.2.1 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the one in
    * package.json used for staging the render queue and usage based licensing recipes.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0b2bbe30ea8642cdd'};
 
   /**
    * (Optional) The name of the EC2 keypair to associate with instances.

diff --git a/examples/deadline/Local-Zone/ts/package.json b/examples/deadline/Local-Zone/ts/package.json
@@ -14,12 +14,12 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.114.1",
+    "aws-cdk": "2.133.0",
     "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.114.1",
+    "aws-cdk-lib": "2.133.0",
     "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/integ/package.json b/integ/package.json
@@ -53,34 +53,34 @@
     "lintfix": "eslint . --ext=.ts --fix"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
     "@types/node": "18.11.19",
-    "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@typescript-eslint/parser": "^6.14.0",
-    "aws-cdk": "2.114.1",
-    "eslint": "^8.55.0",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.3.1",
+    "aws-cdk": "2.133.0",
+    "eslint": "^8.57.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-deprecation": "^2.0.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-license-header": "^0.6.0",
     "jest": "^29.7.0",
     "pkglint": "1.3.0",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudformation": "^3.470.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.470.0",
-    "@aws-sdk/client-secrets-manager": "^3.470.0",
-    "@aws-sdk/client-ssm": "^3.470.0",
-    "aws-cdk-lib": "2.114.1",
+    "@aws-sdk/client-cloudformation": "^3.537.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.537.0",
+    "@aws-sdk/client-secrets-manager": "^3.535.0",
+    "@aws-sdk/client-ssm": "^3.535.0",
+    "aws-cdk-lib": "2.133.0",
     "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "2.114.1",
+    "aws-cdk-lib": "2.133.0",
     "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0"
   },

diff --git a/lambda-layers/package.json b/lambda-layers/package.json
@@ -33,6 +33,6 @@
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-sdk": "^2.1516.0"
+    "aws-sdk": "^2.1583.0"
   }
 }
diff --git a/package.json b/package.json
@@ -27,21 +27,21 @@
     }
   },
   "devDependencies": {
-    "@aws-sdk/client-ssm": "^3.470.0",
-    "@aws-sdk/client-cloudformation": "^3.470.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.470.0",
-    "@aws-sdk/client-secrets-manager": "^3.470.0",
-    "@types/jest": "^29.5.11",
+    "@aws-sdk/client-ssm": "^3.535.0",
+    "@aws-sdk/client-cloudformation": "^3.537.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.537.0",
+    "@aws-sdk/client-secrets-manager": "^3.535.0",
+    "@types/jest": "^29.5.12",
     "@types/node": "18.11.19",
-    "aws-cdk-lib": "2.114.1",
-    "aws-sdk": "^2.1516.0",
+    "aws-cdk-lib": "2.133.0",
+    "aws-sdk": "^2.1583.0",
     "constructs": "^10.0.0",
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "lerna": "^8.0.0",
+    "lerna": "^8.1.2",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "typescript": "~5.1.6"
   },
   "workspaces": {

diff --git a/packages/aws-rfdk/lib/lambdas/nodejs/asg-attach-eni/test/test.ts b/packages/aws-rfdk/lib/lambdas/nodejs/asg-attach-eni/test/test.ts
@@ -99,8 +99,8 @@ test('processes all correct records', async () => {
       },
     ],
   };
-  attachSpy = jest.fn( (request) => successRequestMock(request) );
-  completeSpy = jest.fn( (request) => successRequestMock(request) );
+  attachSpy = jest.fn( (request, _callback) => successRequestMock(request) );
+  completeSpy = jest.fn( (request, _callback) => successRequestMock(request) );
   mock('EC2', 'attachNetworkInterface', attachSpy);
   mock('AutoScaling', 'completeLifecycleAction', completeSpy);
 
@@ -158,7 +158,7 @@ test('abandons launch when attach fails', async () => {
   };
 
   attachSpy = jest.fn( () => errorRequestMock() );
-  completeSpy = jest.fn( (request) => successRequestMock(request) );
+  completeSpy = jest.fn( (request, _callback) => successRequestMock(request) );
   mock('EC2', 'attachNetworkInterface', attachSpy);
   mock('AutoScaling', 'completeLifecycleAction', completeSpy);
 

diff --git a/packages/aws-rfdk/package.json b/packages/aws-rfdk/package.json
@@ -66,42 +66,42 @@
     "deadline"
   ],
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.130",
-    "@types/jest": "^29.5.11",
-    "@types/sinon": "^17.0.2",
-    "aws-cdk-lib": "2.114.1",
-    "aws-sdk": "^2.1516.0",
-    "aws-sdk-mock": "5.5.0",
+    "@types/aws-lambda": "^8.10.136",
+    "@types/jest": "^29.5.12",
+    "@types/sinon": "^17.0.3",
+    "aws-cdk-lib": "2.133.0",
+    "aws-sdk": "^2.1583.0",
+    "aws-sdk-mock": "5.9.0",
     "awslint": "2.68.0",
     "constructs": "^10.0.0",
     "dynalite": "^3.2.2",
-    "eslint": "^8.55.0",
+    "eslint": "^8.57.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-deprecation": "^2.0.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-license-header": "^0.6.0",
     "jest": "^29.7.0",
-    "jsii": "~5.2.41",
-    "jsii-pacmak": "1.93.0",
-    "jsii-reflect": "1.93.0",
+    "jsii": "~5.3.29",
+    "jsii-pacmak": "1.95.0",
+    "jsii-reflect": "1.95.0",
     "pkglint": "1.3.0",
     "sinon": "^17.0.1",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.114.1",
+    "aws-cdk-lib": "2.133.0",
     "constructs": "^10.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "2.114.1",
+    "aws-cdk-lib": "2.133.0",
     "constructs": "^10.0.0"
   },
   "engines": {
     "node": ">= 14.15.0"
   },
   "stability": "stable",
   "maturity": "stable"
-}
+}