chore(release): 0.18.0

.github/dependabot.yml

@@ -13,6 +13,12 @@ updates:
     ignore:
       - dependency-name: "@types/node"
         versions: ">=11.0.0-0"
+      - dependency-name: "constructs"
+        versions: ">=3.0.4"
       - dependency-name: "@aws-cdk/*"
     commit-message:
       prefix: "chore(deps):"
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of .github/workflows
+    schedule:
+      interval: "daily"

.github/semantic.yml

@@ -0,0 +1,2 @@
+# Configuration for Semantic Pull Requests
+titleOnly: true

.github/workflows/auto-approve.yml

@@ -0,0 +1,15 @@
+# Automatically approve PRs made by Dependabot
+
+name: Auto Approve Dependabot PR's
+
+on:
+  pull_request
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hmarr/auto-approve-action@v2.0.0
+      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2.1.2
       with:
         node-version: ${{ matrix.node-version }}
     - run: yarn global add typescript

.github/workflows/labeler.yml

@@ -13,14 +13,13 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       -
         name: Run Labeler
         if: success()
-        uses: crazy-max/ghaction-github-labeler@v2
+        uses: crazy-max/ghaction-github-labeler@v3
         with:
-          yaml_file: .github/config/labels.yml
-          skip_delete: false
-          dry_run: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          yaml-file: .github/config/labels.yml
+          skip-delete: false
+          dry-run: false

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 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.18.0](https://github.com/aws/aws-rfdk/compare/v0.17.0...v0.18.0) (2020-10-13)
+
+
+### Features
+
+* **bin:** Add simpler way to invoke stage-deadline ([#90](https://github.com/aws/aws-rfdk/issues/90)) ([cb68992](https://github.com/aws/aws-rfdk/commit/cb68992de1c72f7997de6ff81f1b0c09e88dacaf))
+* **deadline:** add ability to add spot event plugin managed policies to RenderQueue ([#141](https://github.com/aws/aws-rfdk/issues/141)) ([b2cf9e0](https://github.com/aws/aws-rfdk/commit/b2cf9e0cd8264b106e8f705f379181beb6916653))
+* **integ:** add ability to use hook function before each component test  ([#155](https://github.com/aws/aws-rfdk/issues/155)) ([792586e](https://github.com/aws/aws-rfdk/commit/792586eeb5befedbe810ca6a91867ed006c029f0))
+* Update stage-deadline script with new version index  ([#139](https://github.com/aws/aws-rfdk/issues/139)) ([9cbf99f](https://github.com/aws/aws-rfdk/commit/9cbf99f1a1f2effbfe85ab0ecbdcaecd418056db))
+
+
+### Bug Fixes
+
+* allowing empty log group prefixes ([#87](https://github.com/aws/aws-rfdk/issues/87)) ([e53571c](https://github.com/aws/aws-rfdk/commit/e53571c7d249f8efb81517af7031f264d0baf1d2))
+* **core:** Remove encryption on lifecycle SNS Topic ([#163](https://github.com/aws/aws-rfdk/issues/163)) ([5b663ca](https://github.com/aws/aws-rfdk/commit/5b663ca17713bdaf3f27aa568a6c4242ef2ceb61)), closes [#162](https://github.com/aws/aws-rfdk/issues/162)
+* **deadline:** adding deadline version check for workers ([#100](https://github.com/aws/aws-rfdk/issues/100)) ([291f903](https://github.com/aws/aws-rfdk/commit/291f9033389157b745a0a812b4cb5584ea5fe05c))
+* **deadline:** adding version check for staging deadline ([#109](https://github.com/aws/aws-rfdk/issues/109)) ([75d0f9f](https://github.com/aws/aws-rfdk/commit/75d0f9fedce52de9dcfe73482965de923fa8941d))
+* **deadline:** Disable client SSL config for HTTP Render Queue ([#167](https://github.com/aws/aws-rfdk/issues/167)) ([fe347fa](https://github.com/aws/aws-rfdk/commit/fe347fa135d1b5008adb7990b93600f6638afc83)), closes [#165](https://github.com/aws/aws-rfdk/issues/165)
+* **examples:** bump cdk core module version ([#122](https://github.com/aws/aws-rfdk/issues/122)) ([20db251](https://github.com/aws/aws-rfdk/commit/20db251d6b8fc53f8560637818e53e47ae106b49))
+* **examples:** Fix instructions and formatting in example app README ([#111](https://github.com/aws/aws-rfdk/issues/111)) ([f050f41](https://github.com/aws/aws-rfdk/commit/f050f41500b8d005d246c37e225895f0489debda)), closes [#105](https://github.com/aws/aws-rfdk/issues/105)
+* **examples:** Minor fixes to Python example app REAME ([84b5ffa](https://github.com/aws/aws-rfdk/commit/84b5ffac9e282510c71f8e0348d24a573b2b337a))
+* **integ:** fix when PRE_COMPONENT_HOOK is undefined ([#166](https://github.com/aws/aws-rfdk/issues/166)) ([b4bfd4e](https://github.com/aws/aws-rfdk/commit/b4bfd4ec475c3e94002ac961c3b2ce6c8abd65ee)), closes [#164](https://github.com/aws/aws-rfdk/issues/164)
+
 ## [0.17.0]() (Link not implemented) (2020-08-26)
 
 

build.sh

@@ -48,6 +48,6 @@ rm -rf $BUILD_INDICATOR
 
 echo "============================================================================================="
 echo "building..."
-time lerna run $bail --stream $runtarget || fail
+time lerna run $bail --stream $runtarget  --ignore 'all-in-farm**' || fail
 
 touch $BUILD_INDICATOR

examples/deadline/All-In-AWS-Infrastructure-Basic/README.md

@@ -74,7 +74,7 @@ This sample application deploys a basic Deadline Render farm using Usage-Based L
 | |                                                   |   v     v     v   |              | Health Monitor |            | |
 | |                                                   | +-++         ++-+ |              |                |            | |
 | |                                                   | |  |   ...   |  | |    Monitors  |   +-------+    |            | |
-| |                                                   | +--+         +--+ <--------------+   |  NLB  |    |            | |
+| |                                                   | +--+         +--+ <--------------+   |  ALB  |    |            | |
 | |                                                   |                   |              |   +-------+    |            | |
 | |                                                   +-------------------+              |                |            | |
 | |                                                                                      +----------------+            | |

examples/deadline/All-In-AWS-Infrastructure-Basic/python/README.md

@@ -12,66 +12,95 @@ These instructions assume that your working directory is `examples/deadline/All-
 
 ---
 
-1. Install the dependencies of the sample app:
-```bash
-pip install -r requirements.txt
-```
-2. Change the value in the `deadline_client_linux_ami_map` variable in `bin/config.py` to include the region + AMI ID mapping of your EC2 AMI(s) with Deadline Worker.
-```python
-# For example, in the us-west-2 region
-self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': '<your ami id'}
-
-```
-3. Create a binary secret in [SecretsManager](https://aws.amazon.com/secrets-manager/) that contains your [Usage-Based Licensing](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/aws-portal/licensing-setup.html?highlight=usage%20based%20licensing) certificates in a `.zip` file:
-```bash
-aws secretsmanager create-secret --name <name> --secret-binary fileb://<path-to-zip-file>
-```
-4. The output from the previous step will contain the secret's ARN. Change the value of the `ubl_certificate_secret_arn` variable in `bin/config.py` to the secret's ARN:
-```python
-self.ubl_certificate_secret_arn: str = '<your secret arn>'
-```
-5. Choose your UBL limits and change the value of the `ubl_licenses` variable in `bin/config.py` accordingly:
-```python
-self.ubl_licenses: List[UsageBasedLicense] = [<your-ubl-limits> (e.g. UsageBasedLicense.forMaya(10))]
-```
----
+1.  Install the dependencies of the sample app:
 
-**Note:** The next two steps are optional. You may skip these if you do not need SSH access into your render farm.
+    ```bash
+    pip install -r requirements.txt
+    ```
+2.  Change the value in the `deadline_client_linux_ami_map` variable in `package/config.py` to include the region + AMI ID mapping of your EC2 AMI(s) with Deadline Worker.
 
----
-6. Create an EC2 key pair to give you SSH access to the render farm:
-```bash
-aws ec2 create-key-pair --key-name <key-name>
-```
-7.  Change the value of the `key_pair_name` variable in `bin/config.py` to your value for `<key-name>` in the previous step: <br><br>**Note:** Save the value of the "KeyMaterial" field as a file in a secure location. This is your private key that you can use to SSH into the render farm.
-```python
-self.key_pair_name: Optional[str] = '<your key pair name>'
-```
-8. Choose the type of database you would like to deploy and change the value of the `deploy_mongo_db` variable in `bin/config.py` accordingly:
-```python
-# True = MongoDB, False = Amazon DocumentDB
-self.deploy_mongo_db: bool = False
-```
-9. If you set `deploy_mongo_db` to `True`, then you must accept the [SSPL license](https://www.mongodb.com/licensing/server-side-public-license) to successfully deploy MongoDB. To do so, change the value of `accept_sspl_license` in `bin/config.py`:
-```python
-self.accept_sspl_license: MongoDbSsplLicenseAcceptance = MongoDbSsplLicenseAcceptance.USER_REJECTS_SSPL
-```
-10. Modify the `deadline_ver` field in the `config` block of `package.json` as desired, then stage the Docker recipes for `RenderQueue` and `UBLLicensing`:
-```bash
-# Set this value to the version of RFDK your application targets
-RFDK_VERSION=
-# Set this value to the version of AWS Thinkbox Deadline you'd like to deploy to your farm
-RFDK_DEADLINE_VERSION=
-npx --package=aws-rfdk@${RFDK_VERSION} stage-deadline \
-    --deadlineInstallerURI s3://thinkbox-installers/Deadline/${RFDK_DEADLINE_VERSION}/Linux/DeadlineClient-${RFDK_DEADLINE_VERSION}-linux-x64-installer.run \
-    --dockerRecipesURI s3://thinkbox-installers/DeadlineDocker/${RFDK_DEADLINE_VERSION}/DeadlineDocker-${RFDK_DEADLINE_VERSION}.tar.gz \
-    --output stage
-```
+    ```python
+    # For example, in the us-west-2 region
+    self.deadline_client_linux_ami_map: Mapping[str, str] = {
+        'us-west-2': '<your ami id>'
+    }
+    ```
+3.  Create a binary secret in [SecretsManager](https://aws.amazon.com/secrets-manager/) that contains your [Usage-Based Licensing](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/aws-portal/licensing-setup.html?highlight=usage%20based%20licensing) certificates in a `.zip` file:
+
+    ```bash
+    aws secretsmanager create-secret --name <name> --secret-binary fileb://<path-to-zip-file>
+    ```
+4.  The output from the previous step will contain the secret's ARN. Change the value of the `ubl_certificate_secret_arn` variable in `package/config.py` to the secret's ARN:
+
+    ```python
+    self.ubl_certificate_secret_arn: str = '<your secret arn>'
+    ```
+5.  Choose your UBL limits and change the value of the `ubl_licenses` variable in `package/config.py` accordingly. For example:
+
+    ```python
+    self.ubl_licenses: List[UsageBasedLicense] = [
+        # your UBL limits, for example:
+
+        # up to 10 concurrent Maya licenses used at once
+        UsageBasedLicense.for_maya(10),
+
+        # unlimited Arnold licenses
+        UsageBasedLicense.for_arnold()
+    ]
+    ```
+
+    ---
+
+    **Note:** The next two steps are optional. You may skip these if you do not need SSH access into your render farm.
+
+    ---
+6.  Create an EC2 key pair to give you SSH access to the render farm:
+
+    ```bash
+    aws ec2 create-key-pair --key-name <key-name>
+    ```
+7.  Change the value of the `key_pair_name` variable in `package/config.py` to your value for `<key-name>` in the previous step:
+
+    **Note:** Save the value of the `"KeyMaterial"` field as a file in a secure location. This is your private key that you can use to SSH into the render farm.
+
+    ```python
+    self.key_pair_name: Optional[str] = '<your key pair name>'
+    ```
+8.  Choose the type of database you would like to deploy (AWS DocumentDB or MongoDB).
+    If you would like to use MongoDB, you will need to accept the Mongo SSPL (see next step).
+    Once you've decided on a database type, change the value of the `deploy_mongo_db` variable in `package/config.py` accordingly:
+
+    ```python
+    # True = MongoDB, False = Amazon DocumentDB
+    self.deploy_mongo_db: bool = False
+    ```
+9.  If you set `deploy_mongo_db` to `True`, then you must accept the [SSPL license](https://www.mongodb.com/licensing/server-side-public-license) to successfully deploy MongoDB. To do so, change the value of `accept_sspl_license` in `package/config.py`:
+
+    ```python
+    # To accept the MongoDB SSPL, change from USER_REJECTS_SSPL to USER_ACCEPTS_SSPL
+    self.accept_sspl_license: MongoDbSsplLicenseAcceptance = MongoDbSsplLicenseAcceptance.USER_REJECTS_SSPL
+    ```
+10. Stage the Docker recipes for `RenderQueue` and `UBLLicensing`:
+
+    ```bash
+    # Set this value to the version of RFDK your application targets
+    RFDK_VERSION=<version_of_RFDK>
+
+    # Set this value to the version of AWS Thinkbox Deadline you'd like to deploy to your farm. Deadline 10.1.9 and up are supported.
+    RFDK_DEADLINE_VERSION=<version_of_deadline>
+
+    npx --package=aws-rfdk@${RFDK_VERSION} stage-deadline \
+        --deadlineInstallerURI s3://thinkbox-installers/Deadline/${RFDK_DEADLINE_VERSION}/Linux/DeadlineClient-${RFDK_DEADLINE_VERSION}-linux-x64-installer.run \
+        --dockerRecipesURI s3://thinkbox-installers/DeadlineDocker/${RFDK_DEADLINE_VERSION}/DeadlineDocker-${RFDK_DEADLINE_VERSION}.tar.gz \
+        --output stage
+    ```
 11. Deploy all the stacks in the sample app:
-```bash
-cdk deploy "*"
-```
+
+    ```bash
+    cdk deploy "*"
+    ```
 13. Once you are finished with the sample app, you can tear it down by running:
-```bash
-cdk destroy "*"
-```
+
+    ```bash
+    cdk destroy "*"
+    ```

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

@@ -18,7 +18,7 @@
 
     install_requires=[
         "aws-cdk.core==1.57.0",
-        "aws-rfdk==0.16.0"
+        "aws-rfdk==0.17.0"
     ],
 
     python_requires=">=3.7",