Skip to content

Commit 4fdbebb

Browse files
authored
chore: bump cdk to 1.137.0 (#652)
This took some work to get RFDK to work with the new version of CDK: - Replaced usages of the IResource interface with the IConstruct interface where appropriate - Updated licenses and notices to use 2022 - Replaced `Table#serverSideEncyption: true` to `Table#encryption: TableEncryption.AWS_MANAGED` - Replaced `Metric#dimensions` with `Metric#dimenionsMap` - Replaced `Secret#secretArn` with either `Secret#secretCompleteArn` or `Secret#secretPartialArn` - Replaced all the feature flags in our cdk.json files with the current CDK defaults. Details on the feature flags are here: https://github.com/aws/aws-cdk/blob/cd51a5dae1780e34aecd90d85783fb6d3c239903/packages/@aws-cdk/cx-api/lib/features.ts - Updated examples to use AMI for Deadline 10.1.20.2 - Set jest to use the `--silent` flag so it didn't write a bunch of output to the console. BREAKING CHANGE: The IHealthMonitor and IWorkerFleet interfaces now extend IConstruct rather than IResource and the stack and env properties on the HealthMonitor and WorkerInstanceFleet constructs were removed. See the [RFDK 0.40.x upgrade documentation](https://github.com/aws/aws-rfdk/blob/v0.40.0/packages/aws-rfdk/docs/upgrade/upgrading-0.40.md) for more details and guidance on accessing the removed properties.
1 parent c8770da commit 4fdbebb

File tree

65 files changed

+2409
-3292
lines changed

Some content is hidden

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

65 files changed

+2409
-3292
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
189+
Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Render Farm Deployment Kit on AWS (RFDK)
2-
Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
{
2-
"app": "python -m package.app"
2+
"app": "python -m package.app",
3+
"context": {
4+
"@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
5+
"@aws-cdk/core:enableStackNameDuplicates": true,
6+
"aws-cdk:enableDiffNoFail": true,
7+
"@aws-cdk/core:stackRelativeExports": true,
8+
"@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,
9+
"@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,
10+
"@aws-cdk/aws-kms:defaultKeyPolicies": true,
11+
"@aws-cdk/aws-s3:grantWriteWithoutAcl": true,
12+
"@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
13+
"@aws-cdk/aws-rds:lowercaseDbIdentifier": true,
14+
"@aws-cdk/aws-efs:defaultEncryptionAtRest": true,
15+
"@aws-cdk/aws-lambda:recognizeVersionProps": true,
16+
"@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true
17+
}
318
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: StorageTierProps,
179179
# render farm may become unstable.
180180
# 2) Uses RFDK's PadEfsStorage construct to add data to the EFS for the purpose of increasing the amount
181181
# of stored data to increase the baseline throughput.
182-
#
182+
#
183183
# See: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html
184184
# for more information on AWS CloudWatch Alarms.
185185
# See: https://docs.aws.amazon.com/efs/latest/ug/performance.html#throughput-modes
@@ -227,7 +227,7 @@ def add_low_efs_burst_credit_alarms(self, filesystem: FileSystem, email_address:
227227
# ====================
228228
# 1) KMS key to use to encrypt events within the SNS Topic. The Key is optional
229229
key = Key(
230-
self,
230+
self,
231231
'SNSEncryptionKey',
232232
description='Used to encrypt the SNS Topic for sending EFS Burst Credit alerts',
233233
enable_key_rotation=True,
@@ -252,14 +252,14 @@ def add_low_efs_burst_credit_alarms(self, filesystem: FileSystem, email_address:
252252
burst_credits_metric = Metric(
253253
metric_name='BurstCreditBalance',
254254
namespace='AWS/EFS',
255-
dimensions={
255+
dimensions_map={
256256
"FileSystemId": filesystem.file_system_id
257257
},
258258
# One 99-th percentile data point sample every hour
259259
period=Duration.hours(1),
260260
statistic='p99'
261261
)
262-
262+
263263
# 2) Create the alarms
264264
thresholds = [
265265
{
@@ -342,7 +342,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: StorageTierDocDBPr
342342
subnet_group_name=subnets.INFRASTRUCTURE.name
343343
),
344344
instance_type=props.database_instance_type,
345-
# TODO - For cost considerations this example only uses 1 Database instance.
345+
# TODO - For cost considerations this example only uses 1 Database instance.
346346
# It is recommended that when creating your render farm you use at least 2 instances for redundancy.
347347
instances=1,
348348
master_user=Login(username='adminuser'),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk.core==1.129.0",
20+
"aws-cdk.core==1.137.0",
2121
"aws-rfdk==0.39.0"
2222
],
2323

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
@@ -41,11 +41,11 @@ class AppConfig {
4141
public readonly deadlineVersion?: string;
4242

4343
/**
44-
* A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID from us-west-2
44+
* 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
4545
* is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
4646
* Deadline used in any connected Deadline constructs.
4747
*/
48-
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-04ae356533dc07fb5'};
48+
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0814954855da0e4c3'};
4949

5050
/**
5151
* (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
{
22
"app": "npx ts-node bin/app.ts",
33
"context": {
4-
"@aws-cdk/core:enableStackNameDuplicates": "true",
5-
"aws-cdk:enableDiffNoFail": "true"
4+
"@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
5+
"@aws-cdk/core:enableStackNameDuplicates": true,
6+
"aws-cdk:enableDiffNoFail": true,
7+
"@aws-cdk/core:stackRelativeExports": true,
8+
"@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,
9+
"@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,
10+
"@aws-cdk/aws-kms:defaultKeyPolicies": true,
11+
"@aws-cdk/aws-s3:grantWriteWithoutAcl": true,
12+
"@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
13+
"@aws-cdk/aws-rds:lowercaseDbIdentifier": true,
14+
"@aws-cdk/aws-efs:defaultEncryptionAtRest": true,
15+
"@aws-cdk/aws-lambda:recognizeVersionProps": true,
16+
"@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true
617
}
718
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export abstract class StorageTier extends cdk.Stack {
159159
// render farm may become unstable.
160160
// 2) Uses RFDK's PadEfsStorage construct to add data to the EFS for the purpose of increasing the amount
161161
// of stored data to increase the baseline throughput.
162-
//
162+
//
163163
// See: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html
164164
// for more information on AWS CloudWatch Alarms.
165165
// See: https://docs.aws.amazon.com/efs/latest/ug/performance.html#throughput-modes
@@ -227,14 +227,14 @@ export abstract class StorageTier extends cdk.Stack {
227227
const burstCreditsMetric = new Metric({
228228
metricName: 'BurstCreditBalance',
229229
namespace: 'AWS/EFS',
230-
dimensions: {
230+
dimensionsMap: {
231231
FileSystemId: filesystem.fileSystemId,
232232
},
233233
// One 99-th percentile data point hour
234234
period: Duration.hours(1),
235235
statistic: 'p99',
236236
});
237-
237+
238238
// 2) Create the alarms
239239
const thresholds = [
240240
{
@@ -319,7 +319,7 @@ export class StorageTierDocDB extends StorageTier {
319319
subnetGroupName: Subnets.INFRASTRUCTURE.name,
320320
},
321321
instanceType: props.databaseInstanceType,
322-
// TODO - For cost considerations this example only uses 1 Database instance.
322+
// TODO - For cost considerations this example only uses 1 Database instance.
323323
// It is recommended that when creating your render farm you use at least 2 instances for redundancy.
324324
instances: 1,
325325
masterUser: {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"watch": "tsc -w"
1414
},
1515
"devDependencies": {
16-
"@types/node": "^16.11.3",
17-
"aws-cdk": "1.129.0",
18-
"ts-node": "^10.3.1",
19-
"typescript": "~4.4.4"
16+
"@types/node": "^17.0.2",
17+
"aws-cdk": "1.137.0",
18+
"ts-node": "^10.4.0",
19+
"typescript": "~4.5.4"
2020
},
2121
"dependencies": {
22-
"@aws-cdk/core": "1.129.0",
22+
"@aws-cdk/core": "1.137.0",
2323
"aws-rfdk": "0.39.0",
24-
"source-map-support": "^0.5.20"
24+
"source-map-support": "^0.5.21"
2525
}
2626
}
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
{
2-
"app": "python -m package.app"
2+
"app": "python -m package.app",
3+
"context": {
4+
"@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
5+
"@aws-cdk/core:enableStackNameDuplicates": true,
6+
"aws-cdk:enableDiffNoFail": true,
7+
"@aws-cdk/core:stackRelativeExports": true,
8+
"@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,
9+
"@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,
10+
"@aws-cdk/aws-kms:defaultKeyPolicies": true,
11+
"@aws-cdk/aws-s3:grantWriteWithoutAcl": true,
12+
"@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
13+
"@aws-cdk/aws-rds:lowercaseDbIdentifier": true,
14+
"@aws-cdk/aws-efs:defaultEncryptionAtRest": true,
15+
"@aws-cdk/aws-lambda:recognizeVersionProps": true,
16+
"@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true
17+
}
318
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk.core==1.129.0",
20+
"aws-cdk.core==1.137.0",
2121
"aws-rfdk==0.39.0"
2222
],
2323

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.19.4 AMI ID from us-west-2
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
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-04ae356533dc07fb5'};
18+
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0814954855da0e4c3'};
1919

2020
/**
2121
* Whether the DeadlineResourceTrackerAccessRole IAM role required by Deadline's Resource Tracker should be created in this CDK app.
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
{
22
"app": "npx ts-node bin/app.ts",
33
"context": {
4-
"@aws-cdk/core:enableStackNameDuplicates": "true",
5-
"aws-cdk:enableDiffNoFail": "true"
4+
"@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
5+
"@aws-cdk/core:enableStackNameDuplicates": true,
6+
"aws-cdk:enableDiffNoFail": true,
7+
"@aws-cdk/core:stackRelativeExports": true,
8+
"@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,
9+
"@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,
10+
"@aws-cdk/aws-kms:defaultKeyPolicies": true,
11+
"@aws-cdk/aws-s3:grantWriteWithoutAcl": true,
12+
"@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
13+
"@aws-cdk/aws-rds:lowercaseDbIdentifier": true,
14+
"@aws-cdk/aws-efs:defaultEncryptionAtRest": true,
15+
"@aws-cdk/aws-lambda:recognizeVersionProps": true,
16+
"@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true
617
}
718
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"watch": "tsc -w"
1919
},
2020
"devDependencies": {
21-
"@types/node": "^16.11.3",
22-
"aws-cdk": "1.129.0",
23-
"ts-node": "^10.3.1",
24-
"typescript": "~4.4.4"
21+
"@types/node": "^17.0.2",
22+
"aws-cdk": "1.137.0",
23+
"ts-node": "^10.4.0",
24+
"typescript": "~4.5.4"
2525
},
2626
"dependencies": {
27-
"@aws-cdk/core": "1.129.0",
27+
"@aws-cdk/core": "1.137.0",
2828
"aws-rfdk": "0.39.0",
29-
"source-map-support": "^0.5.20"
29+
"source-map-support": "^0.5.21"
3030
}
3131
}
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
{
2-
"app": "python -m package.app"
2+
"app": "python -m package.app",
3+
"context": {
4+
"@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
5+
"@aws-cdk/core:enableStackNameDuplicates": true,
6+
"aws-cdk:enableDiffNoFail": true,
7+
"@aws-cdk/core:stackRelativeExports": true,
8+
"@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,
9+
"@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,
10+
"@aws-cdk/aws-kms:defaultKeyPolicies": true,
11+
"@aws-cdk/aws-s3:grantWriteWithoutAcl": true,
12+
"@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
13+
"@aws-cdk/aws-rds:lowercaseDbIdentifier": true,
14+
"@aws-cdk/aws-efs:defaultEncryptionAtRest": true,
15+
"@aws-cdk/aws-lambda:recognizeVersionProps": true,
16+
"@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true
17+
}
318
}

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

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

1919
install_requires=[
20-
"aws-cdk.aws-iam==1.129.0",
21-
"aws-cdk.aws-imagebuilder==1.129.0",
22-
"aws-cdk.aws-ec2==1.129.0",
23-
"aws-cdk.aws-s3-assets==1.129.0",
24-
"aws-cdk.core==1.129.0",
20+
"aws-cdk.aws-iam==1.137.0",
21+
"aws-cdk.aws-imagebuilder==1.137.0",
22+
"aws-cdk.aws-ec2==1.137.0",
23+
"aws-cdk.aws-s3-assets==1.137.0",
24+
"aws-cdk.core==1.137.0",
2525
"aws-rfdk==0.39.0",
2626
],
2727

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
{
2-
"app": "npx ts-node bin/app.ts"
2+
"app": "npx ts-node bin/app.ts",
3+
"context": {
4+
"@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
5+
"@aws-cdk/core:enableStackNameDuplicates": true,
6+
"aws-cdk:enableDiffNoFail": true,
7+
"@aws-cdk/core:stackRelativeExports": true,
8+
"@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,
9+
"@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,
10+
"@aws-cdk/aws-kms:defaultKeyPolicies": true,
11+
"@aws-cdk/aws-s3:grantWriteWithoutAcl": true,
12+
"@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
13+
"@aws-cdk/aws-rds:lowercaseDbIdentifier": true,
14+
"@aws-cdk/aws-efs:defaultEncryptionAtRest": true,
15+
"@aws-cdk/aws-lambda:recognizeVersionProps": true,
16+
"@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true
17+
}
318
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
"watch": "tsc -w"
1515
},
1616
"devDependencies": {
17-
"@types/node": "^16.11.3",
18-
"aws-cdk": "1.129.0",
19-
"ts-node": "^10.3.1",
20-
"typescript": "~4.4.4"
17+
"@types/node": "^17.0.2",
18+
"aws-cdk": "1.137.0",
19+
"ts-node": "^10.4.0",
20+
"typescript": "~4.5.4"
2121
},
2222
"dependencies": {
23-
"@aws-cdk/aws-ec2": "1.129.0",
24-
"@aws-cdk/aws-iam": "1.129.0",
25-
"@aws-cdk/aws-imagebuilder": "1.129.0",
26-
"@aws-cdk/aws-s3-assets": "1.129.0",
27-
"@aws-cdk/core": "1.129.0",
23+
"@aws-cdk/aws-ec2": "1.137.0",
24+
"@aws-cdk/aws-iam": "1.137.0",
25+
"@aws-cdk/aws-imagebuilder": "1.137.0",
26+
"@aws-cdk/aws-s3-assets": "1.137.0",
27+
"@aws-cdk/core": "1.137.0",
2828
"aws-rfdk": "0.39.0"
2929
}
3030
}
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
{
2-
"app": "python -m package.app"
2+
"app": "python -m package.app",
3+
"context": {
4+
"@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
5+
"@aws-cdk/core:enableStackNameDuplicates": true,
6+
"aws-cdk:enableDiffNoFail": true,
7+
"@aws-cdk/core:stackRelativeExports": true,
8+
"@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,
9+
"@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,
10+
"@aws-cdk/aws-kms:defaultKeyPolicies": true,
11+
"@aws-cdk/aws-s3:grantWriteWithoutAcl": true,
12+
"@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
13+
"@aws-cdk/aws-rds:lowercaseDbIdentifier": true,
14+
"@aws-cdk/aws-efs:defaultEncryptionAtRest": true,
15+
"@aws-cdk/aws-lambda:recognizeVersionProps": true,
16+
"@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true
17+
}
318
}

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

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

1919
install_requires=[
20-
"aws-cdk.aws-ec2==1.129.0",
21-
"aws-cdk.aws-elasticloadbalancingv2==1.129.0",
22-
"aws-cdk.aws-route53==1.129.0",
23-
"aws-cdk.core==1.129.0",
20+
"aws-cdk.aws-ec2==1.137.0",
21+
"aws-cdk.aws-elasticloadbalancingv2==1.137.0",
22+
"aws-cdk.aws-route53==1.137.0",
23+
"aws-cdk.core==1.137.0",
2424
"aws-rfdk==0.39.0",
25-
"jsii==1.40.0",
25+
"jsii==1.50.0",
2626
],
2727

2828
python_requires=">=3.7",

0 commit comments

Comments
 (0)