Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(merge-back): 1.2.0 #1027

Merged
merged 2 commits into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

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.2.0](https://github.com/aws/aws-rfdk/compare/v1.1.0...v1.2.0) (2023-03-28)


### Supported CDK Version

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


### Officially Supported Deadline Versions

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


### Bug Fixes

* update Deadline version to 10.2 in the SEP example ([#1021](https://github.com/aws/aws-rfdk/issues/1021)) ([d5b8c62](https://github.com/aws/aws-rfdk/commit/d5b8c62fac95593fbfb46e71869aa05529e9771f))

## [1.1.0](https://github.com/aws/aws-rfdk/compare/v1.0.0...v1.1.0) (2022-12-16)


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

install_requires=[
"aws-cdk-lib==2.70.0",
"aws-rfdk==1.1.0"
"aws-rfdk==1.2.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.1.0",
"version": "1.2.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.70.0",
"aws-rfdk": "1.1.0",
"aws-rfdk": "1.2.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.70.0",
"aws-rfdk==1.1.0"
"aws-rfdk==1.2.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.1.0",
"version": "1.2.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -25,7 +25,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.70.0",
"aws-rfdk": "1.1.0",
"aws-rfdk": "1.2.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.70.0",
"aws-rfdk==1.1.0",
"aws-rfdk==1.2.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.1.0",
"version": "1.2.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -21,7 +21,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.70.0",
"aws-rfdk": "1.1.0",
"aws-rfdk": "1.2.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.70.0",
"aws-rfdk==1.1.0"
"aws-rfdk==1.2.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.1.0",
"version": "1.2.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"aws-cdk-lib": "2.70.0",
"aws-rfdk": "1.1.0",
"aws-rfdk": "1.2.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
}
Expand Down
10 changes: 5 additions & 5 deletions integ/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "integ",
"version": "1.1.0",
"version": "1.2.0",
"private": false,
"description": "Integration tests for RFDK constructs",
"bin": {
Expand Down Expand Up @@ -66,7 +66,7 @@
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-license-header": "^0.6.0",
"jest": "^27.5.1",
"pkglint": "1.1.0",
"pkglint": "1.2.0",
"ts-jest": "^29.0.5",
"typescript": "~4.9.5"
},
Expand All @@ -76,15 +76,15 @@
"@aws-sdk/client-secrets-manager": "^3.297.0",
"@aws-sdk/client-ssm": "^3.300.0",
"aws-cdk-lib": "2.70.0",
"aws-rfdk": "1.1.0",
"aws-rfdk": "1.2.0",
"constructs": "^10.0.0"
},
"peerDependencies": {
"aws-cdk-lib": "2.70.0",
"aws-rfdk": "1.1.0",
"aws-rfdk": "1.2.0",
"constructs": "^10.0.0"
},
"engines": {
"node": ">= 14.15.0"
}
}
}
2 changes: 1 addition & 1 deletion lambda-layers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lambda-layers",
"version": "1.1.0",
"version": "1.2.0",
"private": false,
"description": "Package containing scripts for building and publishing Lambda Layers",
"main": "lib/index.js",
Expand Down
16 changes: 8 additions & 8 deletions lambda-layers/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ available-typed-arrays@^1.0.5:
resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==

aws-sdk@^2.1272.0:
version "2.1276.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1276.0.tgz#60d32305b687a1c8367370574d2b0d1c40d30e26"
integrity sha512-0TGPsW/uMQy0trfYZD+dvSQ9Bf8NmKK9ISj5xQJGopNt/Kxh0vLKBPy2mFmKdxeFtis6wn4c9uTp7/3p0ADa1w==
aws-sdk@^2.1334.0:
version "2.1345.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1345.0.tgz#0b34784fe8d15858a8f9a6903217621364133868"
integrity sha512-qQGQgHH/cDFvr3bMGVIqcU38IlRQv1jGt4JBxOXtnf9NZ1AO/CRTKfZs9TmbkID3YbfYHJjYAlQKmmRL6/MZdg==
dependencies:
buffer "4.9.2"
events "1.1.1"
Expand Down Expand Up @@ -387,10 +387,10 @@ string.prototype.trimstart@^1.0.5:
define-properties "^1.1.4"
es-abstract "^1.19.5"

typescript@~4.8.4:
version "4.8.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
typescript@~4.9.5:
version "4.9.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==

unbox-primitive@^1.0.2:
version "1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"npmClient": "yarn",
"useWorkspaces": true,
"rejectCycles": "true",
"version": "1.1.0"
"version": "1.2.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.1.0",
"version": "1.2.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-south-1":"arn:aws:lambda:ap-south-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-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-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"}};
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.1.0",
"version": "1.2.0",
"private": false,
"description": "Package for core render farm constructs",
"main": "lib/index.js",
Expand Down Expand Up @@ -86,7 +86,7 @@
"jsii": "^1.77.0",
"jsii-pacmak": "^1.77.0",
"jsii-reflect": "^1.77.0",
"pkglint": "1.1.0",
"pkglint": "1.2.0",
"sinon": "^15.0.3",
"ts-jest": "^29.0.5",
"typescript": "~4.9.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.1.0",
"version": "1.2.0",
"private": true,
"description": "Validate and fix package.json files",
"main": "lib/index.js",
Expand Down