Skip to content

Commit 8e8b169

Browse files
marofkemarofke
authored
Merge pull request #1172 from aws/bump/1.3.0
chore(release): 1.3.0
2 parents 5dc942d + 28fbe6c commit 8e8b169

File tree

113 files changed

+4043
-4112
lines changed

Some content is hidden

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

113 files changed

+4043
-4112
lines changed

‎.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ updates:
1515
versions: ">=11.0.0-0"
1616
- dependency-name: "constructs"
1717
versions: ">=3.0.4"
18+
- dependency-name: "aws-cdk-lib"
19+
- dependency-name: "aws-cdk"
1820
- dependency-name: "@aws-cdk/*"
1921
- dependency-name: "jsii*"
2022
- dependency-name: "awslint"
23+
- dependency-name: "typescript"
2124
commit-message:
2225
prefix: "chore(deps):"
2326
- package-ecosystem: "github-actions"

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
node-version: [14.x, 16.x, 18.x]
21+
node-version: [18.x, 20.x]
2222

2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- name: Use Node.js ${{ matrix.node-version }}
26-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2727
with:
2828
node-version: ${{ matrix.node-version }}
2929
- run: npm install --global yarn

‎.github/workflows/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
steps:
1414
-
1515
name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
-
1818
name: Run Labeler
1919
if: success()
20-
uses: crazy-max/ghaction-github-labeler@v4.1.0
20+
uses: crazy-max/ghaction-github-labeler@v5.0.0
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
yaml-file: .github/config/labels.yml

‎CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,30 @@
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.3.0](https://github.com/aws/aws-rfdk/compare/v1.2.0...v1.3.0) (2023-12-22)
6+
7+
Note: Node 14 is End of Life and RFDK >= 1.3.x no longer officially supports it. Node.js 18.0.0 is now
8+
the minimum officially supported version that RFDK now supports. See our documentation on [upgrading to RFDK 1.3](https://github.com/aws/aws-rfdk/blob/v1.3.0/packages/aws-rfdk/docs/upgrade/upgrading-1.3.md).
9+
10+
### Supported CDK Version
11+
12+
* [2.114.1](https://github.com/aws/aws-cdk/releases/tag/v2.114.1)
13+
14+
15+
### Officially Supported Deadline Versions
16+
17+
* [10.1.9.2 to 10.3.1.4](https://docs.thinkboxsoftware.com/products/deadline/10.3/1_User%20Manual/manual/release-notes.html)
18+
19+
20+
### Features
21+
22+
* **deadline:** DocumentDB engine version support upgraded upto version 5.0 ([#1155](https://github.com/aws/aws-rfdk/issues/1155)) ([7905f91](https://github.com/aws/aws-rfdk/commit/7905f9192f0c370f2c5be1e23a176e8f33800d75))
23+
24+
25+
### Bug Fixes
26+
27+
* add usage-based licensing ports for new Cinema4d versions ([#1142](https://github.com/aws/aws-rfdk/pull/1142)) ([213605d](https://github.com/aws/aws-rfdk/commit/213605d2862c524a2b32718286d28e9a8203596a))
28+
529
## [1.2.0](https://github.com/aws/aws-rfdk/compare/v1.1.0...v1.2.0) (2023-03-28)
630

731

‎CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ and let us know if it's not up-to-date (even better, submit a PR with your corr
2727
The RFDK is written in Typescript and converted, using [jsii](https://github.com/aws/jsii), into Python. Thus, the
2828
minimal development environment must include:
2929

30-
- Node.js >= 14.19.3
30+
- Node.js >= 18.0.0
3131
- docker >= 18
3232

3333
We also recommend developing on a Linux system.
@@ -39,10 +39,10 @@ the [instructions](https://github.com/nvm-sh/nvm#installing-and-updating) to ins
3939
then you can install a version of Node.js and set your shell to make it available when you login:
4040

4141
```bash
42-
# For example, the latest version of Node.js 14.x
42+
# For example, the latest version of Node.js 18.x
4343

4444
# Find out the version number for latest
45-
LATEST_VERSION=$(nvm ls-remote | grep v14 | grep 'Latest' | awk '{print $1}')
45+
LATEST_VERSION=$(nvm ls-remote | grep v18 | grep 'Latest' | awk '{print $1}')
4646

4747
# Install it
4848
nvm install ${LATEST_VERSION}
@@ -77,9 +77,9 @@ The developers actively use Linux for development, but macOS and the Windows Sub
7777

7878
```bash
7979
# From the root directory of this repository
80-
./build.sh
80+
yarn build
8181

82-
# Once you've run ./build.sh from the root directory at least once, then
82+
# Once you've run "yarn build" from the root directory at least once, then
8383
# you can do subsequent build & test iterations from the RFDK package directory to save time.
8484
cd packages/aws-rfdk
8585
yarn build+test
@@ -155,7 +155,7 @@ yarn clean
155155
./clean.sh
156156
157157
# Rebuild
158-
./build.sh
158+
yarn build
159159
```
160160
161161
If that does not work, then you might try the following nuclear option. **WARNING** -- this will

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ It offers high-level object-oriented abstractions to define render farm infrastr
88
using the power of Python and Typescript.
99

1010
The RFDK is available in:
11-
- Javascript, Typescript ([Node.js >= 14.19.3](https://nodejs.org/download/release/latest-v14.x/))
11+
- Javascript, Typescript ([Node.js >= 18.0.0](https://nodejs.org/download/release/latest-v18.x/) officially supported, [Node.js >= 14.15.0](https://nodejs.org/download/release/latest-v14.x/) unofficially supported)
1212
- We recommend using an [Active LTS Release](https://nodejs.org/en/about/releases/)
1313
- Python ([Python >= 3.6](https://www.python.org/downloads/))
1414

‎buildspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ phases:
1010
- yarn install --frozen-lockfile
1111
build:
1212
commands:
13-
- /bin/bash ./build.sh
13+
- yarn run build
1414
post_build:
1515
commands:
16-
- "[ -f .BUILD_COMPLETED ] && /bin/bash ./pack.sh"
16+
- "[ -f .BUILD_COMPLETED ] && yarn run pack"
1717
artifacts:
1818
files:
1919
- "**/*"

‎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.2/1_User%20Manual/manual/release-notes.html"
67+
DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.3/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 ' ')

‎examples/deadline/All-In-AWS-Infrastructure-Basic/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ These instructions assume that your working directory is `examples/deadline/All-
2222
```bash
2323
# Navigate to the root directory of the RFDK repository
2424
pushd ../../../..
25-
./build.sh
25+
yarn build
2626
# Enter the Docker container to run the pack scripts
2727
./scripts/rfdk_build_environment.sh
2828
./pack.sh

‎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.1.19.4 AMI ID
42+
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 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-04ae356533dc07fb5'}
45+
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
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.70.0",
21-
"aws-rfdk==1.2.0"
20+
"aws-cdk-lib==2.114.1",
21+
"aws-rfdk==1.3.0"
2222
],
2323

2424
python_requires=">=3.7",

‎examples/deadline/All-In-AWS-Infrastructure-Basic/ts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ These instructions assume that your working directory is `examples/deadline/All-
144144
```bash
145145
# Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
146146
pushd ../../../..
147-
./build.sh
147+
yarn build
148148
# Navigate back to the example directory
149149
popd
150150
# Run the example's build

‎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.1.20.2 AMI ID from us-west-2
43+
* 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
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-0814954855da0e4c3'};
47+
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
4848

4949
/**
5050
* (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-basic",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -13,14 +13,14 @@
1313
"watch": "tsc -w"
1414
},
1515
"devDependencies": {
16-
"@types/node": "^18.0.0",
17-
"aws-cdk": "2.70.0",
18-
"ts-node": "^10.8.1",
19-
"typescript": "~4.9.5"
16+
"@types/node": "18.11.19",
17+
"aws-cdk": "2.114.1",
18+
"ts-node": "^10.9.2",
19+
"typescript": "~5.1.6"
2020
},
2121
"dependencies": {
22-
"aws-cdk-lib": "2.70.0",
23-
"aws-rfdk": "1.2.0",
22+
"aws-cdk-lib": "2.114.1",
23+
"aws-rfdk": "1.3.0",
2424
"source-map-support": "^0.5.21"
2525
}
2626
}

‎examples/deadline/All-In-AWS-Infrastructure-SEP/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ These instructions assume that your working directory is `examples/deadline/All-
2424
```bash
2525
# Navigate to the root directory of the RFDK repository
2626
pushd ../../../..
27-
./build.sh
27+
yarn build
2828
# Enter the Docker container to run thepack scripts
2929
./scripts/rfdk_build_environment.sh
3030
./pack.sh

‎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.1.19.4 AMI ID
15+
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 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-04ae356533dc07fb5'}
18+
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
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.70.0",
21-
"aws-rfdk==1.2.0"
20+
"aws-cdk-lib==2.114.1",
21+
"aws-rfdk==1.3.0"
2222
],
2323

2424
python_requires=">=3.7",

‎examples/deadline/All-In-AWS-Infrastructure-SEP/ts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ These instructions assume that your working directory is `examples/deadline/All-
4747
```bash
4848
# Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
4949
pushd ../../../..
50-
./build.sh
50+
yarn build
5151
# Navigate back to the example directory
5252
popd
5353
# Run the example's build

‎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.1.20.2 AMI ID from us-west-2
15+
* 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
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-0814954855da0e4c3'};
18+
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
1919

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

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-sep",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -18,14 +18,14 @@
1818
"watch": "tsc -w"
1919
},
2020
"devDependencies": {
21-
"@types/node": "^18.0.0",
22-
"aws-cdk": "2.70.0",
23-
"ts-node": "^10.8.1",
24-
"typescript": "~4.9.5"
21+
"@types/node": "18.11.19",
22+
"aws-cdk": "2.114.1",
23+
"ts-node": "^10.9.2",
24+
"typescript": "~5.1.6"
2525
},
2626
"dependencies": {
27-
"aws-cdk-lib": "2.70.0",
28-
"aws-rfdk": "1.2.0",
27+
"aws-cdk-lib": "2.114.1",
28+
"aws-rfdk": "1.3.0",
2929
"constructs": "^10.0.0",
3030
"source-map-support": "^0.5.21"
3131
}

‎examples/deadline/EC2-Image-Builder/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ These instructions assume that your working directory is `examples/deadline/EC2-
2424
```bash
2525
# Navigate to the root directory of the RFDK repository
2626
pushd ../../../..
27-
./build.sh
27+
yarn build
2828
# Enter the Docker container to run the pack scripts
2929
./scripts/rfdk_build_environment.sh
3030
./pack.sh

‎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.70.0",
21-
"aws-rfdk==1.2.0",
20+
"aws-cdk-lib==2.114.1",
21+
"aws-rfdk==1.3.0",
2222
],
2323

2424
python_requires=">=3.7",

‎examples/deadline/EC2-Image-Builder/ts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ These instructions assume that your working directory is `examples/deadline/EC2-
3333
```bash
3434
# Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
3535
pushd ../../../..
36-
./build.sh
36+
yarn build
3737
# Navigate back to the example directory
3838
popd
3939
# Run the example's build

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-image-builder",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -14,14 +14,14 @@
1414
"watch": "tsc -w"
1515
},
1616
"devDependencies": {
17-
"@types/node": "^18.0.0",
18-
"aws-cdk": "2.70.0",
19-
"ts-node": "^10.8.1",
20-
"typescript": "~4.9.5"
17+
"@types/node": "18.11.19",
18+
"aws-cdk": "2.114.1",
19+
"ts-node": "^10.9.2",
20+
"typescript": "~5.1.6"
2121
},
2222
"dependencies": {
23-
"aws-cdk-lib": "2.70.0",
24-
"aws-rfdk": "1.2.0",
23+
"aws-cdk-lib": "2.114.1",
24+
"aws-rfdk": "1.3.0",
2525
"constructs": "^10.0.0",
2626
"source-map-support": "^0.5.21"
2727
}

‎examples/deadline/Local-Zone/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ These instructions assume that your working directory is `examples/deadline/Loca
2424
```bash
2525
# Navigate to the root directory of the RFDK repository
2626
pushd ../../../..
27-
./build.sh
27+
yarn build
2828
# Enter the Docker container to run the build and pack scripts
2929
./scripts/rfdk_build_environment.sh
3030
./pack.sh

0 commit comments

Comments
 (0)