Merge pull request #1395 from aws/bump/1.5.0

chore(release): 1.5.0
aws · Dec 10, 2024 · 70b9736 · 70b9736
2 parents 2305d5c + 1495a83
commit 70b9736
Show file tree

Hide file tree

Showing 102 changed files with 4,703 additions and 2,363 deletions.
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -9,7 +9,7 @@ jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - uses: hmarr/auto-approve-action@v3.2.1
-      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+    - uses: hmarr/auto-approve-action@v4.0.0
+      if: github.event.base.repo.id == github.event.head.repo.id && (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -17,7 +17,7 @@ jobs:
       -
         name: Run Labeler
         if: success()
-        uses: crazy-max/ghaction-github-labeler@v5.0.0
+        uses: crazy-max/ghaction-github-labeler@v5.1.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           yaml-file: .github/config/labels.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,39 @@
 
 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.5.0](https://github.com/aws/aws-rfdk/compare/v1.4.0...v1.5.0) (2024-12-05)
+
+
+### Supported CDK Version
+
+* [2.163.0](https://github.com/aws/aws-cdk/releases/tag/v2.163.0)
+
+
+### Officially Supported Deadline Versions
+
+* [10.1.9.2 to 10.4.0.10](https://docs.thinkboxsoftware.com/products/deadline/10.4/1_User%20Manual/manual/release-notes.html)
+
+
+### ⚠ BREAKING CHANGES
+
+In this release, we updated the default versions of DocumentDB and MongoDB. Make sure to backup your databases before updating to RFDK 1.5. See our documentation on [upgrading to RFDK 1.5](https://github.com/aws/aws-rfdk/blob/v1.5.0/packages/aws-rfdk/docs/upgrade/upgrading-1.5.md) for more information.
+
+We upgraded the default DocumentDB version to 5.0.0 ([#1364](https://github.com/aws/aws-rfdk/issues/1364)). Note that you may lose data and your deployment may fail if you have existing stacks with previous DocumentDB versions, so you must [manually upgrade DocumentDB first](https://github.com/aws/aws-rfdk/blob/v1.5.0/packages/aws-rfdk/docs/upgrade/upgrading-1.5.md#updating-documentdb).
+
+We upgraded the default MongoDB version to 8.0 ([#1392](https://github.com/aws/aws-rfdk/issues/1392)). Note that deployments with an existing MongoDB version lower than 8.0 will not automatically upgrade to the new version.
+
+### Features
+
+* **core:** Add support for Deadline 10.4.0 ([#1389](https://github.com/aws/aws-rfdk/issues/1389)) ([db0d582](https://github.com/aws/aws-rfdk/commit/db0d582106cab674dbeaa948315dbd6abeb74d84))
+* **deadline:** Allow passing Context to SEP config ([#1211](https://github.com/aws/aws-rfdk/issues/1211)) ([08b3672](https://github.com/aws/aws-rfdk/commit/08b3672750f344635456d65527c5a4e3972bf78e))
+* Upgrades MongoDB version to 8.0 ([#1392](https://github.com/aws/aws-rfdk/issues/1392)) ([88dbeb0](https://github.com/aws/aws-rfdk/commit/88dbeb0040f54ad86aa0b3f9493448d214a64479))
+* Upgrades DocumentDB version to 5.0.0 ([#1364](https://github.com/aws/aws-rfdk/issues/1364)) ([f0ca078](https://github.com/aws/aws-rfdk/commit/f0ca078996b5210690e7f776a5807aa08ed10c07))
+
+
+### Bug Fixes
+
+* Add Launch Config feature flag to unblock deployments in new accounts ([#1365](https://github.com/aws/aws-rfdk/issues/1365)) ([79490d9](https://github.com/aws/aws-rfdk/commit/79490d98d7ca36d5b3a28c220fff1375abcaadbd))
+
 ## [1.4.0](https://github.com/aws/aws-rfdk/compare/v1.3.0...v1.4.0) (2024-08-09)
 
 

diff --git a/bump.sh b/bump.sh
@@ -64,7 +64,7 @@ fi
 version_header="# \[$new_version](.*) (.*)"
 
 # Add a section to the changelog that states the supported Deadline versions
-DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.3/1_User%20Manual/manual/release-notes.html"
+DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.4/1_User%20Manual/manual/release-notes.html"
 DEADLINE_SUPPORTED_VERSIONS=$(node ./scripts/getSupportedDeadlineVersions.ts)
 MIN_DEADLINE_VERSION=$(echo "$DEADLINE_SUPPORTED_VERSIONS" | grep 'Min' | cut -f 2 -d ' ')
 MAX_DEADLINE_VERSION=$(echo "$DEADLINE_SUPPORTED_VERSIONS" | grep 'Max' | cut -f 2 -d ' ')

diff --git a/clean.sh b/clean.sh
@@ -15,4 +15,8 @@ fi
 # Packaging directory
 rm -rf ./dist
 
+# Integ test directory
+rm -rf "./integ/stage"
+rm -rf "./integ/.e2etemp"
+
 echo "Done"
diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/cdk.json
@@ -1,5 +1,6 @@
 {
   "app": "python -m package.app",
   "context": {
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }
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.2.1 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 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-0b2bbe30ea8642cdd'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0927eddb98f8160b3'}
 
         # 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.133.0",
-        "aws-rfdk==1.4.0"
+        "aws-cdk-lib==2.163.0",
+        "aws-rfdk==1.5.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.2.1 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 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-0b2bbe30ea8642cdd'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0927eddb98f8160b3'};
 
   /**
    * (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/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/cdk.json
@@ -1,5 +1,6 @@
 {
   "app": "npx ts-node bin/app.ts",
   "context": {
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }
diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/storage-tier.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/storage-tier.ts
@@ -325,7 +325,7 @@ export class StorageTierDocDB extends StorageTier {
       masterUser: {
         username: 'adminuser',
       },
-      engineVersion: '3.6.0',
+      engineVersion: '5.0.0',
       backup: {
         // We recommend setting the retention of your backups to 15 days
         // for security reasons. The default retention is just one day.
@@ -428,7 +428,7 @@ export class StorageTierMongoDB extends StorageTier {
       instanceType: props.databaseInstanceType,
       mongoDb: {
         userSsplAcceptance: props.acceptSsplLicense,
-        version: MongoDbVersion.COMMUNITY_3_6,
+        version: MongoDbVersion.COMMUNITY_8_0,
         hostname: 'mongo',
         dnsZone: props.dnsZone,
         serverCertificate: serverCert,

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.4.0",
+  "version": "1.5.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,13 +14,13 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.133.0",
+    "aws-cdk": "2.163.0",
     "ts-node": "^10.9.2",
-    "typescript": "~5.1.6"
+    "typescript": "~5.4.5"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.133.0",
-    "aws-rfdk": "1.4.0",
+    "aws-cdk-lib": "2.163.0",
+    "aws-rfdk": "1.5.0",
     "source-map-support": "^0.5.21"
   }
 }
diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/cdk.json
@@ -1,5 +1,6 @@
 {
   "app": "python -m package.app",
   "context": {
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }
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.2.1 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 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-0b2bbe30ea8642cdd'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0927eddb98f8160b3'}
 
         # 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.133.0",
-        "aws-rfdk==1.4.0"
+        "aws-cdk-lib==2.163.0",
+        "aws-rfdk==1.5.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.2.1 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 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-0b2bbe30ea8642cdd'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0927eddb98f8160b3'};
 
   /**
    * 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/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/cdk.json
@@ -1,5 +1,6 @@
 {
   "app": "npx ts-node bin/app.ts",
   "context": {
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }
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.4.0",
+  "version": "1.5.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -19,13 +19,13 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.133.0",
+    "aws-cdk": "2.163.0",
     "ts-node": "^10.9.2",
-    "typescript": "~5.1.6"
+    "typescript": "~5.4.5"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.133.0",
-    "aws-rfdk": "1.4.0",
+    "aws-cdk-lib": "2.163.0",
+    "aws-rfdk": "1.5.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/examples/deadline/EC2-Image-Builder/python/cdk.json b/examples/deadline/EC2-Image-Builder/python/cdk.json
@@ -1,5 +1,6 @@
 {
   "app": "python -m package.app",
   "context": {
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }
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.133.0",
-        "aws-rfdk==1.4.0",
+        "aws-cdk-lib==2.163.0",
+        "aws-rfdk==1.5.0",
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/EC2-Image-Builder/ts/cdk.json b/examples/deadline/EC2-Image-Builder/ts/cdk.json
@@ -1,5 +1,6 @@
 {
   "app": "npx ts-node bin/app.ts",
   "context": {
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }
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.4.0",
+  "version": "1.5.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -15,13 +15,13 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.133.0",
+    "aws-cdk": "2.163.0",
     "ts-node": "^10.9.2",
-    "typescript": "~5.1.6"
+    "typescript": "~5.4.5"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.133.0",
-    "aws-rfdk": "1.4.0",
+    "aws-cdk-lib": "2.163.0",
+    "aws-rfdk": "1.5.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.2 is used, to match the worker AMI ID provided below
-        self.deadline_version: Optional[str] = '10.3.2'
+        # The default value of 10.4.0 is used, to match the worker AMI ID provided below
+        self.deadline_version: Optional[str] = '10.4.0'
 
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 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-0b2bbe30ea8642cdd'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0927eddb98f8160b3'}
 
         # (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.133.0",
-        "aws-rfdk==1.4.0"
+        "aws-cdk-lib==2.163.0",
+        "aws-rfdk==1.5.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.2 is used, to match the worker AMI ID provided below
+   * @default 10.4.0 is used, to match the worker AMI ID provided below
    */
-  public readonly deadlineVersion: string = '10.3.2';
+  public readonly deadlineVersion: string = '10.4.0';
 
   /**
-   * 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
+   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.4.0.10 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-0b2bbe30ea8642cdd'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0927eddb98f8160b3'};
 
   /**
    * (Optional) The name of the EC2 keypair to associate with instances.

diff --git a/examples/deadline/Local-Zone/ts/cdk.json b/examples/deadline/Local-Zone/ts/cdk.json
@@ -1,5 +1,6 @@
 {
   "app": "npx ts-node bin/app.ts",
   "context": {
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }
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.4.0",
+  "version": "1.5.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,13 +14,13 @@
   },
   "devDependencies": {
     "@types/node": "18.11.19",
-    "aws-cdk": "2.133.0",
+    "aws-cdk": "2.163.0",
     "ts-node": "^10.9.2",
-    "typescript": "~5.1.6"
+    "typescript": "~5.4.5"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.133.0",
-    "aws-rfdk": "1.4.0",
+    "aws-cdk-lib": "2.163.0",
+    "aws-rfdk": "1.5.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/integ/cdk.json b/integ/cdk.json
@@ -1,5 +1,6 @@
 {
   "context": {
-    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true
+    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
   }
 }