Merge pull request #420 from aws/bump/0.31.0

chore(release): 0.31.0
aws · May 11, 2021 · 2692fbd · 2692fbd
2 parents 98dbb16 + 1c30132
commit 2692fbd
Show file tree

Hide file tree

Showing 43 changed files with 1,684 additions and 1,223 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
 
+## [0.31.0](https://github.com/aws/aws-rfdk/compare/v0.30.0...v0.31.0) (2021-05-11)
+
+
+### Supported CDK Version
+
+* [1.102.0](https://github.com/aws/aws-cdk/releases/tag/v1.102.0)
+
+
+### Officially Supported Deadline Versions
+
+* [10.1.9.2 to 10.1.15.2](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/release-notes.html)
+
+
+### Bug Fixes
+
+* **core:** added securty group property to HealthMonitor ([#408](https://github.com/aws/aws-rfdk/issues/408)) ([c2ed9e7](https://github.com/aws/aws-rfdk/commit/c2ed9e71e1bf60b01cee4621ac088d7cc08a7bbe))
+
 ## [0.30.0](https://github.com/aws/aws-rfdk/compare/v0.29.0...v0.30.0) (2021-04-21)
 
 

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ If you discover a potential security issue in this project we ask that you notif
 
 Contributions to the RFDK are encouraged. If you want to fix a problem, or want to enhance the library in any way, then
 we are happy to accept your contribution. Information on contributing to the RFDK can be found
-[in CONTRIBUTING.md](https://github.com/aws/aws-rfdk/blob/mainline/CONTRIBUTING.md).
+[in CONTRIBUTING.md](https://github.com/aws/aws-rfdk/blob/release/CONTRIBUTING.md).
 
 ## Code of Conduct
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py
@@ -40,10 +40,10 @@ def __init__(self):
         # to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.12"
         self.deadline_version: Optional[str] = None
 
-        # A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.13.2 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 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 version of
         # Deadline used in any connected Deadline constructs.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0237f13ce87af168e'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0c8431fc72742c110'}
 
         # A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
         self.ubl_certificate_secret_arn: str =\

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py b/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.99.0",
-        "aws-rfdk==0.30.0"
+        "aws-cdk.core==1.102.0",
+        "aws-rfdk==0.31.0"
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts
@@ -41,11 +41,11 @@ class AppConfig {
   public readonly deadlineVersion?: string;
 
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.13.2 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 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 version of
    * Deadline used in any connected Deadline constructs.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0237f13ce87af168e'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0c8431fc72742c110'};
 
   /**
    * (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.

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": "0.30.0",
+  "version": "0.31.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,13 +14,13 @@
   },
   "devDependencies": {
     "@types/node": "^14.14.41",
-    "aws-cdk": "1.99.0",
+    "aws-cdk": "1.102.0",
     "ts-node": "^9.1.1",
     "typescript": "~4.2.4"
   },
   "dependencies": {
-    "@aws-cdk/core": "1.99.0",
-    "aws-rfdk": "0.30.0",
+    "@aws-cdk/core": "1.102.0",
+    "aws-rfdk": "0.31.0",
     "source-map-support": "^0.5.19"
   }
 }
diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py
@@ -14,10 +14,10 @@ class AppConfig:
     TODO: Fill these in with your own values.
     """
     def __init__(self):
-        # A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.12.1 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 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 used for staging the render queue and usage based licensing recipes.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-039f0c1faba28b015'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0c8431fc72742c110'}
 
 
 config: AppConfig = AppConfig()
diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py b/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.99.0",
-        "aws-rfdk==0.30.0"
+        "aws-cdk.core==1.102.0",
+        "aws-rfdk==0.31.0"
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts
@@ -12,10 +12,10 @@ import 'source-map-support/register';
  */
 class AppConfig {
   /**
-   * 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
+   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-039f0c1faba28b015'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0c8431fc72742c110'};
 }
 
 export const config = new AppConfig();
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": "0.30.0",
+  "version": "0.31.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -19,13 +19,13 @@
   },
   "devDependencies": {
     "@types/node": "^14.14.41",
-    "aws-cdk": "1.99.0",
+    "aws-cdk": "1.102.0",
     "ts-node": "^9.1.1",
     "typescript": "~4.2.4"
   },
   "dependencies": {
-    "@aws-cdk/core": "1.99.0",
-    "aws-rfdk": "0.30.0",
+    "@aws-cdk/core": "1.102.0",
+    "aws-rfdk": "0.31.0",
     "source-map-support": "^0.5.19"
   }
 }
diff --git a/examples/deadline/EC2-Image-Builder/python/setup.py b/examples/deadline/EC2-Image-Builder/python/setup.py
@@ -17,12 +17,12 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk.aws-iam==1.99.0",
-        "aws-cdk.aws-imagebuilder==1.99.0",
-        "aws-cdk.aws-ec2==1.99.0",
-        "aws-cdk.aws-s3-assets==1.99.0",
-        "aws-cdk.core==1.99.0",
-        "aws-rfdk==0.30.0",
+        "aws-cdk.aws-iam==1.102.0",
+        "aws-cdk.aws-imagebuilder==1.102.0",
+        "aws-cdk.aws-ec2==1.102.0",
+        "aws-cdk.aws-s3-assets==1.102.0",
+        "aws-cdk.core==1.102.0",
+        "aws-rfdk==0.31.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": "0.30.0",
+  "version": "0.31.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -15,16 +15,16 @@
   },
   "devDependencies": {
     "@types/node": "^14.14.41",
-    "aws-cdk": "1.99.0",
+    "aws-cdk": "1.102.0",
     "ts-node": "^9.1.1",
     "typescript": "~4.2.4"
   },
   "dependencies": {
-    "@aws-cdk/aws-ec2": "1.99.0",
-    "@aws-cdk/aws-iam": "1.99.0",
-    "@aws-cdk/aws-imagebuilder": "1.99.0",
-    "@aws-cdk/aws-s3-assets": "1.99.0",
-    "@aws-cdk/core": "1.99.0",
-    "aws-rfdk": "0.30.0"
+    "@aws-cdk/aws-ec2": "1.102.0",
+    "@aws-cdk/aws-iam": "1.102.0",
+    "@aws-cdk/aws-imagebuilder": "1.102.0",
+    "@aws-cdk/aws-s3-assets": "1.102.0",
+    "@aws-cdk/core": "1.102.0",
+    "aws-rfdk": "0.31.0"
   }
 }
diff --git a/integ/components/deadline/deadline_01_repository/bin/deadline_01_repository.ts b/integ/components/deadline/deadline_01_repository/bin/deadline_01_repository.ts
@@ -3,12 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { App, Stack } from '@aws-cdk/core';
+import { App, Stack, Aspects } from '@aws-cdk/core';
 import {
   Stage,
   ThinkboxDockerRecipes,
 } from 'aws-rfdk/deadline';
 
+import { SSMInstancePolicyAspect } from '../../../../lib/ssm-policy-aspect';
 import { DatabaseType, StorageStruct } from '../../../../lib/storage-struct';
 import { RepositoryTestingTier } from '../lib/repository-testing-tier';
 
@@ -46,3 +47,6 @@ const structs: Array<StorageStruct> = [
 ];
 
 new RepositoryTestingTier(app, 'RFDKInteg-DL-TestingTier' + integStackTag, { env, integStackTag, structs });
+
+// Adds IAM Policy to Instance and ASG Roles
+Aspects.of(app).add(new SSMInstancePolicyAspect());
diff --git a/integ/components/deadline/deadline_02_renderQueue/bin/deadline_02_renderQueue.ts b/integ/components/deadline/deadline_02_renderQueue/bin/deadline_02_renderQueue.ts
@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { App, Stack } from '@aws-cdk/core';
+import { App, Stack, Aspects } from '@aws-cdk/core';
 import {
   Stage,
   ThinkboxDockerRecipes,
 } from 'aws-rfdk/deadline';
 
 import { RenderStruct } from '../../../../lib/render-struct';
+import { SSMInstancePolicyAspect } from '../../../../lib/ssm-policy-aspect';
 import { DatabaseType, StorageStruct } from '../../../../lib/storage-struct';
 import { RenderQueueTestingTier } from '../lib/renderQueue-testing-tier';
 
@@ -57,3 +58,6 @@ const structs: Array<RenderStruct> = [
 ];
 
 new RenderQueueTestingTier(app, 'RFDKInteg-RQ-TestingTier' + integStackTag, { env, integStackTag, structs });
+
+// Adds IAM Policy to Instance and ASG Roles
+Aspects.of(app).add(new SSMInstancePolicyAspect());
diff --git a/integ/components/deadline/deadline_03_workerFleetHttp/bin/deadline_03_workerFleetHttp.ts b/integ/components/deadline/deadline_03_workerFleetHttp/bin/deadline_03_workerFleetHttp.ts
@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { App, Stack } from '@aws-cdk/core';
+import { App, Stack, Aspects } from '@aws-cdk/core';
 import {
   Stage,
   ThinkboxDockerRecipes,
 } from 'aws-rfdk/deadline';
 
 import { RenderStruct } from '../../../../lib/render-struct';
+import { SSMInstancePolicyAspect } from '../../../../lib/ssm-policy-aspect';
 import { DatabaseType, StorageStruct } from '../../../../lib/storage-struct';
 import { WorkerStruct } from '../../../../lib/worker-struct';
 import { WorkerFleetTestingTier } from '../lib/workerFleetHttp-testing-tier';
@@ -61,3 +62,6 @@ oss.forEach( (os, index) => {
 });
 
 new WorkerFleetTestingTier(app, 'RFDKInteg-WF-TestingTier' + integStackTag, {env, integStackTag, structs});
+
+// Adds IAM Policy to Instance and ASG Roles
+Aspects.of(app).add(new SSMInstancePolicyAspect());
diff --git a/integ/components/deadline/deadline_04_workerFleetHttps/bin/deadline_04_workerFleetHttps.ts b/integ/components/deadline/deadline_04_workerFleetHttps/bin/deadline_04_workerFleetHttps.ts
@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { App, Stack } from '@aws-cdk/core';
+import { App, Stack, Aspects } from '@aws-cdk/core';
 import {
   Stage,
   ThinkboxDockerRecipes,
 } from 'aws-rfdk/deadline';
 
 import { RenderStruct } from '../../../../lib/render-struct';
+import { SSMInstancePolicyAspect } from '../../../../lib/ssm-policy-aspect';
 import { DatabaseType, StorageStruct } from '../../../../lib/storage-struct';
 import { WorkerStruct } from '../../../../lib/worker-struct';
 import { WorkerFleetTestingTier } from '../lib/workerFleetHttps-testing-tier';
@@ -61,3 +62,6 @@ oss.forEach( (os, index) => {
 });
 
 new WorkerFleetTestingTier(app, 'RFDKInteg-WFS-TestingTier' + integStackTag, {env, integStackTag, structs});
+
+// Adds IAM Policy to Instance and ASG Roles
+Aspects.of(app).add(new SSMInstancePolicyAspect());
diff --git a/integ/lib/ssm-policy-aspect.ts b/integ/lib/ssm-policy-aspect.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AutoScalingGroup } from '@aws-cdk/aws-autoscaling';
+import { Instance } from '@aws-cdk/aws-ec2';
+import { ManagedPolicy } from '@aws-cdk/aws-iam';
+import * as cdk from '@aws-cdk/core';
+
+export class SSMInstancePolicyAspect implements cdk.IAspect {
+  private static readonly SSM_POLICY = ManagedPolicy.fromAwsManagedPolicyName('AmazonSSMManagedInstanceCore');
+  public visit(node: cdk.IConstruct): void {
+    if (node instanceof Instance || node instanceof AutoScalingGroup) {
+      node.role.addManagedPolicy(SSMInstancePolicyAspect.SSM_POLICY);
+    }
+  }
+}