Skip to content

Commit 70b9736

Browse files
authored
Merge pull request #1395 from aws/bump/1.5.0
chore(release): 1.5.0
2 parents 2305d5c + 1495a83 commit 70b9736

File tree

102 files changed

+4703
-2363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+4703
-2363
lines changed

.github/workflows/auto-approve.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
auto-approve:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: hmarr/auto-approve-action@v3.2.1
13-
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
12+
- uses: hmarr/auto-approve-action@v4.0.0
13+
if: github.event.base.repo.id == github.event.head.repo.id && (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
1414
with:
1515
github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
-
1818
name: Run Labeler
1919
if: success()
20-
uses: crazy-max/ghaction-github-labeler@v5.0.0
20+
uses: crazy-max/ghaction-github-labeler@v5.1.0
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
yaml-file: .github/config/labels.yml

CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,39 @@
22

33
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.
44

5+
## [1.5.0](https://github.com/aws/aws-rfdk/compare/v1.4.0...v1.5.0) (2024-12-05)
6+
7+
8+
### Supported CDK Version
9+
10+
* [2.163.0](https://github.com/aws/aws-cdk/releases/tag/v2.163.0)
11+
12+
13+
### Officially Supported Deadline Versions
14+
15+
* [10.1.9.2 to 10.4.0.10](https://docs.thinkboxsoftware.com/products/deadline/10.4/1_User%20Manual/manual/release-notes.html)
16+
17+
18+
### ⚠ BREAKING CHANGES
19+
20+
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.
21+
22+
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).
23+
24+
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.
25+
26+
### Features
27+
28+
* **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))
29+
* **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))
30+
* Upgrades MongoDB version to 8.0 ([#1392](https://github.com/aws/aws-rfdk/issues/1392)) ([88dbeb0](https://github.com/aws/aws-rfdk/commit/88dbeb0040f54ad86aa0b3f9493448d214a64479))
31+
* 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))
32+
33+
34+
### Bug Fixes
35+
36+
* 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))
37+
538
## [1.4.0](https://github.com/aws/aws-rfdk/compare/v1.3.0...v1.4.0) (2024-08-09)
639

740

bump.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fi
6464
version_header="# \[$new_version](.*) (.*)"
6565

6666
# Add a section to the changelog that states the supported Deadline versions
67-
DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.3/1_User%20Manual/manual/release-notes.html"
67+
DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.4/1_User%20Manual/manual/release-notes.html"
6868
DEADLINE_SUPPORTED_VERSIONS=$(node ./scripts/getSupportedDeadlineVersions.ts)
6969
MIN_DEADLINE_VERSION=$(echo "$DEADLINE_SUPPORTED_VERSIONS" | grep 'Min' | cut -f 2 -d ' ')
7070
MAX_DEADLINE_VERSION=$(echo "$DEADLINE_SUPPORTED_VERSIONS" | grep 'Max' | cut -f 2 -d ' ')

clean.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ fi
1515
# Packaging directory
1616
rm -rf ./dist
1717

18+
# Integ test directory
19+
rm -rf "./integ/stage"
20+
rm -rf "./integ/.e2etemp"
21+
1822
echo "Done"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"app": "python -m package.app",
33
"context": {
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ def __init__(self):
3939
# to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.12"
4040
self.deadline_version: Optional[str] = None
4141

42-
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID
42+
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 AMI ID
4343
# 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
4444
# Deadline used in any connected Deadline constructs.
45-
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0b2bbe30ea8642cdd'}
45+
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0927eddb98f8160b3'}
4646

4747
# A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
4848
# This must be in the format `arn:<partition>:secretsmanager:<region>:<accountId>:secret:<secretName>-<6RandomCharacters`

examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk-lib==2.133.0",
21-
"aws-rfdk==1.4.0"
20+
"aws-cdk-lib==2.163.0",
21+
"aws-rfdk==1.5.0"
2222
],
2323

2424
python_requires=">=3.7",

examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ class AppConfig {
4040
public readonly deadlineVersion?: string;
4141

4242
/**
43-
* 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
43+
* 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
4444
* is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
4545
* Deadline used in any connected Deadline constructs.
4646
*/
47-
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0b2bbe30ea8642cdd'};
47+
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0927eddb98f8160b3'};
4848

4949
/**
5050
* (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"app": "npx ts-node bin/app.ts",
33
"context": {
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/storage-tier.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ export class StorageTierDocDB extends StorageTier {
325325
masterUser: {
326326
username: 'adminuser',
327327
},
328-
engineVersion: '3.6.0',
328+
engineVersion: '5.0.0',
329329
backup: {
330330
// We recommend setting the retention of your backups to 15 days
331331
// for security reasons. The default retention is just one day.
@@ -428,7 +428,7 @@ export class StorageTierMongoDB extends StorageTier {
428428
instanceType: props.databaseInstanceType,
429429
mongoDb: {
430430
userSsplAcceptance: props.acceptSsplLicense,
431-
version: MongoDbVersion.COMMUNITY_3_6,
431+
version: MongoDbVersion.COMMUNITY_8_0,
432432
hostname: 'mongo',
433433
dnsZone: props.dnsZone,
434434
serverCertificate: serverCert,

examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-basic",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -14,13 +14,13 @@
1414
},
1515
"devDependencies": {
1616
"@types/node": "18.11.19",
17-
"aws-cdk": "2.133.0",
17+
"aws-cdk": "2.163.0",
1818
"ts-node": "^10.9.2",
19-
"typescript": "~5.1.6"
19+
"typescript": "~5.4.5"
2020
},
2121
"dependencies": {
22-
"aws-cdk-lib": "2.133.0",
23-
"aws-rfdk": "1.4.0",
22+
"aws-cdk-lib": "2.163.0",
23+
"aws-rfdk": "1.5.0",
2424
"source-map-support": "^0.5.21"
2525
}
2626
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"app": "python -m package.app",
33
"context": {
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ class AppConfig:
1212
TODO: Fill these in with your own values.
1313
"""
1414
def __init__(self):
15-
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID
15+
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 AMI ID
1616
# from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
1717
# should match the one used for staging the render queue and usage based licensing recipes.
18-
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0b2bbe30ea8642cdd'}
18+
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0927eddb98f8160b3'}
1919

2020
# Whether the DeadlineResourceTrackerAccessRole IAM role required by Deadline's Resource Tracker should be created in this CDK app.
2121
#

examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk-lib==2.133.0",
21-
"aws-rfdk==1.4.0"
20+
"aws-cdk-lib==2.163.0",
21+
"aws-rfdk==1.5.0"
2222
],
2323

2424
python_requires=">=3.7",

examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import 'source-map-support/register';
1212
*/
1313
class AppConfig {
1414
/**
15-
* 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
15+
* 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
1616
* is filled in. It can be used as-is, added to, or replaced.
1717
*/
18-
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0b2bbe30ea8642cdd'};
18+
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0927eddb98f8160b3'};
1919

2020
/**
2121
* Whether the DeadlineResourceTrackerAccessRole IAM role required by Deadline's Resource Tracker should be created in this CDK app.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"app": "npx ts-node bin/app.ts",
33
"context": {
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-sep",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -19,13 +19,13 @@
1919
},
2020
"devDependencies": {
2121
"@types/node": "18.11.19",
22-
"aws-cdk": "2.133.0",
22+
"aws-cdk": "2.163.0",
2323
"ts-node": "^10.9.2",
24-
"typescript": "~5.1.6"
24+
"typescript": "~5.4.5"
2525
},
2626
"dependencies": {
27-
"aws-cdk-lib": "2.133.0",
28-
"aws-rfdk": "1.4.0",
27+
"aws-cdk-lib": "2.163.0",
28+
"aws-rfdk": "1.5.0",
2929
"constructs": "^10.0.0",
3030
"source-map-support": "^0.5.21"
3131
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"app": "python -m package.app",
33
"context": {
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

examples/deadline/EC2-Image-Builder/python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk-lib==2.133.0",
21-
"aws-rfdk==1.4.0",
20+
"aws-cdk-lib==2.163.0",
21+
"aws-rfdk==1.5.0",
2222
],
2323

2424
python_requires=">=3.7",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"app": "npx ts-node bin/app.ts",
33
"context": {
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

examples/deadline/EC2-Image-Builder/ts/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-image-builder",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -15,13 +15,13 @@
1515
},
1616
"devDependencies": {
1717
"@types/node": "18.11.19",
18-
"aws-cdk": "2.133.0",
18+
"aws-cdk": "2.163.0",
1919
"ts-node": "^10.9.2",
20-
"typescript": "~5.1.6"
20+
"typescript": "~5.4.5"
2121
},
2222
"dependencies": {
23-
"aws-cdk-lib": "2.133.0",
24-
"aws-rfdk": "1.4.0",
23+
"aws-cdk-lib": "2.163.0",
24+
"aws-rfdk": "1.5.0",
2525
"constructs": "^10.0.0",
2626
"source-map-support": "^0.5.21"
2727
}

examples/deadline/Local-Zone/python/package/lib/config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ def __init__(self):
3636

3737
# The version of Deadline to use on the render farm. Leave as None for the latest release or specify a version
3838
# to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.16"
39-
# The default value of 10.3.2 is used, to match the worker AMI ID provided below
40-
self.deadline_version: Optional[str] = '10.3.2'
39+
# The default value of 10.4.0 is used, to match the worker AMI ID provided below
40+
self.deadline_version: Optional[str] = '10.4.0'
4141

42-
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.2.1 AMI ID
42+
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.4.0.10 AMI ID
4343
# from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
4444
# should match the one used for staging the render queue and usage based licensing recipes.
45-
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0b2bbe30ea8642cdd'}
45+
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0927eddb98f8160b3'}
4646

4747
# (Optional) The name of the EC2 keypair to associate with the instances.
4848
self.key_pair_name: Optional[str] = None

examples/deadline/Local-Zone/python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk-lib==2.133.0",
21-
"aws-rfdk==1.4.0"
20+
"aws-cdk-lib==2.163.0",
21+
"aws-rfdk==1.5.0"
2222
],
2323

2424
python_requires=">=3.7",

examples/deadline/Local-Zone/ts/bin/config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ class AppConfig {
3636
/**
3737
* The version of Deadline to use on the render farm. Some examples of pinned version values are "10", "10.1", or
3838
* "10.1.16"
39-
* @default 10.3.2 is used, to match the worker AMI ID provided below
39+
* @default 10.4.0 is used, to match the worker AMI ID provided below
4040
*/
41-
public readonly deadlineVersion: string = '10.3.2';
41+
public readonly deadlineVersion: string = '10.4.0';
4242

4343
/**
44-
* 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
44+
* 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
4545
* is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the one in
4646
* package.json used for staging the render queue and usage based licensing recipes.
4747
*/
48-
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0b2bbe30ea8642cdd'};
48+
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0927eddb98f8160b3'};
4949

5050
/**
5151
* (Optional) The name of the EC2 keypair to associate with instances.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"app": "npx ts-node bin/app.ts",
33
"context": {
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

examples/deadline/Local-Zone/ts/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-local-zone",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -14,13 +14,13 @@
1414
},
1515
"devDependencies": {
1616
"@types/node": "18.11.19",
17-
"aws-cdk": "2.133.0",
17+
"aws-cdk": "2.163.0",
1818
"ts-node": "^10.9.2",
19-
"typescript": "~5.1.6"
19+
"typescript": "~5.4.5"
2020
},
2121
"dependencies": {
22-
"aws-cdk-lib": "2.133.0",
23-
"aws-rfdk": "1.4.0",
22+
"aws-cdk-lib": "2.163.0",
23+
"aws-rfdk": "1.5.0",
2424
"constructs": "^10.0.0",
2525
"source-map-support": "^0.5.21"
2626
}

integ/cdk.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"context": {
3-
"@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true
3+
"@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
4+
"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true
45
}
56
}

0 commit comments

Comments
 (0)