aws · marofke · Dec 14, 2023 · Dec 12, 2023 · Dec 14, 2023
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,9 +15,12 @@ updates:
         versions: ">=11.0.0-0"
       - dependency-name: "constructs"
         versions: ">=3.0.4"
+      - dependency-name: "aws-cdk-lib"
+      - dependency-name: "aws-cdk"
       - dependency-name: "@aws-cdk/*"
       - dependency-name: "jsii*"
       - dependency-name: "awslint"
+      - dependency-name: "typescript"
     commit-message:
       prefix: "chore(deps):"
   - package-ecosystem: "github-actions"

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.1.19.4 AMI ID
+        # 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 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-04ae356533dc07fb5'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
 
         # 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.89.0",
+        "aws-cdk-lib==2.114.1",
         "aws-rfdk==1.2.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.1.20.2 AMI ID from us-west-2
+   * 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
    * 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-0814954855da0e4c3'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
 
   /**
    * (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.89.0",
-    "ts-node": "^10.9.1",
+    "aws-cdk": "2.114.1",
+    "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.89.0",
+    "aws-cdk-lib": "2.114.1",
     "aws-rfdk": "1.2.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.1.19.4 AMI ID
+        # 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 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-04ae356533dc07fb5'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
 
         # 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.89.0",
+        "aws-cdk-lib==2.114.1",
         "aws-rfdk==1.2.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.1.20.2 AMI ID from us-west-2
+   * 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
    * is filled in. It can be used as-is, added to, or replaced.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0814954855da0e4c3'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
 
   /**
    * 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.89.0",
-    "ts-node": "^10.9.1",
+    "aws-cdk": "2.114.1",
+    "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.89.0",
+    "aws-cdk-lib": "2.114.1",
     "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.89.0",
+        "aws-cdk-lib==2.114.1",
         "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
@@ -15,12 +15,12 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.89.0",
-    "ts-node": "^10.9.1",
+    "aws-cdk": "2.114.1",
+    "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.89.0",
+    "aws-cdk-lib": "2.114.1",
     "aws-rfdk": "1.2.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.1.19 is used, to match the worker AMI ID provided below
-        self.deadline_version: Optional[str] = '10.1.19'
+        # 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'
 
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID
+        # 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 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-04ae356533dc07fb5'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
 
         # (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.89.0",
+        "aws-cdk-lib==2.114.1",
         "aws-rfdk==1.2.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.1.20 is used, to match the worker AMI ID provided below
+   * @default 10.3.1 is used, to match the worker AMI ID provided below
    */
-  public readonly deadlineVersion: string = '10.1.20';
+  public readonly deadlineVersion: string = '10.3.1';
 
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.20.2 AMI ID from us-west-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
    * 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-0814954855da0e4c3'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
 
   /**
    * (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.89.0",
-    "ts-node": "^10.9.1",
+    "aws-cdk": "2.114.1",
+    "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.89.0",
+    "aws-cdk-lib": "2.114.1",
     "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
@@ -53,34 +53,34 @@
     "lintfix": "eslint . --ext=.ts --fix"
   },
   "devDependencies": {
-    "@types/jest": "^27.5.2",
+    "@types/jest": "^29.5.11",
     "@types/node": "18.11.19",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^5.60.1",
-    "aws-cdk": "2.89.0",
+    "@typescript-eslint/eslint-plugin": "^6.14.0",
+    "@typescript-eslint/parser": "^6.14.0",
+    "aws-cdk": "2.114.1",
     "eslint": "^8.55.0",
     "eslint-import-resolver-node": "^0.3.9",
-    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-deprecation": "^1.5.0",
-    "eslint-plugin-import": "^2.28.0",
+    "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-license-header": "^0.6.0",
-    "jest": "^29.6.2",
+    "jest": "^29.7.0",
     "pkglint": "1.2.0",
     "ts-jest": "^29.1.1",
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudformation": "^3.378.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.378.0",
-    "@aws-sdk/client-secrets-manager": "^3.468.0",
-    "@aws-sdk/client-ssm": "^3.378.0",
-    "aws-cdk-lib": "2.89.0",
+    "@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-rfdk": "1.2.0",
     "constructs": "^10.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "2.89.0",
+    "aws-cdk-lib": "2.114.1",
     "aws-rfdk": "1.2.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.1423.0"
+    "aws-sdk": "^2.1516.0"
   }
 }
diff --git a/package.json b/package.json
@@ -27,19 +27,19 @@
     }
   },
   "devDependencies": {
-    "@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.468.0",
-    "@types/jest": "^27.5.2",
+    "@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",
     "@types/node": "18.11.19",
-    "aws-cdk-lib": "2.89.0",
-    "aws-sdk": "^2.1423.0",
+    "aws-cdk-lib": "2.114.1",
+    "aws-sdk": "^2.1516.0",
     "constructs": "^10.0.0",
-    "fs-extra": "^11.1.0",
-    "jest": "^29.6.2",
-    "jest-junit": "^15.0.0",
-    "lerna": "^7.1.4",
+    "fs-extra": "^11.2.0",
+    "jest": "^29.7.0",
+    "jest-junit": "^16.0.0",
+    "lerna": "^8.0.0",
     "standard-version": "^9.5.0",
     "ts-jest": "^29.1.1",
     "typescript": "~5.1.6"

diff --git a/packages/aws-rfdk/lib/core/lib/deployment-instance.ts b/packages/aws-rfdk/lib/core/lib/deployment-instance.ts
@@ -15,7 +15,6 @@ import {
   UpdatePolicy,
 } from 'aws-cdk-lib/aws-autoscaling';
 import {
-  AmazonLinuxGeneration,
   Connections,
   IConnectable,
   IMachineImage,
@@ -173,7 +172,7 @@ export class DeploymentInstance extends Construct implements IScriptHost, IConne
     this.asg = new AutoScalingGroup(this, 'ASG', {
       instanceType: props.instanceType ?? InstanceType.of(InstanceClass.T3, InstanceSize.SMALL),
       keyName: props.keyName,
-      machineImage: props.machineImage ?? MachineImage.latestAmazonLinux({ generation: AmazonLinuxGeneration.AMAZON_LINUX_2 }),
+      machineImage: props.machineImage ?? MachineImage.latestAmazonLinux2(),
       minCapacity: 1,
       maxCapacity: 1,
       securityGroup: props.securityGroup,

diff --git a/packages/aws-rfdk/lib/core/lib/health-monitor.ts b/packages/aws-rfdk/lib/core/lib/health-monitor.ts
@@ -441,7 +441,7 @@ export class HealthMonitor extends HealthMonitorBase {
       label: 'UnhealthyHostPercent',
       expression: 'IF(fleetCapacity, 100*(unhealthyHostCount/fleetCapacity), 0)',
       usingMetrics: {
-        unhealthyHostCount: targetGroup.metricUnhealthyHostCount({
+        unhealthyHostCount: targetGroup.metrics.unhealthyHostCount({
           statistic: 'max',
         }),
         fleetCapacity: monitorableFleet.targetCapacityMetric,
@@ -465,7 +465,7 @@ export class HealthMonitor extends HealthMonitorBase {
       label: 'UnhealthyHostPercent',
       expression: 'IF(fleetCapacity, 100*(unhealthyHostCount/fleetCapacity), 0)',
       usingMetrics: {
-        unhealthyHostCount: targetGroup.metricUnhealthyHostCount({
+        unhealthyHostCount: targetGroup.metrics.unhealthyHostCount({
           statistic: 'max',
         }),
         fleetCapacity: monitorableFleet.targetCapacityMetric,

diff --git a/packages/aws-rfdk/lib/core/lib/mongodb-instance.ts b/packages/aws-rfdk/lib/core/lib/mongodb-instance.ts
@@ -14,7 +14,6 @@ import {
   BlockDeviceVolume,
 } from 'aws-cdk-lib/aws-autoscaling';
 import {
-  AmazonLinuxGeneration,
   Connections,
   IConnectable,
   InstanceType,
@@ -421,7 +420,7 @@ export class MongoDbInstance extends Construct implements IMongoDb, IGrantable {
       vpc: props.vpc,
       vpcSubnets: { subnets: [ subnet ] },
       instanceType: props.instanceType ?? new InstanceType('r5.large'),
-      machineImage: MachineImage.latestAmazonLinux({ generation: AmazonLinuxGeneration.AMAZON_LINUX_2 }),
+      machineImage: MachineImage.latestAmazonLinux2(),
       blockDevices: [
         {
           deviceName: '/dev/xvda', // Root volume

diff --git a/packages/aws-rfdk/lib/core/lib/staticip-server.ts b/packages/aws-rfdk/lib/core/lib/staticip-server.ts
@@ -263,7 +263,7 @@ export class StaticPrivateIpServer extends Construct implements IConnectable, IG
     this.privateIpAddress = eni.attrPrimaryPrivateIpAddress;
 
     // We need to be sure that the ENI is created before the instance would be brought up; otherwise, we cannot attach it.
-    (this.autoscalingGroup.node.defaultChild as CfnResource).addDependsOn(eni);
+    (this.autoscalingGroup.node.defaultChild as CfnResource).addDependency(eni);
 
     this.attachEniLifecyleTarget(eni);
 

diff --git a/packages/aws-rfdk/lib/core/test/deployment-instance.test.ts b/packages/aws-rfdk/lib/core/test/deployment-instance.test.ts
@@ -10,7 +10,6 @@ import {
 } from 'aws-cdk-lib/assertions';
 import { CfnLaunchConfiguration } from 'aws-cdk-lib/aws-autoscaling';
 import {
-  AmazonLinuxGeneration,
   AmazonLinuxImage,
   ExecuteFileOptions,
   InstanceType,
@@ -159,7 +158,7 @@ describe('DeploymentInstance', () => {
 
       test('uses latest Amazon Linux machine image', () => {
         // GIVEN
-        const amazonLinux = MachineImage.latestAmazonLinux({ generation: AmazonLinuxGeneration.AMAZON_LINUX_2 });
+        const amazonLinux = MachineImage.latestAmazonLinux2();
         const imageId: { Ref: string } = stack.resolve(amazonLinux.getImage(stack)).imageId;
 
         // THEN

diff --git a/packages/aws-rfdk/lib/core/test/exporting-log-group.test.ts b/packages/aws-rfdk/lib/core/test/exporting-log-group.test.ts
@@ -33,7 +33,6 @@ test('default exporting log group is created correctly', () => {
     LogGroupName: 'logGroup',
     SdkRetry: {
       maxRetries: 7,
-      base: 200,
     },
     RetentionInDays: 3,
   });
@@ -153,7 +152,6 @@ test('custom set retention is created correctly', () => {
     LogGroupName: 'logGroup',
     SdkRetry: {
       maxRetries: 7,
-      base: 200,
     },
     RetentionInDays: 7,
   });