Merge pull request #1173 from aws/merge-back/1.3.0

chore(merge-back): 1.3.0
aws · Dec 22, 2023 · 04e4ab8 · 04e4ab8
2 parents 01edb9f + 8e8b169
commit 04e4ab8
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 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.3.0](https://github.com/aws/aws-rfdk/compare/v1.2.0...v1.3.0) (2023-12-22)
+
+Note: Node 14 is End of Life and RFDK >= 1.3.x no longer officially supports it. Node.js 18.0.0 is now
+the minimum officially supported version that RFDK now supports. See our documentation on [upgrading to RFDK 1.3](https://github.com/aws/aws-rfdk/blob/v1.3.0/packages/aws-rfdk/docs/upgrade/upgrading-1.3.md).
+
+### Supported CDK Version
+
+* [2.114.1](https://github.com/aws/aws-cdk/releases/tag/v2.114.1)
+
+
+### Officially Supported Deadline Versions
+
+* [10.1.9.2 to 10.3.1.4](https://docs.thinkboxsoftware.com/products/deadline/10.3/1_User%20Manual/manual/release-notes.html)
+
+
+### Features
+
+* **deadline:** DocumentDB engine version support upgraded upto version 5.0 ([#1155](https://github.com/aws/aws-rfdk/issues/1155)) ([7905f91](https://github.com/aws/aws-rfdk/commit/7905f9192f0c370f2c5be1e23a176e8f33800d75))
+
+
+### Bug Fixes
+
+* add usage-based licensing ports for new Cinema4d versions ([#1142](https://github.com/aws/aws-rfdk/pull/1142)) ([213605d](https://github.com/aws/aws-rfdk/commit/213605d2862c524a2b32718286d28e9a8203596a))
+
 ## [1.2.0](https://github.com/aws/aws-rfdk/compare/v1.1.0...v1.2.0) (2023-03-28)
 
 

diff --git a/bump.sh b/bump.sh
@@ -64,7 +64,7 @@ fi
 version_header="# \[$new_version](.*) (.*)"
 
 # Add a section to the changelog that states the supported Deadline versions
-DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.2/1_User%20Manual/manual/release-notes.html"
+DEADLINE_RELEASE_NOTE_URL="https://docs.thinkboxsoftware.com/products/deadline/10.3/1_User%20Manual/manual/release-notes.html"
 DEADLINE_SUPPORTED_VERSIONS=$(node ./scripts/getSupportedDeadlineVersions.ts)
 MIN_DEADLINE_VERSION=$(echo "$DEADLINE_SUPPORTED_VERSIONS" | grep 'Min' | cut -f 2 -d ' ')
 MAX_DEADLINE_VERSION=$(echo "$DEADLINE_SUPPORTED_VERSIONS" | grep 'Max' | cut -f 2 -d ' ')

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py
@@ -18,7 +18,7 @@
 
     install_requires=[
         "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.2.0"
+        "aws-rfdk==1.3.0"
     ],
 
     python_requires=">=3.7",

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.2.0",
+  "version": "1.3.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "aws-cdk-lib": "2.114.1",
-    "aws-rfdk": "1.2.0",
+    "aws-rfdk": "1.3.0",
     "source-map-support": "^0.5.21"
   }
 }
diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py
@@ -18,7 +18,7 @@
 
     install_requires=[
         "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.2.0"
+        "aws-rfdk==1.3.0"
     ],
 
     python_requires=">=3.7",

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.2.0",
+  "version": "1.3.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "aws-cdk-lib": "2.114.1",
-    "aws-rfdk": "1.2.0",
+    "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/examples/deadline/EC2-Image-Builder/python/setup.py b/examples/deadline/EC2-Image-Builder/python/setup.py
@@ -18,7 +18,7 @@
 
     install_requires=[
         "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.2.0",
+        "aws-rfdk==1.3.0",
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/EC2-Image-Builder/ts/package.json b/examples/deadline/EC2-Image-Builder/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-image-builder",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "aws-cdk-lib": "2.114.1",
-    "aws-rfdk": "1.2.0",
+    "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/examples/deadline/Local-Zone/python/setup.py b/examples/deadline/Local-Zone/python/setup.py
@@ -18,7 +18,7 @@
 
     install_requires=[
         "aws-cdk-lib==2.114.1",
-        "aws-rfdk==1.2.0"
+        "aws-rfdk==1.3.0"
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/Local-Zone/ts/package.json b/examples/deadline/Local-Zone/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-local-zone",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "aws-cdk-lib": "2.114.1",
-    "aws-rfdk": "1.2.0",
+    "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/integ/package.json b/integ/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integ",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": false,
   "description": "Integration tests for RFDK constructs",
   "bin": {
@@ -66,7 +66,7 @@
     "eslint-plugin-jest": "^27.6.0",
     "eslint-plugin-license-header": "^0.6.0",
     "jest": "^29.7.0",
-    "pkglint": "1.2.0",
+    "pkglint": "1.3.0",
     "ts-jest": "^29.1.1",
     "typescript": "~5.1.6"
   },
@@ -76,12 +76,12 @@
     "@aws-sdk/client-secrets-manager": "^3.470.0",
     "@aws-sdk/client-ssm": "^3.470.0",
     "aws-cdk-lib": "2.114.1",
-    "aws-rfdk": "1.2.0",
+    "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0"
   },
   "peerDependencies": {
     "aws-cdk-lib": "2.114.1",
-    "aws-rfdk": "1.2.0",
+    "aws-rfdk": "1.3.0",
     "constructs": "^10.0.0"
   },
   "engines": {

diff --git a/lambda-layers/yarn.lock b/lambda-layers/yarn.lock
@@ -2,20 +2,20 @@
 # yarn lockfile v1
 
 
-"@types/node@^18.0.0":
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
-  integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
+"@types/node@18.11.19":
+  version "18.11.19"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz#35e26df9ec441ab99d73e99e9aca82935eea216d"
+  integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw==
 
 available-typed-arrays@^1.0.5:
   version "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.1391.0:
-  version "2.1392.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1392.0.tgz#280d7cdee5b24c7242c1ba32479ba467d83b073d"
-  integrity sha512-WWY3S4wyBzt+pkRcQ7il/wW6FvFvlkkXBXY34ZvuWd91fvI0ovuq1tmqq4eVlvLacblzUkGHgq7TejwpU67OIg==
+aws-sdk@^2.1516.0:
+  version "2.1524.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1524.0.tgz#d0b60ba5276420f9e26895ffdf424e8156126226"
+  integrity sha512-nJQ7q6ykflHWkyYaobgSYkKMrqkQLKObCLPN+FfePl9Y4ZCsRVBut59wbZiYmQw1K4QitSwuBjuMdH4ES8vOpg==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -387,10 +387,10 @@ string.prototype.trimstart@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-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==
+typescript@~5.1.6:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
+  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "rejectCycles": "true",
-  "version": "1.2.0"
+  "version": "1.3.0"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-rfdk",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "license": "Apache-2.0",
   "author": {
     "name": "Amazon Web Services",

diff --git a/packages/aws-rfdk/package.json b/packages/aws-rfdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-rfdk",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": false,
   "description": "Package for core render farm constructs",
   "main": "lib/index.js",
@@ -86,7 +86,7 @@
     "jsii": "~5.2.41",
     "jsii-pacmak": "1.93.0",
     "jsii-reflect": "1.93.0",
-    "pkglint": "1.2.0",
+    "pkglint": "1.3.0",
     "sinon": "^17.0.1",
     "ts-jest": "^29.1.1",
     "typescript": "~5.1.6"
@@ -104,4 +104,4 @@
   },
   "stability": "stable",
   "maturity": "stable"
-}
+}
diff --git a/tools/pkglint/package.json b/tools/pkglint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pkglint",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": true,
   "description": "Validate and fix package.json files",
   "main": "lib/index.js",