Merge pull request #275 from aws/bump/0.22.0

chore(release): 0.22.0

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.
 
+## [0.22.0](https://github.com/aws/aws-rfdk/compare/v0.21.0...v0.22.0) (2020-12-16)
+
+
+### Supported CDK Version
+
+* [1.78.0](https://github.com/aws/aws-cdk/releases/tag/v1.78.0)
+
+
+### Officially Supported Deadline Versions
+
+* [10.1.9.2 to 10.1.12.1](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/release-notes.html)
+
+
+### Features
+
+* **deadline:** configure worker listener port ([#257](https://github.com/aws/aws-rfdk/issues/257)) ([6e518d4](https://github.com/aws/aws-rfdk/commit/6e518d4c9e85f53edfba4a9f8f97d7712d882fe1)), closes [#190](https://github.com/aws/aws-rfdk/issues/190)
+
+
+### Bug Fixes
+
+* **deadline:** Improve error message when querying non-existant Deadline version ([#262](https://github.com/aws/aws-rfdk/issues/262)) ([cabdb58](https://github.com/aws/aws-rfdk/commit/cabdb58efbaa152de94d83702d357da951c98204))
+
 ## [0.21.0](https://github.com/aws/aws-rfdk/compare/v0.20.0...v0.21.0) (2020-11-27)
 
 

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

@@ -17,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk.core==1.75.0",
-        "aws-rfdk==0.21.0"
+        "aws-cdk.core==1.78.0",
+        "aws-rfdk==0.22.0"
     ],
 
     python_requires=">=3.7",

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

@@ -15,11 +15,11 @@ import { MongoDbSsplLicenseAcceptance } from 'aws-rfdk';
 class AppConfig {
 
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.11.5 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.12.1 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the one in
    * package.json used for staging the render queue and usage based licensing recipes.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0b12631d34ca9939f'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-039f0c1faba28b015'};
 
   /**
    * (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.

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

@@ -1,11 +1,11 @@
 {
   "name": "all-in-farm-basic",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "bin": {
     "app": "bin/app.js"
   },
   "config": {
-    "deadline_ver": "10.1.11.5",
+    "deadline_ver": "10.1.12.1",
     "stage_path": "stage"
   },
   "scripts": {
@@ -18,14 +18,14 @@
     "watch": "tsc -w"
   },
   "devDependencies": {
-    "@types/node": "^14.14.10",
-    "aws-cdk": "1.75.0",
-    "ts-node": "^9.0.0",
-    "typescript": "~4.0.5"
+    "@types/node": "^14.14.14",
+    "aws-cdk": "1.78.0",
+    "ts-node": "^9.1.1",
+    "typescript": "~4.1.3"
   },
   "dependencies": {
-    "@aws-cdk/core": "1.75.0",
-    "aws-rfdk": "0.21.0",
+    "@aws-cdk/core": "1.78.0",
+    "aws-rfdk": "0.22.0",
     "source-map-support": "^0.5.19"
   }
 }

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

@@ -17,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk.core==1.75.0",
-        "aws-rfdk==0.21.0"
+        "aws-cdk.core==1.78.0",
+        "aws-rfdk==0.22.0"
     ],
 
     python_requires=">=3.7",

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

@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-sep",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -18,14 +18,14 @@
     "watch": "tsc -w"
   },
   "devDependencies": {
-    "@types/node": "^14.14.9",
-    "aws-cdk": "1.75.0",
-    "ts-node": "^9.0.0",
-    "typescript": "~3.9.7"
+    "@types/node": "^14.14.14",
+    "aws-cdk": "1.78.0",
+    "ts-node": "^9.1.1",
+    "typescript": "~4.1.3"
   },
   "dependencies": {
-    "@aws-cdk/core": "1.75.0",
-    "aws-rfdk": "0.21.0",
+    "@aws-cdk/core": "1.78.0",
+    "aws-rfdk": "0.22.0",
     "source-map-support": "^0.5.19"
   }
 }

integ/components/deadline/common/functions/awaitSsmCommand.ts

@@ -14,7 +14,7 @@ interface CommandResponse {
 
 // Custom function to send SSM command to run a particular script on the bastion instance,
 // wait for it to finish executing, then return the response.
-export default function awaitSsmCommand(bastionId: string, params: SSM.SendCommandRequest){
+export default function awaitSsmCommand(bastionId: string, params: SSM.SendCommandRequest): Promise<CommandResponse> {
   return new Promise<CommandResponse>( async (res) => {
 
     // Send the command
@@ -27,7 +27,7 @@ export default function awaitSsmCommand(bastionId: string, params: SSM.SendComma
         }
         else {
           var command = data.Command as SSM.Command;
-          _res(command.CommandId);
+          _res(command.CommandId as string);
         }
       });
     });

integ/components/deadline/deadline_01_repository/test/deadline_01_repository.test.ts

@@ -33,7 +33,7 @@ let certSecretARNs: Array<any> = [];
 
 beforeAll( () => {
   // Query the TestingStack and await its outputs to use as test inputs
-  return new Promise( (res,rej) => {
+  return new Promise<void>( (res,rej) => {
     var params = {
       StackName: testingStackName,
     };
@@ -203,7 +203,7 @@ describe.each(testCases)('Deadline Repository tests (%s)', (_, id) => {
       var params = {
         logGroupName: logGroupNames[id],
       };
-      return new Promise( (res,rej) => {
+      return new Promise<void>( (res,rej) => {
         logs.describeLogStreams(params, (err, data) => {
           if (err) {
             rej(err);
@@ -241,7 +241,7 @@ describe.each(testCases)('Deadline Repository tests (%s)', (_, id) => {
       let logEvents: Object;
 
       beforeAll( () => {
-        return new Promise( (res, rej) => {
+        return new Promise<void>( (res, rej) => {
           var params = {
             logGroupName: logGroupNames[id],
             logStreamName: cloudInitLogName,
@@ -299,7 +299,7 @@ describe.each(testCases)('Deadline Repository tests (%s)', (_, id) => {
       let logEvents: Object;
 
       beforeAll( () => {
-        return new Promise( (res, rej) => {
+        return new Promise<void>( (res, rej) => {
           var params = {
             logGroupName: logGroupNames[id],
             logStreamName: deadlineLogName,

integ/components/deadline/deadline_02_renderQueue/test/deadline_02_renderQueue.test.ts

@@ -26,7 +26,7 @@ let secretARNs: Array<string> = [];
 
 beforeAll( () => {
   // Query the TestingStack and await its outputs to use as test inputs
-  return new Promise( (res,rej) => {
+  return new Promise<void>( (res,rej) => {
     var params = {
       StackName: testingStackName,
     };

integ/components/deadline/deadline_03_workerFleetHttp/test/deadline_03_workerFleetHttp.test.ts

@@ -23,7 +23,7 @@ let renderQueueEndpoints: Array<string> = [];
 
 beforeAll( () => {
   // Query the TestingStack and await its outputs to use as test inputs
-  return new Promise( (res,rej) => {
+  return new Promise<void>( (res,rej) => {
     var params = {
       StackName: testingStackName,
     };

integ/components/deadline/deadline_04_workerFleetHttps/test/deadline_04_workerFleetHttps.test.ts

@@ -29,7 +29,7 @@ let secretARNs: Array<string> = [];
 
 beforeAll( () => {
   // Query the TestingStack and await its outputs to use as test inputs
-  return new Promise( (res,rej) => {
+  return new Promise<void>( (res,rej) => {
     var params = {
       StackName: testingStackName,
     };

integ/package.json

@@ -1,6 +1,6 @@
 {
   "name": "integ",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": false,
   "description": "Integration tests for RFDK constructs",
   "bin": {
@@ -55,54 +55,54 @@
     "pkglint": "pkglint -f"
   },
   "devDependencies": {
-    "@aws-cdk/assert": "1.75.0",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.10",
-    "@typescript-eslint/eslint-plugin": "^4.8.2",
-    "@typescript-eslint/parser": "^4.8.2",
-    "aws-cdk": "1.75.0",
-    "eslint": "^7.14.0",
+    "@aws-cdk/assert": "1.78.0",
+    "@types/jest": "^26.0.19",
+    "@types/node": "^14.14.14",
+    "@typescript-eslint/eslint-plugin": "^4.10.0",
+    "@typescript-eslint/parser": "^4.10.0",
+    "aws-cdk": "1.78.0",
+    "eslint": "^7.15.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^2.3.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-license-header": "^0.2.0",
     "jest": "^26.6.3",
-    "pkglint": "0.21.0",
+    "pkglint": "0.22.0",
     "ts-jest": "^26.4.4"
   },
   "dependencies": {
-    "@aws-cdk/aws-docdb": "1.75.0",
-    "@aws-cdk/aws-ec2": "1.75.0",
-    "@aws-cdk/aws-ecr": "1.75.0",
-    "@aws-cdk/aws-ecs": "1.75.0",
-    "@aws-cdk/aws-efs": "1.75.0",
-    "@aws-cdk/aws-elasticloadbalancingv2": "1.75.0",
-    "@aws-cdk/aws-iam": "1.75.0",
-    "@aws-cdk/aws-logs": "1.75.0",
-    "@aws-cdk/aws-route53": "1.75.0",
-    "@aws-cdk/aws-s3": "1.75.0",
-    "@aws-cdk/aws-s3-assets": "1.75.0",
-    "@aws-cdk/aws-secretsmanager": "1.75.0",
-    "@aws-cdk/core": "1.75.0",
-    "aws-rfdk": "0.21.0",
-    "aws-sdk": "^2.799.0"
+    "@aws-cdk/aws-docdb": "1.78.0",
+    "@aws-cdk/aws-ec2": "1.78.0",
+    "@aws-cdk/aws-ecr": "1.78.0",
+    "@aws-cdk/aws-ecs": "1.78.0",
+    "@aws-cdk/aws-efs": "1.78.0",
+    "@aws-cdk/aws-elasticloadbalancingv2": "1.78.0",
+    "@aws-cdk/aws-iam": "1.78.0",
+    "@aws-cdk/aws-logs": "1.78.0",
+    "@aws-cdk/aws-route53": "1.78.0",
+    "@aws-cdk/aws-s3": "1.78.0",
+    "@aws-cdk/aws-s3-assets": "1.78.0",
+    "@aws-cdk/aws-secretsmanager": "1.78.0",
+    "@aws-cdk/core": "1.78.0",
+    "aws-rfdk": "0.22.0",
+    "aws-sdk": "^2.810.0"
   },
   "peerDependencies": {
-    "@aws-cdk/aws-docdb": "1.75.0",
-    "@aws-cdk/aws-ec2": "1.75.0",
-    "@aws-cdk/aws-ecr": "1.75.0",
-    "@aws-cdk/aws-ecs": "1.75.0",
-    "@aws-cdk/aws-efs": "1.75.0",
-    "@aws-cdk/aws-elasticloadbalancingv2": "1.75.0",
-    "@aws-cdk/aws-iam": "1.75.0",
-    "@aws-cdk/aws-logs": "1.75.0",
-    "@aws-cdk/aws-route53": "1.75.0",
-    "@aws-cdk/aws-s3": "1.75.0",
-    "@aws-cdk/aws-s3-assets": "1.75.0",
-    "@aws-cdk/aws-secretsmanager": "1.75.0",
-    "@aws-cdk/core": "1.75.0",
-    "aws-rfdk": "0.21.0",
-    "aws-sdk": "^2.799.0"
+    "@aws-cdk/aws-docdb": "1.78.0",
+    "@aws-cdk/aws-ec2": "1.78.0",
+    "@aws-cdk/aws-ecr": "1.78.0",
+    "@aws-cdk/aws-ecs": "1.78.0",
+    "@aws-cdk/aws-efs": "1.78.0",
+    "@aws-cdk/aws-elasticloadbalancingv2": "1.78.0",
+    "@aws-cdk/aws-iam": "1.78.0",
+    "@aws-cdk/aws-logs": "1.78.0",
+    "@aws-cdk/aws-route53": "1.78.0",
+    "@aws-cdk/aws-s3": "1.78.0",
+    "@aws-cdk/aws-s3-assets": "1.78.0",
+    "@aws-cdk/aws-secretsmanager": "1.78.0",
+    "@aws-cdk/core": "1.78.0",
+    "aws-rfdk": "0.22.0",
+    "aws-sdk": "^2.810.0"
   },
   "engines": {
     "node": ">= 10.13.0 <13 || >=13.7.0"

integ/scripts/bash/rfdk-integ-e2e.sh

@@ -43,8 +43,8 @@ mkdir -p $INTEG_TEMP_DIR
 $BASH_SCRIPTS/stage-deadline.sh
 
 # Extract the Deadline version to use for Deadline installations on the farm.
-# Tests allow not specifying or specifying a partial version string such as "10.1.11". After staging, we
-# obtain the fully resolved version (e.g. "10.1.11.5") which is required to determine
+# Tests allow not specifying or specifying a partial version string such as "10.1.12". After staging, we
+# obtain the fully resolved version (e.g. "10.1.12.1") which is required to determine
 # the matching AWS Portal AMI IDs
 export DEADLINE_VERSION=$(node -e $'const json = require(process.argv[1] + \'/manifest.json\'); console.log(json.version)' "$DEADLINE_STAGING_PATH")
 

lambda-layers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-layers",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": false,
   "description": "Package containing scripts for building and publishing Lambda Layers",
   "main": "lib/index.js",
@@ -29,10 +29,10 @@
   "stability": "stable",
   "maturity": "stable",
   "devDependencies": {
-    "@types/node": "^14.14.10",
-    "typescript": "~4.0.5"
+    "@types/node": "^14.14.14",
+    "typescript": "~4.1.3"
   },
   "dependencies": {
-    "aws-sdk": "^2.799.0"
+    "aws-sdk": "^2.810.0"
   }
 }

lambda-layers/yarn.lock

@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@types/node@^14.14.10":
-  version "14.14.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
-  integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
-
-aws-sdk@^2.799.0:
-  version "2.799.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.799.0.tgz#8b1a64c1a9f8ccf5794eb07bdd8051e4cb6adcfd"
-  integrity sha512-NYAoiNU+bJXhlJsC0rFqrmD5t5ho7/VxldmziP6HLPYHfOCI9Uvk6UVjfPmhLWPm0mHnIxhsHqmsNGyjhHNYmw==
+"@types/node@^14.14.14":
+  version "14.14.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
+  integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==
+
+aws-sdk@^2.810.0:
+  version "2.810.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.810.0.tgz#67b11eb7ac6bb967c5fbbdba523872d45cfa52db"
+  integrity sha512-+Sj+Ec00t675/0Kjisk4GIZGs7olsbu4//b5WrwPriYTV/xqJnXCPMpj3EZEV1z5Vx3PZD6dA6PTU4VZPPVcBw==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -76,10 +76,10 @@ sax@>=0.6.0:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-typescript@~4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
-  integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
+typescript@~4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 [email protected]:
   version "0.10.3"

lerna.json

@@ -3,5 +3,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "rejectCycles": "true",
-  "version": "0.21.0"
+  "version": "0.22.0"
 }