Merge pull request #1172 from aws/bump/1.3.0

chore(release): 1.3.0
aws · Dec 22, 2023 · 8e8b169 · 8e8b169
2 parents 5dc942d + 28fbe6c
commit 8e8b169
Show file tree

Hide file tree

Showing 113 changed files with 4,043 additions and 4,112 deletions.
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/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,12 +18,12 @@ jobs:
 
  strategy:
  matrix:
- node-version: [14.x, 16.x, 18.x]
+ node-version: [18.x, 20.x]
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ matrix.node-version }}
  - run: npm install --global yarn

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -13,11 +13,11 @@ jobs:
  steps:
  -
  name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  -
  name: Run Labeler
  if: success()
- uses: crazy-max/ghaction-github-labeler@v4.1.0
+ uses: crazy-max/ghaction-github-labeler@v5.0.0
  with:
  github-token: ${{ secrets.GITHUB_TOKEN }}
  yaml-file: .github/config/labels.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 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.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
+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).
+
+### Supported CDK Version
+
+* [2.114.1](https://github.com/aws/aws-cdk/releases/tag/v2.114.1)
+
+
+### 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)
+
+
+### Features
+
+* **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))
+
+
+### Bug Fixes
+
+* 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))
+
 ## [1.2.0](https://github.com/aws/aws-rfdk/compare/v1.1.0...v1.2.0) (2023-03-28)
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ and let us know if it's not up-to-date (even better, submit a PR with your corr
 The RFDK is written in Typescript and converted, using [jsii](https://github.com/aws/jsii), into Python. Thus, the
 minimal development environment must include:
 
-- Node.js >= 14.19.3
+- Node.js >= 18.0.0
 - docker >= 18
 
 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
 then you can install a version of Node.js and set your shell to make it available when you login:
 
 ```bash
-# For example, the latest version of Node.js 14.x
+# For example, the latest version of Node.js 18.x
 
 # Find out the version number for latest
-LATEST_VERSION=$(nvm ls-remote | grep v14 | grep 'Latest' | awk '{print $1}')
+LATEST_VERSION=$(nvm ls-remote | grep v18 | grep 'Latest' | awk '{print $1}')
 
 # Install it
 nvm install ${LATEST_VERSION}
@@ -77,9 +77,9 @@ The developers actively use Linux for development, but macOS and the Windows Sub
 
  ```bash
  # From the root directory of this repository
- ./build.sh
+ yarn build
 
- # Once you've run ./build.sh from the root directory at least once, then
+ # Once you've run "yarn build" from the root directory at least once, then
  # you can do subsequent build & test iterations from the RFDK package directory to save time.
  cd packages/aws-rfdk
  yarn build+test
@@ -155,7 +155,7 @@ yarn clean
 ./clean.sh
 
 # Rebuild
-./build.sh
+yarn build
 ```
 
 If that does not work, then you might try the following nuclear option. **WARNING** -- this will

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ It offers high-level object-oriented abstractions to define render farm infrastr
 using the power of Python and Typescript.
 
 The RFDK is available in:
-- Javascript, Typescript ([Node.js >= 14.19.3](https://nodejs.org/download/release/latest-v14.x/))
+- 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)
  - We recommend using an [Active LTS Release](https://nodejs.org/en/about/releases/)
 - Python ([Python >= 3.6](https://www.python.org/downloads/))
 

diff --git a/buildspec.yaml b/buildspec.yaml
@@ -10,10 +10,10 @@ phases:
  - yarn install --frozen-lockfile
  build:
  commands:
- - /bin/bash ./build.sh
+ - yarn run build
  post_build:
  commands:
- - "[ -f .BUILD_COMPLETED ] && /bin/bash ./pack.sh"
+ - "[ -f .BUILD_COMPLETED ] && yarn run pack"
 artifacts:
  files:
  - "**/*"

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.2/1_User%20Manual/manual/release-notes.html"
+DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.3/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/examples/deadline/All-In-AWS-Infrastructure-Basic/python/README.md b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/README.md
@@ -22,7 +22,7 @@ These instructions assume that your working directory is `examples/deadline/All-
  ```bash
  # Navigate to the root directory of the RFDK repository
  pushd ../../../..
- ./build.sh
+ yarn build
  # Enter the Docker container to run the pack scripts
  ./scripts/rfdk_build_environment.sh
  ./pack.sh

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

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/README.md b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/README.md
@@ -144,7 +144,7 @@ These instructions assume that your working directory is `examples/deadline/All-
  ```bash
  # Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
  pushd ../../../..
- ./build.sh
+ yarn build
  # Navigate back to the example directory
  popd
  # Run the example's build

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
@@ -1,6 +1,6 @@
 {
  "name": "all-in-farm-basic",
- "version": "1.2.0",
+ "version": "1.3.0",
  "bin": {
  "app": "bin/app.js"
  },
@@ -13,14 +13,14 @@
  "watch": "tsc -w"
  },
  "devDependencies": {
- "@types/node": "^18.0.0",
- "aws-cdk": "2.70.0",
- "ts-node": "^10.8.1",
- "typescript": "~4.9.5"
+ "@types/node": "18.11.19",
+ "aws-cdk": "2.114.1",
+ "ts-node": "^10.9.2",
+ "typescript": "~5.1.6"
  },
  "dependencies": {
- "aws-cdk-lib": "2.70.0",
- "aws-rfdk": "1.2.0",
+ "aws-cdk-lib": "2.114.1",
+ "aws-rfdk": "1.3.0",
  "source-map-support": "^0.5.21"
  }
 }
diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/README.md b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/README.md
@@ -24,7 +24,7 @@ These instructions assume that your working directory is `examples/deadline/All-
  ```bash
  # Navigate to the root directory of the RFDK repository
  pushd ../../../..
- ./build.sh
+ yarn build
  # Enter the Docker container to run thepack scripts
  ./scripts/rfdk_build_environment.sh
  ./pack.sh

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

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/README.md b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/README.md
@@ -47,7 +47,7 @@ These instructions assume that your working directory is `examples/deadline/All-
  ```bash
  # Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
  pushd ../../../..
- ./build.sh
+ yarn build
  # Navigate back to the example directory
  popd
  # Run the example's build

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
@@ -1,6 +1,6 @@
 {
  "name": "all-in-farm-sep",
- "version": "1.2.0",
+ "version": "1.3.0",
  "bin": {
  "app": "bin/app.js"
  },
@@ -18,14 +18,14 @@
  "watch": "tsc -w"
  },
  "devDependencies": {
- "@types/node": "^18.0.0",
- "aws-cdk": "2.70.0",
- "ts-node": "^10.8.1",
- "typescript": "~4.9.5"
+ "@types/node": "18.11.19",
+ "aws-cdk": "2.114.1",
+ "ts-node": "^10.9.2",
+ "typescript": "~5.1.6"
  },
  "dependencies": {
- "aws-cdk-lib": "2.70.0",
- "aws-rfdk": "1.2.0",
+ "aws-cdk-lib": "2.114.1",
+ "aws-rfdk": "1.3.0",
  "constructs": "^10.0.0",
  "source-map-support": "^0.5.21"
  }

diff --git a/examples/deadline/EC2-Image-Builder/python/README.md b/examples/deadline/EC2-Image-Builder/python/README.md
@@ -24,7 +24,7 @@ These instructions assume that your working directory is `examples/deadline/EC2-
  ```bash
  # Navigate to the root directory of the RFDK repository
  pushd ../../../..
- ./build.sh
+ yarn build
  # Enter the Docker container to run the pack scripts
  ./scripts/rfdk_build_environment.sh
  ./pack.sh

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.70.0",
- "aws-rfdk==1.2.0",
+ "aws-cdk-lib==2.114.1",
+ "aws-rfdk==1.3.0",
  ],
 
  python_requires=">=3.7",

diff --git a/examples/deadline/EC2-Image-Builder/ts/README.md b/examples/deadline/EC2-Image-Builder/ts/README.md
@@ -33,7 +33,7 @@ These instructions assume that your working directory is `examples/deadline/EC2-
  ```bash
  # Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
  pushd ../../../..
- ./build.sh
+ yarn build
  # Navigate back to the example directory
  popd
  # Run the example's build

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.2.0",
+ "version": "1.3.0",
  "bin": {
  "app": "bin/app.js"
  },
@@ -14,14 +14,14 @@
  "watch": "tsc -w"
  },
  "devDependencies": {
- "@types/node": "^18.0.0",
- "aws-cdk": "2.70.0",
- "ts-node": "^10.8.1",
- "typescript": "~4.9.5"
+ "@types/node": "18.11.19",
+ "aws-cdk": "2.114.1",
+ "ts-node": "^10.9.2",
+ "typescript": "~5.1.6"
  },
  "dependencies": {
- "aws-cdk-lib": "2.70.0",
- "aws-rfdk": "1.2.0",
+ "aws-cdk-lib": "2.114.1",
+ "aws-rfdk": "1.3.0",
  "constructs": "^10.0.0",
  "source-map-support": "^0.5.21"
  }

diff --git a/examples/deadline/Local-Zone/python/README.md b/examples/deadline/Local-Zone/python/README.md
@@ -24,7 +24,7 @@ These instructions assume that your working directory is `examples/deadline/Loca
  ```bash
  # Navigate to the root directory of the RFDK repository
  pushd ../../../..
- ./build.sh
+ yarn build
  # Enter the Docker container to run the build and pack scripts
  ./scripts/rfdk_build_environment.sh
  ./pack.sh