Merge pull request #1229 from aws/bump/1.4.0

chore(release): 1.4.0
aws · Aug 9, 2024 · 2305d5c · 2305d5c
2 parents 8e8b169 + 97e3247
commit 2305d5c
Show file tree

Hide file tree

Showing 79 changed files with 5,519 additions and 5,375 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@
 node_modules/
 .tools/
 .BUILD_COMPLETED
+lerna-debug.log
+package-lock.json
 yarn-error.log
 
 #Defines license that must be present

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.4.0](https://github.com/aws/aws-rfdk/compare/v1.3.0...v1.4.0) (2024-08-09)
+
+
+### Supported CDK Version
+
+* [2.133.0](https://github.com/aws/aws-cdk/releases/tag/v2.133.0)
+
+
+### Officially Supported Deadline Versions
+
+* [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
+
+* **aws-rfdk:** update Lambda functions to use Node.js 18 ([#1224](https://github.com/aws/aws-rfdk/issues/1224)) ([f1002cb](https://github.com/aws/aws-rfdk/commit/f1002cbb414e81aef808aedfb42c0d629b347471))
+* **aws-rfdk**: update Lambda functions to use AWS SDK for JavaScript v3 ([#1224](https://github.com/aws/aws-rfdk/issues/1224)) ([f1002cb](https://github.com/aws/aws-rfdk/commit/f1002cbb414e81aef808aedfb42c0d629b347471))
+* **deadline:** upgraded default Worker instance type to t3.large ([#1225](https://github.com/aws/aws-rfdk/issues/1225)) ([dfb8536](https://github.com/aws/aws-rfdk/commit/dfb8536028b1e9e46e7f62d9dc44dd101a601a3c))
+
+
+### Bug Fixes
+
+* **aws-rfdk:** erroneous startTime in ExportingLogGroup Lambda ([#1224](https://github.com/aws/aws-rfdk/issues/1224)) ([f1002cb](https://github.com/aws/aws-rfdk/commit/f1002cbb414e81aef808aedfb42c0d629b347471))
+* **integ:** increased timeouts to fix test failures ([#1221](https://github.com/aws/aws-rfdk/issues/1221)) ([f9b989a](https://github.com/aws/aws-rfdk/commit/f9b989a96eb7c42615603252758d019cc3876fe0))
+* **integ:** use the newer rds-ca-rsa2048-g1 CA certs as the original rds-ca-2019 CA certs have expired ([#1221](https://github.com/aws/aws-rfdk/issues/1221)) ([f9b989a](https://github.com/aws/aws-rfdk/commit/f9b989a96eb7c42615603252758d019cc3876fe0))
+
 ## [1.3.0](https://github.com/aws/aws-rfdk/compare/v1.2.0...v1.3.0) (2023-12-22)
 
 Note: Node 14 is End of Life and RFDK >= 1.3.x no longer officially supports it. Node.js 18.0.0 is now
@@ -14,7 +40,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/config/jest.config.js b/config/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
   testEnvironment: "node",
   coverageThreshold: {
       global: {
-          branches: 95,
+          branches: 94,
           statements: 95,
       },
   },

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,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.3.0"
+        "aws-cdk-lib==2.133.0",
+        "aws-rfdk==1.4.0"
     ],
 
     python_requires=">=3.7",

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/lib/service-tier.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/service-tier.ts
@@ -172,7 +172,7 @@ export class ServiceTier extends cdk.Stack {
       version: this.version,
       database: props.database,
       fileSystem: props.mountableFileSystem,
-      repositoryInstallationTimeout: cdk.Duration.minutes(20),
+      repositoryInstallationTimeout: cdk.Duration.minutes(30),
       repositoryInstallationPrefix: "/",
       secretsManagementSettings: {
         enabled: props.enableSecretsManagement,

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-basic",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,13 +14,13 @@
   },
   "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-rfdk": "1.3.0",
+    "aws-cdk-lib": "2.133.0",
+    "aws-rfdk": "1.4.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,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.3.0"
+        "aws-cdk-lib==2.133.0",
+        "aws-rfdk==1.4.0"
     ],
 
     python_requires=">=3.7",

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/lib/sep-stack.ts b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/lib/sep-stack.ts
@@ -76,7 +76,7 @@ export class SEPStack extends Stack {
     const repository = new Repository(this, 'Repository', {
       vpc,
       version: recipes.version,
-      repositoryInstallationTimeout: Duration.minutes(20),
+      repositoryInstallationTimeout: Duration.minutes(30),
       // TODO - Evaluate deletion protection for your own needs. These properties are set to RemovalPolicy.DESTROY
       // to cleanly remove everything when this stack is destroyed. If you would like to ensure
       // that these resources are not accidentally deleted, you should set these properties to RemovalPolicy.RETAIN

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-sep",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -19,13 +19,13 @@
   },
   "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-rfdk": "1.3.0",
+    "aws-cdk-lib": "2.133.0",
+    "aws-rfdk": "1.4.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,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.3.0",
+        "aws-cdk-lib==2.133.0",
+        "aws-rfdk==1.4.0",
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/EC2-Image-Builder/ts/package.json b/examples/deadline/EC2-Image-Builder/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-image-builder",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -15,13 +15,13 @@
   },
   "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-rfdk": "1.3.0",
+    "aws-cdk-lib": "2.133.0",
+    "aws-rfdk": "1.4.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,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.3.0"
+        "aws-cdk-lib==2.133.0",
+        "aws-rfdk==1.4.0"
     ],
 
     python_requires=">=3.7",

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/lib/service-tier.ts b/examples/deadline/Local-Zone/ts/lib/service-tier.ts
@@ -108,7 +108,7 @@ export class ServiceTier extends Stack {
         database: RemovalPolicy.DESTROY,
         filesystem: RemovalPolicy.DESTROY,
       },
-      repositoryInstallationTimeout: Duration.minutes(20),
+      repositoryInstallationTimeout: Duration.minutes(30),
       vpcSubnets: repositorySubnets,
     });
 

diff --git a/examples/deadline/Local-Zone/ts/package.json b/examples/deadline/Local-Zone/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-local-zone",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,13 +14,13 @@
   },
   "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-rfdk": "1.3.0",
+    "aws-cdk-lib": "2.133.0",
+    "aws-rfdk": "1.4.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/integ/components/deadline/deadline_01_repository/lib/repository-testing-tier.ts b/integ/components/deadline/deadline_01_repository/lib/repository-testing-tier.ts
@@ -115,7 +115,7 @@ export class RepositoryTestingTier extends TestingTier {
       'cd ~ec2-user',
       'mkdir -p testScripts',
       'cd testScripts',
-      'wget https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem',
+      'wget https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem',
     );
   }
 }
diff --git a/...ponents/deadline/deadline_01_repository/scripts/bastion/testing/DL-read-docdb-response.sh b/...ponents/deadline/deadline_01_repository/scripts/bastion/testing/DL-read-docdb-response.sh
@@ -29,7 +29,7 @@ if [ -d "$CERT" ]; then
   # The domain zone for the mongo instance used is hard-coded during setup
   DB_ADDRESS="mongo.renderfarm.local:27017"
 else
-  CERT_CA="./testScripts/rds-combined-ca-bundle.pem"
+  CERT_CA="./testScripts/global-bundle.pem"
 
   # DocDB contains the endpoint address to use in its secret
   ENDPOINT=$(jq -r '.host' <<< "$DB_SECRET_STRING")
@@ -38,7 +38,8 @@ else
 
 fi
 
-# Mongo command to query for "deadline10db" database
-mongo --quiet --ssl --host="$DB_ADDRESS" --sslCAFile="$CERT_CA" --username="$DB_USERNAME" --password="$DB_PASS" --eval='printjson( db.adminCommand( { listDatabases: 1, nameOnly: true, filter: { "name": "deadline10db" } } ) )'
-
+# Mongo command to query for "deadline10db" database.
+# We delete Timestamp fields from the EJSON result to avoid errors when parsing
+# them in Python.
+mongo --quiet --ssl --host="$DB_ADDRESS" --sslCAFile="$CERT_CA" --username="$DB_USERNAME" --password="$DB_PASS" --eval='(function(){var output=db.adminCommand({ listDatabases: 1, nameOnly: true, filter: { "name": "deadline10db" } } );delete output.onTime;delete output.operationTime;printjson(output)})()'
 exit 0
diff --git a/integ/jest.config.js b/integ/jest.config.js
@@ -4,7 +4,7 @@ module.exports = {
   transform: {
     '^.+\\.tsx?$': 'ts-jest'
   },
-  testTimeout: 60000,
+  testTimeout: 300000,
   setupFilesAfterEnv: [
     "<rootDir>/components/deadline/common/jest-matchers.js"
   ]

diff --git a/integ/lib/sep-worker-struct.ts b/integ/lib/sep-worker-struct.ts
@@ -54,7 +54,7 @@ export class SepWorkerStruct extends Construct {
         maxCapacity: 1,
         workerMachineImage: MachineImage.genericLinux({ [Stack.of(this).region]: linuxAmi }),
         deadlineGroups: ['sep_group'],
-        instanceTypes: [new InstanceType('t2.micro')],
+        instanceTypes: [new InstanceType('t3.micro')],
         logGroupProps: {
           logGroupPrefix: `/${Stack.of(this).stackName}-${id}/`,
           retention: RetentionDays.TWO_MONTHS,

diff --git a/integ/lib/storage-struct.ts b/integ/lib/storage-struct.ts
@@ -229,7 +229,7 @@ export class StorageStruct extends Construct {
       database: databaseConnection,
       fileSystem: deadlineMountableEfs,
       version: props.version,
-      repositoryInstallationTimeout: Duration.minutes(20),
+      repositoryInstallationTimeout: Duration.minutes(30),
       logGroupProps: {
         logGroupPrefix: `/${Stack.of(this).stackName}-${id}/`,
         retention: RetentionDays.TWO_MONTHS,