Skip to content

Commit

Permalink
Merge pull request #1429 from aws/merge-back/1.6.0
Browse files Browse the repository at this point in the history
chore(merge-back): 1.6.0
  • Loading branch information
marofke authored Jan 10, 2025
2 parents aa32e05 + 4c62fcd commit ad7023d
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 22 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@

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.6.0](https://github.com/aws/aws-rfdk/compare/v1.5.0...v1.6.0) (2025-01-09)


### Supported CDK Version

* [2.163.0](https://github.com/aws/aws-cdk/releases/tag/v2.163.0)


### Officially Supported Deadline Versions

* [10.1.9.2 to 10.4.0.10](https://docs.thinkboxsoftware.com/products/deadline/10.4/1_User%20Manual/manual/release-notes.html)


### Bug Fixes

* Set Amazon Linux version based on Deadline Repository version ([#1419](https://github.com/aws/aws-rfdk/issues/1419)) ([822ee19](https://github.com/aws/aws-rfdk/commit/822ee1931d5c82d3e91e9035bab783e4517515bd))
* Switch lambda layers to use a region allow list for publishing ([#1422](https://github.com/aws/aws-rfdk/issues/1422)) ([f99f868](https://github.com/aws/aws-rfdk/commit/f99f86830959faadc917c16f1f941ded268dbdb6))

## [1.5.0](https://github.com/aws/aws-rfdk/compare/v1.4.0...v1.5.0) (2024-12-05)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

install_requires=[
"aws-cdk-lib==2.163.0",
"aws-rfdk==1.5.0"
"aws-rfdk==1.6.0"
],

python_requires=">=3.7",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "all-in-farm-basic",
"version": "1.5.0",
"version": "1.6.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.163.0",
"aws-rfdk": "1.5.0",
"aws-rfdk": "1.6.0",
"source-map-support": "^0.5.21"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

install_requires=[
"aws-cdk-lib==2.163.0",
"aws-rfdk==1.5.0"
"aws-rfdk==1.6.0"
],

python_requires=">=3.7",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "all-in-farm-sep",
"version": "1.5.0",
"version": "1.6.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -25,7 +25,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.163.0",
"aws-rfdk": "1.5.0",
"aws-rfdk": "1.6.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/deadline/EC2-Image-Builder/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

install_requires=[
"aws-cdk-lib==2.163.0",
"aws-rfdk==1.5.0",
"aws-rfdk==1.6.0",
],

python_requires=">=3.7",
Expand Down
4 changes: 2 additions & 2 deletions examples/deadline/EC2-Image-Builder/ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "all-in-farm-image-builder",
"version": "1.5.0",
"version": "1.6.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -21,7 +21,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.163.0",
"aws-rfdk": "1.5.0",
"aws-rfdk": "1.6.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/deadline/Local-Zone/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

install_requires=[
"aws-cdk-lib==2.163.0",
"aws-rfdk==1.5.0"
"aws-rfdk==1.6.0"
],

python_requires=">=3.7",
Expand Down
4 changes: 2 additions & 2 deletions examples/deadline/Local-Zone/ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "all-in-farm-local-zone",
"version": "1.5.0",
"version": "1.6.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.163.0",
"aws-rfdk": "1.5.0",
"aws-rfdk": "1.6.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
}
Expand Down
8 changes: 4 additions & 4 deletions integ/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "integ",
"version": "1.5.0",
"version": "1.6.0",
"private": false,
"description": "Integration tests for RFDK constructs",
"bin": {
Expand Down Expand Up @@ -66,7 +66,7 @@
"eslint-plugin-jest": "^28.10.0",
"eslint-plugin-license-header": "^0.6.0",
"jest": "^29.7.0",
"pkglint": "1.5.0",
"pkglint": "1.6.0",
"ts-jest": "^29.2.5",
"typescript": "~5.4.5"
},
Expand All @@ -76,12 +76,12 @@
"@aws-sdk/client-secrets-manager": "^3.675.0",
"@aws-sdk/client-ssm": "^3.716.0",
"aws-cdk-lib": "2.163.0",
"aws-rfdk": "1.5.0",
"aws-rfdk": "1.6.0",
"constructs": "^10.0.0"
},
"peerDependencies": {
"aws-cdk-lib": "2.163.0",
"aws-rfdk": "1.5.0",
"aws-rfdk": "1.6.0",
"constructs": "^10.0.0"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"rejectCycles": "true",
"version": "1.5.0"
"version": "1.6.0"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-rfdk",
"version": "1.5.0",
"version": "1.6.0",
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-rfdk/lib/lambdas/lambdaLayerVersionArns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
*/

/* eslint-disable */
export const ARNS = {"openssl-al2":{"ap-northeast-2":"arn:aws:lambda:ap-northeast-2:224375009292:layer:openssl-al2:2","ca-central-1":"arn:aws:lambda:ca-central-1:224375009292:layer:openssl-al2:2","eu-north-1":"arn:aws:lambda:eu-north-1:224375009292:layer:openssl-al2:2","eu-west-1":"arn:aws:lambda:eu-west-1:224375009292:layer:openssl-al2:2","us-west-2":"arn:aws:lambda:us-west-2:224375009292:layer:openssl-al2:2","ap-northeast-1":"arn:aws:lambda:ap-northeast-1:224375009292:layer:openssl-al2:2","ap-southeast-1":"arn:aws:lambda:ap-southeast-1:224375009292:layer:openssl-al2:2","eu-west-2":"arn:aws:lambda:eu-west-2:224375009292:layer:openssl-al2:2","eu-west-3":"arn:aws:lambda:eu-west-3:224375009292:layer:openssl-al2:2","ap-northeast-3":"arn:aws:lambda:ap-northeast-3:224375009292:layer:openssl-al2:1","ap-south-1":"arn:aws:lambda:ap-south-1:224375009292:layer:openssl-al2:2","ap-southeast-2":"arn:aws:lambda:ap-southeast-2:224375009292:layer:openssl-al2:2","eu-central-1":"arn:aws:lambda:eu-central-1:224375009292:layer:openssl-al2:2","sa-east-1":"arn:aws:lambda:sa-east-1:224375009292:layer:openssl-al2:2","us-east-1":"arn:aws:lambda:us-east-1:224375009292:layer:openssl-al2:2","us-east-2":"arn:aws:lambda:us-east-2:224375009292:layer:openssl-al2:2","us-west-1":"arn:aws:lambda:us-west-1:224375009292:layer:openssl-al2:2"}};
export const ARNS = {"openssl-al2":{"ap-northeast-2":"arn:aws:lambda:ap-northeast-2:224375009292:layer:openssl-al2:2","ca-central-1":"arn:aws:lambda:ca-central-1:224375009292:layer:openssl-al2:2","eu-north-1":"arn:aws:lambda:eu-north-1:224375009292:layer:openssl-al2:2","eu-west-1":"arn:aws:lambda:eu-west-1:224375009292:layer:openssl-al2:2","us-west-2":"arn:aws:lambda:us-west-2:224375009292:layer:openssl-al2:2","ap-northeast-1":"arn:aws:lambda:ap-northeast-1:224375009292:layer:openssl-al2:2","ap-southeast-1":"arn:aws:lambda:ap-southeast-1:224375009292:layer:openssl-al2:2","eu-west-2":"arn:aws:lambda:eu-west-2:224375009292:layer:openssl-al2:2","eu-west-3":"arn:aws:lambda:eu-west-3:224375009292:layer:openssl-al2:2","ap-south-1":"arn:aws:lambda:ap-south-1:224375009292:layer:openssl-al2:2","ap-southeast-2":"arn:aws:lambda:ap-southeast-2:224375009292:layer:openssl-al2:2","eu-central-1":"arn:aws:lambda:eu-central-1:224375009292:layer:openssl-al2:2","sa-east-1":"arn:aws:lambda:sa-east-1:224375009292:layer:openssl-al2:2","us-east-1":"arn:aws:lambda:us-east-1:224375009292:layer:openssl-al2:2","us-east-2":"arn:aws:lambda:us-east-2:224375009292:layer:openssl-al2:2","us-west-1":"arn:aws:lambda:us-west-1:224375009292:layer:openssl-al2:2","ap-northeast-3":"arn:aws:lambda:ap-northeast-3:224375009292:layer:openssl-al2:1"}};
4 changes: 2 additions & 2 deletions packages/aws-rfdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-rfdk",
"version": "1.5.0",
"version": "1.6.0",
"private": false,
"description": "Package for core render farm constructs",
"main": "lib/index.js",
Expand Down Expand Up @@ -93,7 +93,7 @@
"jsii-pacmak": "1.103.1",
"jsii-reflect": "1.103.1",
"jsii-rosetta": "~5.4.35",
"pkglint": "1.5.0",
"pkglint": "1.6.0",
"sinon": "^19.0.2",
"ts-jest": "^29.2.5",
"typescript": "~5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion tools/pkglint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pkglint",
"version": "1.5.0",
"version": "1.6.0",
"private": true,
"description": "Validate and fix package.json files",
"main": "lib/index.js",
Expand Down

0 comments on commit ad7023d

Please sign in to comment.