Merge pull request #902 from aws/bump/1.1.0

chore(release): 1.1.0
aws · Dec 16, 2022 · 92321bc · 92321bc
2 parents 4c94a65 + e760379
commit 92321bc
Show file tree

Hide file tree

Showing 84 changed files with 2,037 additions and 1,559 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@v2.2.1
+    - uses: hmarr/auto-approve-action@v3.1.0
       if: 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@v4.0.0
+        uses: crazy-max/ghaction-github-labeler@v4.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,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.
 
+## [1.1.0](https://github.com/aws/aws-rfdk/compare/v1.0.0...v1.1.0) (2022-12-16)
+
+
+### Supported CDK Version
+
+* [2.54.0](https://github.com/aws/aws-cdk/releases/tag/v2.54.0)
+
+
+### Officially Supported Deadline Versions
+
+* [10.1.9.2 to 10.2.0.10](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/release-notes.html)
+
+
+### Features
+
+* **deadline:** allow minor version upgrades in Repository construct ([#896](https://github.com/aws/aws-rfdk/issues/896)) ([9e0b7e0](https://github.com/aws/aws-rfdk/commit/9e0b7e06243c19f8685c86773b96b520d7b41d0a))
+
+
+### Bug Fixes
+
+* **core:** add point in time recovery to X509Certificate DynamoDB tables ([#883](https://github.com/aws/aws-rfdk/issues/883)) ([89523ba](https://github.com/aws/aws-rfdk/commit/89523baa64ed3d694e87a6d319a94c501dd7f634))
+* **core:** fix rate limit errors when deploying cloudwatch log groups  ([#822](https://github.com/aws/aws-rfdk/issues/822)) ([38df77f](https://github.com/aws/aws-rfdk/commit/38df77fa10b109774b114b86b482ae82f2584738))
+* **deadline:** Fix Python bindings of ThinkboxDockerImages ([#880](https://github.com/aws/aws-rfdk/issues/880)) ([b283e67](https://github.com/aws/aws-rfdk/commit/b283e67a9976d2f3a66eac399d1e4baecf868c7a))
+* **deadline:** typo in license acceptance error messsage  ([#898](https://github.com/aws/aws-rfdk/issues/898)) ([f20549e](https://github.com/aws/aws-rfdk/commit/f20549eefda2969b6c39b37707c7b30fe117fd8a))
+* **deadline:** use new repository installer log path for Deadline 10.2.* ([#895](https://github.com/aws/aws-rfdk/issues/895)) ([c6db7c0](https://github.com/aws/aws-rfdk/commit/c6db7c0abce9567619b28a898eeb0466f334f9b7))
+* **integ:** fix rate limit errors when deploying cloudwatch log groups in integration tests ([#827](https://github.com/aws/aws-rfdk/issues/827)) ([fd842b7](https://github.com/aws/aws-rfdk/commit/fd842b710aed904f309eb14c4f354de0d51dcb9c))
+
 ## [1.0.0](https://github.com/aws/aws-rfdk/compare/v0.42.0...v1.0.0) (2022-08-30)
 
 This release marks the first official stable release of RFDK. All RFDK APIs in this release are

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -70,42 +70,40 @@ The [official installation instructions](https://docs.docker.com/engine/install/
 
 ## Building the packages
 
-It is recommended you build the packages within a docker container on a Linux-compatible system.
+It is recommended you perform the packaging step of the build process within a docker container on a Linux-compatible system.
 The developers actively use Linux for development, but macOS and the Windows Subsystem for Linux #2 may also work.
 
-To build, we use the [jsii/superchain docker container](https://hub.docker.com/r/jsii/superchain).
-
-1. Acquire the latest `jsii/superchain:1-buster-slim-node14` docker image, if you do not already have it.
+1. Build the RFDK and ensure that all unit tests pass:
 
     ```bash
-    docker pull jsii/superchain:1-buster-slim-node14
+    # From the root directory of this repository
+    ./build.sh
+
+    # Once you've run ./build.sh 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
     ```
 
-2. Enter the docker container
+2. When you're ready to package the build artifacts into installable packages (e.g. For running
+   integration tests, using with an example app, or for using with your own app) then first
+   enter the docker container:
 
     ```bash
     cd <directory containing this file>
+    # This will also do a docker pull of the required container image
+    # the first time that you run it.
     ./scripts/rfdk_build_environment.sh
     >>> bash-4.2#
     ```
 
-3. Now that you are in the docker container you can build.
+3. Now, to create the npm and python packages:
 
     ```bash
-    # To build the required build tools, and all packages:
-    >>> bash-4.2$
-    ./build.sh
-
-    # To package the npm and python packages (they will be built into dist/)
-    >>> bash-4.2$
-    ./pack.sh
+    # From within the docker container at the root directory of this repository
+    >>> bash-4.2# ./pack.sh
 
-    # To build & test your changes to the RFDK package
-    # Note: Must have done at least one run of ./build.sh to build the build tools.
-    >>> bash-4.2$
-    cd packages/aws-rfdk
-    >>> bash-4.2$
-    yarn build+test
+    # The resulting artifacts will be located in the dist/ directory.
     ```
 
 ### Using your self-built RFDK packages

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,9 +22,9 @@ These instructions assume that your working directory is `examples/deadline/All-
     ```bash
     # Navigate to the root directory of the RFDK repository
     pushd ../../../..
-    # Enter the Docker container to run the build and pack scripts
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
+    # Enter the Docker container to run the pack scripts
+    ./scripts/rfdk_build_environment.sh
     ./pack.sh
     # Exit the Docker container
     exit

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/network_tier.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/network_tier.py
@@ -119,7 +119,7 @@ def __init__(self, scope: Construct, stack_id: str, **kwargs) -> None:
         #     traffic=AclTraffic.tcp_port(22),
         #     rule_number=1
         # )
-        endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE_WITH_NAT)
+        endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE_WITH_EGRESS)
 
         # Add interface endpoints
         for idx, service_info in enumerate(_INTERFACE_ENDPOINT_SERVICES):

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/service_tier.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/service_tier.py
@@ -189,7 +189,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
             vpc_subnets_alb=SubnetSelection(
                 subnet_group_name=subnets.RENDER_QUEUE_ALB.name
             ),
-            images=images,
+            images=images.for_render_queue(),
             repository=repository,
             hostname=RenderQueueHostNameProps(
                 hostname='renderqueue',
@@ -232,7 +232,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
                 vpc_subnets=SubnetSelection(
                     subnet_group_name=subnets.USAGE_BASED_LICENSING.name
                 ),
-                images=images,
+                images=images.for_usage_based_licensing(),
                 licenses=props.ubl_licenses,
                 render_queue=self.render_queue,
                 certificate_secret=ubl_cert_secret,

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/subnets.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/subnets.py
@@ -7,7 +7,7 @@
 # Subnets for undistinguished render farm back-end infrastructure
 INFRASTRUCTURE = SubnetConfiguration(
     name='Infrastructure',
-    subnet_type=SubnetType.PRIVATE_WITH_NAT,
+    subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
     # 1,022 IP addresses
     cidr_mask=22
 )
@@ -33,23 +33,23 @@
 # - https://github.com/aws/aws-rfdk/blob/release/packages/aws-rfdk/lib/deadline/README.md#render-queue-subnet-placement
 RENDER_QUEUE_ALB = SubnetConfiguration(
     name='RenderQueueALB',
-    subnet_type=SubnetType.PRIVATE_WITH_NAT,
+    subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
     # 62 IP addresses
     cidr_mask=26
 )
 
 # Subnets for the Usage-Based Licensing
 USAGE_BASED_LICENSING = SubnetConfiguration(
     name='UsageBasedLicensing',
-    subnet_type=SubnetType.PRIVATE_WITH_NAT,
+    subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
     # 14 IP addresses
     cidr_mask=28
 )
 
 # Subnets for the Worker instances
 WORKERS = SubnetConfiguration(
     name='Workers',
-    subnet_type=SubnetType.PRIVATE_WITH_NAT,
+    subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
     # 4,094 IP addresses
     cidr_mask=20
 )
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.33.0",
-        "aws-rfdk==1.0.0"
+        "aws-cdk-lib==2.54.0",
+        "aws-rfdk==1.1.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,10 +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 ../../../..
-    # Enter the Docker container, run the build, and then exit
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
-    exit
     # Navigate back to the example directory
     popd
     # Run the example's build

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/app.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/app.ts
@@ -41,10 +41,6 @@ import { ComputeTier } from '../lib/compute-tier';
     console.log('EC2 key pair name not specified. You will not have SSH access to the render farm.');
   }
 
-  if (config.deadlineClientLinuxAmiMap === {['region']: 'ami-id'}) {
-    throw new Error('Deadline Client Linux AMI map is required but was not specified.');
-  }
-
   if (!config.enableSecretsManagement && config.secretsManagementSecretArn) {
     console.warn('Deadline Secrets Management is disabled, so the admin credentials specified in the provided secret will not be used.');
   }

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/network-tier.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/network-tier.ts
@@ -138,7 +138,7 @@ export class NetworkTier extends cdk.Stack {
     // Add the required VPC Endpoints
     // -------------
     // Subnets to add the VPC endpoints to
-    const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE_WITH_NAT };
+    const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE_WITH_EGRESS };
 
     // Add interface endpoints
     NetworkTier.INTERFACE_ENDPOINT_SERVICES.forEach((serviceInfo, idx) => {

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/subnets.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/subnets.ts
@@ -11,7 +11,7 @@ export class Subnets {
    */
    public static readonly INFRASTRUCTURE: SubnetConfiguration = {
     name: 'Infrastructure',
-    subnetType: SubnetType.PRIVATE_WITH_NAT,
+    subnetType: SubnetType.PRIVATE_WITH_EGRESS,
     // 1,022 IP addresses
     cidrMask: 22,
   };
@@ -41,7 +41,7 @@ export class Subnets {
    */
   public static readonly RENDER_QUEUE_ALB: SubnetConfiguration = {
     name: 'RenderQueueALB',
-    subnetType: SubnetType.PRIVATE_WITH_NAT,
+    subnetType: SubnetType.PRIVATE_WITH_EGRESS,
     // 62 IP addresses
     cidrMask: 26,
   };
@@ -51,7 +51,7 @@ export class Subnets {
    */
   public static readonly USAGE_BASED_LICENSING: SubnetConfiguration = {
     name: 'UsageBasedLicensing',
-    subnetType: SubnetType.PRIVATE_WITH_NAT,
+    subnetType: SubnetType.PRIVATE_WITH_EGRESS,
     // 14 IP addresses
     cidrMask: 28,
   };
@@ -61,7 +61,7 @@ export class Subnets {
    */
   public static readonly WORKERS: SubnetConfiguration = {
     name: 'Workers',
-    subnetType: SubnetType.PRIVATE_WITH_NAT,
+    subnetType: SubnetType.PRIVATE_WITH_EGRESS,
     // 4,094 IP addresses
     cidrMask: 20,
   };

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.0.0",
+  "version": "1.1.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,13 +14,13 @@
   },
   "devDependencies": {
     "@types/node": "^18.0.0",
-    "aws-cdk": "2.33.0",
+    "aws-cdk": "2.54.0",
     "ts-node": "^10.8.1",
     "typescript": "~4.7.3"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.33.0",
-    "aws-rfdk": "1.0.0",
+    "aws-cdk-lib": "2.54.0",
+    "aws-rfdk": "1.1.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,9 +24,9 @@ These instructions assume that your working directory is `examples/deadline/All-
     ```bash
     # Navigate to the root directory of the RFDK repository
     pushd ../../../..
-    # Enter the Docker container to run the build and pack scripts
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
+    # Enter the Docker container to run thepack scripts
+    ./scripts/rfdk_build_environment.sh
     ./pack.sh
     # Exit the Docker container
     exit

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.33.0",
-        "aws-rfdk==1.0.0"
+        "aws-cdk-lib==2.54.0",
+        "aws-rfdk==1.1.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,10 +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 ../../../..
-    # Enter the Docker container, run the build, and then exit
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
-    exit
     # Navigate back to the example directory
     popd
     # Run the example's build

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.0.0",
+  "version": "1.1.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -19,13 +19,13 @@
   },
   "devDependencies": {
     "@types/node": "^18.0.0",
-    "aws-cdk": "2.33.0",
+    "aws-cdk": "2.54.0",
     "ts-node": "^10.8.1",
     "typescript": "~4.7.3"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.33.0",
-    "aws-rfdk": "1.0.0",
+    "aws-cdk-lib": "2.54.0",
+    "aws-rfdk": "1.1.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,9 +24,9 @@ These instructions assume that your working directory is `examples/deadline/EC2-
     ```bash
     # Navigate to the root directory of the RFDK repository
     pushd ../../../..
-    # Enter the Docker container to run the build and pack scripts
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
+    # Enter the Docker container to run the pack scripts
+    ./scripts/rfdk_build_environment.sh
     ./pack.sh
     # Exit the Docker container
     exit

diff --git a/examples/deadline/EC2-Image-Builder/python/package/lib/base_farm_stack.py b/examples/deadline/EC2-Image-Builder/python/package/lib/base_farm_stack.py
@@ -80,7 +80,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: BaseFarmStackProps
             'RenderQueue',
             vpc=self.vpc,
             version=version,
-            images=images,
+            images=images.for_render_queue(),
             repository=repository,
             deletion_protection=False,
         )
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.33.0",
-        "aws-rfdk==1.0.0",
+        "aws-cdk-lib==2.54.0",
+        "aws-rfdk==1.1.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,10 +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 ../../../..
-    # Enter the Docker container, run the build, and then exit
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
-    exit
     # Navigate back to the example directory
     popd
     # Run the example's build