Skip to content

Commit 92321bc

Browse files
epmogepmog
authored
Merge pull request #902 from aws/bump/1.1.0
chore(release): 1.1.0
2 parents 4c94a65 + e760379 commit 92321bc

File tree

84 files changed

+2037
-1559
lines changed

Some content is hidden

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

84 files changed

+2037
-1559
lines changed

‎.github/workflows/auto-approve.yml

Lines changed: 1 addition & 1 deletion
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@v2.2.1
12+
- uses: hmarr/auto-approve-action@v3.1.0
1313
if: 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@v4.0.0
20+
uses: crazy-max/ghaction-github-labeler@v4.1.0
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
yaml-file: .github/config/labels.yml

‎CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,33 @@
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.1.0](https://github.com/aws/aws-rfdk/compare/v1.0.0...v1.1.0) (2022-12-16)
6+
7+
8+
### Supported CDK Version
9+
10+
* [2.54.0](https://github.com/aws/aws-cdk/releases/tag/v2.54.0)
11+
12+
13+
### Officially Supported Deadline Versions
14+
15+
* [10.1.9.2 to 10.2.0.10](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/release-notes.html)
16+
17+
18+
### Features
19+
20+
* **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))
21+
22+
23+
### Bug Fixes
24+
25+
* **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))
26+
* **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))
27+
* **deadline:** Fix Python bindings of ThinkboxDockerImages ([#880](https://github.com/aws/aws-rfdk/issues/880)) ([b283e67](https://github.com/aws/aws-rfdk/commit/b283e67a9976d2f3a66eac399d1e4baecf868c7a))
28+
* **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))
29+
* **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))
30+
* **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))
31+
532
## [1.0.0](https://github.com/aws/aws-rfdk/compare/v0.42.0...v1.0.0) (2022-08-30)
633

734
This release marks the first official stable release of RFDK. All RFDK APIs in this release are

‎CONTRIBUTING.md

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,42 +70,40 @@ The [official installation instructions](https://docs.docker.com/engine/install/
7070

7171
## Building the packages
7272

73-
It is recommended you build the packages within a docker container on a Linux-compatible system.
73+
It is recommended you perform the packaging step of the build process within a docker container on a Linux-compatible system.
7474
The developers actively use Linux for development, but macOS and the Windows Subsystem for Linux #2 may also work.
7575

76-
To build, we use the [jsii/superchain docker container](https://hub.docker.com/r/jsii/superchain).
77-
78-
1. Acquire the latest `jsii/superchain:1-buster-slim-node14` docker image, if you do not already have it.
76+
1. Build the RFDK and ensure that all unit tests pass:
7977

8078
```bash
81-
docker pull jsii/superchain:1-buster-slim-node14
79+
# From the root directory of this repository
80+
./build.sh
81+
82+
# Once you've run ./build.sh from the root directory at least once, then
83+
# you can do subsequent build & test iterations from the RFDK package directory to save time.
84+
cd packages/aws-rfdk
85+
yarn build+test
8286
```
8387

84-
2. Enter the docker container
88+
2. When you're ready to package the build artifacts into installable packages (e.g. For running
89+
integration tests, using with an example app, or for using with your own app) then first
90+
enter the docker container:
8591
8692
```bash
8793
cd <directory containing this file>
94+
# This will also do a docker pull of the required container image
95+
# the first time that you run it.
8896
./scripts/rfdk_build_environment.sh
8997
>>> bash-4.2#
9098
```
9199
92-
3. Now that you are in the docker container you can build.
100+
3. Now, to create the npm and python packages:
93101
94102
```bash
95-
# To build the required build tools, and all packages:
96-
>>> bash-4.2$
97-
./build.sh
98-
99-
# To package the npm and python packages (they will be built into dist/)
100-
>>> bash-4.2$
101-
./pack.sh
103+
# From within the docker container at the root directory of this repository
104+
>>> bash-4.2# ./pack.sh
102105
103-
# To build & test your changes to the RFDK package
104-
# Note: Must have done at least one run of ./build.sh to build the build tools.
105-
>>> bash-4.2$
106-
cd packages/aws-rfdk
107-
>>> bash-4.2$
108-
yarn build+test
106+
# The resulting artifacts will be located in the dist/ directory.
109107
```
110108
111109
### Using your self-built RFDK packages

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ 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-
# Enter the Docker container to run the build and pack scripts
26-
./scripts/rfdk_build_environment.sh
2725
./build.sh
26+
# Enter the Docker container to run the pack scripts
27+
./scripts/rfdk_build_environment.sh
2828
./pack.sh
2929
# Exit the Docker container
3030
exit

‎examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/network_tier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def __init__(self, scope: Construct, stack_id: str, **kwargs) -> None:
119119
# traffic=AclTraffic.tcp_port(22),
120120
# rule_number=1
121121
# )
122-
endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE_WITH_NAT)
122+
endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE_WITH_EGRESS)
123123

124124
# Add interface endpoints
125125
for idx, service_info in enumerate(_INTERFACE_ENDPOINT_SERVICES):

‎examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/service_tier.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
189189
vpc_subnets_alb=SubnetSelection(
190190
subnet_group_name=subnets.RENDER_QUEUE_ALB.name
191191
),
192-
images=images,
192+
images=images.for_render_queue(),
193193
repository=repository,
194194
hostname=RenderQueueHostNameProps(
195195
hostname='renderqueue',
@@ -232,7 +232,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
232232
vpc_subnets=SubnetSelection(
233233
subnet_group_name=subnets.USAGE_BASED_LICENSING.name
234234
),
235-
images=images,
235+
images=images.for_usage_based_licensing(),
236236
licenses=props.ubl_licenses,
237237
render_queue=self.render_queue,
238238
certificate_secret=ubl_cert_secret,

‎examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/subnets.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Subnets for undistinguished render farm back-end infrastructure
88
INFRASTRUCTURE = SubnetConfiguration(
99
name='Infrastructure',
10-
subnet_type=SubnetType.PRIVATE_WITH_NAT,
10+
subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
1111
# 1,022 IP addresses
1212
cidr_mask=22
1313
)
@@ -33,23 +33,23 @@
3333
# - https://github.com/aws/aws-rfdk/blob/release/packages/aws-rfdk/lib/deadline/README.md#render-queue-subnet-placement
3434
RENDER_QUEUE_ALB = SubnetConfiguration(
3535
name='RenderQueueALB',
36-
subnet_type=SubnetType.PRIVATE_WITH_NAT,
36+
subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
3737
# 62 IP addresses
3838
cidr_mask=26
3939
)
4040

4141
# Subnets for the Usage-Based Licensing
4242
USAGE_BASED_LICENSING = SubnetConfiguration(
4343
name='UsageBasedLicensing',
44-
subnet_type=SubnetType.PRIVATE_WITH_NAT,
44+
subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
4545
# 14 IP addresses
4646
cidr_mask=28
4747
)
4848

4949
# Subnets for the Worker instances
5050
WORKERS = SubnetConfiguration(
5151
name='Workers',
52-
subnet_type=SubnetType.PRIVATE_WITH_NAT,
52+
subnet_type=SubnetType.PRIVATE_WITH_EGRESS,
5353
# 4,094 IP addresses
5454
cidr_mask=20
5555
)

‎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.33.0",
21-
"aws-rfdk==1.0.0"
20+
"aws-cdk-lib==2.54.0",
21+
"aws-rfdk==1.1.0"
2222
],
2323

2424
python_requires=">=3.7",

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +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-
# Enter the Docker container, run the build, and then exit
148-
./scripts/rfdk_build_environment.sh
149147
./build.sh
150-
exit
151148
# Navigate back to the example directory
152149
popd
153150
# Run the example's build

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ import { ComputeTier } from '../lib/compute-tier';
4141
console.log('EC2 key pair name not specified. You will not have SSH access to the render farm.');
4242
}
4343

44-
if (config.deadlineClientLinuxAmiMap === {['region']: 'ami-id'}) {
45-
throw new Error('Deadline Client Linux AMI map is required but was not specified.');
46-
}
47-
4844
if (!config.enableSecretsManagement && config.secretsManagementSecretArn) {
4945
console.warn('Deadline Secrets Management is disabled, so the admin credentials specified in the provided secret will not be used.');
5046
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export class NetworkTier extends cdk.Stack {
138138
// Add the required VPC Endpoints
139139
// -------------
140140
// Subnets to add the VPC endpoints to
141-
const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE_WITH_NAT };
141+
const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE_WITH_EGRESS };
142142

143143
// Add interface endpoints
144144
NetworkTier.INTERFACE_ENDPOINT_SERVICES.forEach((serviceInfo, idx) => {

‎examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/subnets.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class Subnets {
1111
*/
1212
public static readonly INFRASTRUCTURE: SubnetConfiguration = {
1313
name: 'Infrastructure',
14-
subnetType: SubnetType.PRIVATE_WITH_NAT,
14+
subnetType: SubnetType.PRIVATE_WITH_EGRESS,
1515
// 1,022 IP addresses
1616
cidrMask: 22,
1717
};
@@ -41,7 +41,7 @@ export class Subnets {
4141
*/
4242
public static readonly RENDER_QUEUE_ALB: SubnetConfiguration = {
4343
name: 'RenderQueueALB',
44-
subnetType: SubnetType.PRIVATE_WITH_NAT,
44+
subnetType: SubnetType.PRIVATE_WITH_EGRESS,
4545
// 62 IP addresses
4646
cidrMask: 26,
4747
};
@@ -51,7 +51,7 @@ export class Subnets {
5151
*/
5252
public static readonly USAGE_BASED_LICENSING: SubnetConfiguration = {
5353
name: 'UsageBasedLicensing',
54-
subnetType: SubnetType.PRIVATE_WITH_NAT,
54+
subnetType: SubnetType.PRIVATE_WITH_EGRESS,
5555
// 14 IP addresses
5656
cidrMask: 28,
5757
};
@@ -61,7 +61,7 @@ export class Subnets {
6161
*/
6262
public static readonly WORKERS: SubnetConfiguration = {
6363
name: 'Workers',
64-
subnetType: SubnetType.PRIVATE_WITH_NAT,
64+
subnetType: SubnetType.PRIVATE_WITH_EGRESS,
6565
// 4,094 IP addresses
6666
cidrMask: 20,
6767
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-basic",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -14,13 +14,13 @@
1414
},
1515
"devDependencies": {
1616
"@types/node": "^18.0.0",
17-
"aws-cdk": "2.33.0",
17+
"aws-cdk": "2.54.0",
1818
"ts-node": "^10.8.1",
1919
"typescript": "~4.7.3"
2020
},
2121
"dependencies": {
22-
"aws-cdk-lib": "^2.33.0",
23-
"aws-rfdk": "1.0.0",
22+
"aws-cdk-lib": "2.54.0",
23+
"aws-rfdk": "1.1.0",
2424
"source-map-support": "^0.5.21"
2525
}
2626
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ 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-
# Enter the Docker container to run the build and pack scripts
28-
./scripts/rfdk_build_environment.sh
2927
./build.sh
28+
# Enter the Docker container to run thepack scripts
29+
./scripts/rfdk_build_environment.sh
3030
./pack.sh
3131
# Exit the Docker container
3232
exit

‎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.33.0",
21-
"aws-rfdk==1.0.0"
20+
"aws-cdk-lib==2.54.0",
21+
"aws-rfdk==1.1.0"
2222
],
2323

2424
python_requires=">=3.7",

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +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-
# Enter the Docker container, run the build, and then exit
51-
./scripts/rfdk_build_environment.sh
5250
./build.sh
53-
exit
5451
# Navigate back to the example directory
5552
popd
5653
# Run the example's build

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-sep",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -19,13 +19,13 @@
1919
},
2020
"devDependencies": {
2121
"@types/node": "^18.0.0",
22-
"aws-cdk": "2.33.0",
22+
"aws-cdk": "2.54.0",
2323
"ts-node": "^10.8.1",
2424
"typescript": "~4.7.3"
2525
},
2626
"dependencies": {
27-
"aws-cdk-lib": "^2.33.0",
28-
"aws-rfdk": "1.0.0",
27+
"aws-cdk-lib": "2.54.0",
28+
"aws-rfdk": "1.1.0",
2929
"constructs": "^10.0.0",
3030
"source-map-support": "^0.5.21"
3131
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ 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-
# Enter the Docker container to run the build and pack scripts
28-
./scripts/rfdk_build_environment.sh
2927
./build.sh
28+
# Enter the Docker container to run the pack scripts
29+
./scripts/rfdk_build_environment.sh
3030
./pack.sh
3131
# Exit the Docker container
3232
exit

‎examples/deadline/EC2-Image-Builder/python/package/lib/base_farm_stack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: BaseFarmStackProps
8080
'RenderQueue',
8181
vpc=self.vpc,
8282
version=version,
83-
images=images,
83+
images=images.for_render_queue(),
8484
repository=repository,
8585
deletion_protection=False,
8686
)

‎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.33.0",
21-
"aws-rfdk==1.0.0",
20+
"aws-cdk-lib==2.54.0",
21+
"aws-rfdk==1.1.0",
2222
],
2323

2424
python_requires=">=3.7",

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +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-
# Enter the Docker container, run the build, and then exit
37-
./scripts/rfdk_build_environment.sh
3836
./build.sh
39-
exit
4037
# Navigate back to the example directory
4138
popd
4239
# Run the example's build

0 commit comments

Comments
 (0)