chore(release): 1.50.0 (#8926)

See [CHANGELOG](https://github.com/aws/aws-cdk/blob/bump/1.50.0/CHANGELOG.md)

CHANGELOG.md

@@ -2,6 +2,39 @@
 
 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.50.0](https://github.com/aws/aws-cdk/compare/v1.49.1...v1.50.0) (2020-07-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* **eks:** `version` is now a mandatory property
+
+### Features
+
+* **apigatewayv2:** http api - custom domain & stage mapping ([#8027](https://github.com/aws/aws-cdk/issues/8027)) ([5e43348](https://github.com/aws/aws-cdk/commit/5e43348ecdb6a8da865bb0db22c4782b6fa4bc96)), closes [#7847](https://github.com/aws/aws-cdk/issues/7847)
+* **autoscaling:** allow setting autoscaling group name ([#8853](https://github.com/aws/aws-cdk/issues/8853)) ([38d8414](https://github.com/aws/aws-cdk/commit/38d84149bae213d0e285d5192265043a8c0de1aa))
+* **cfn-include:** add support for retrieving Output objects from the template ([#8821](https://github.com/aws/aws-cdk/issues/8821)) ([0b09bbb](https://github.com/aws/aws-cdk/commit/0b09bbb1d43192db71f682ff4f3ad125eb231d91)), closes [#8820](https://github.com/aws/aws-cdk/issues/8820)
+* **custom-resources:** include handler log group in error messages ([#8839](https://github.com/aws/aws-cdk/issues/8839)) ([8e055d4](https://github.com/aws/aws-cdk/commit/8e055d449808f97436b92b6d6e57f8053e289653))
+* **eks:** document how to add a manifest from url ([#8802](https://github.com/aws/aws-cdk/issues/8802)) ([b5acfaa](https://github.com/aws/aws-cdk/commit/b5acfaac89351ff6285acfdb36145bccca4b6b65)), closes [#8340](https://github.com/aws/aws-cdk/issues/8340)
+* **eks:** support cluster version pinning ([#8889](https://github.com/aws/aws-cdk/issues/8889)) ([a732d14](https://github.com/aws/aws-cdk/commit/a732d149ff33f6958b83d539ba3429a025dcd631)), closes [#7762](https://github.com/aws/aws-cdk/issues/7762)
+* **lambda:** efs filesystems ([#8602](https://github.com/aws/aws-cdk/issues/8602)) ([8529387](https://github.com/aws/aws-cdk/commit/8529387cb901fd1fea9e0ee1af1284de3ad98ce7)), closes [#8595](https://github.com/aws/aws-cdk/issues/8595)
+* **lambda-nodejs:** allow jsx and tsx entry files ([#8892](https://github.com/aws/aws-cdk/issues/8892)) ([4ba20fd](https://github.com/aws/aws-cdk/commit/4ba20fd2f1579034483683995fac1e18e97a1b12))
+* **s3-deployment:** prune - keep missing files on destination bucket ([#8263](https://github.com/aws/aws-cdk/issues/8263)) ([57914c7](https://github.com/aws/aws-cdk/commit/57914c7f430b69ae54c9d2d9fac4da1092b45b42)), closes [#953](https://github.com/aws/aws-cdk/issues/953)
+* **stepfunctions:** stepfunctions and stepfunctions-tasks modules are now stable! ([#8912](https://github.com/aws/aws-cdk/issues/8912)) ([ae2378c](https://github.com/aws/aws-cdk/commit/ae2378cc2a537277025c9104bc43a4cc68318650)), closes [#6489](https://github.com/aws/aws-cdk/issues/6489)
+* **stepfunctions-tasks:** task for invoking a Step Functions activity worker ([#8840](https://github.com/aws/aws-cdk/issues/8840)) ([021533c](https://github.com/aws/aws-cdk/commit/021533caa8f4e515299d1f0cdaadd9f625d6f64d))
+
+
+### Bug Fixes
+
+* **apigateway:** Lambda integration for imported functions ([#8870](https://github.com/aws/aws-cdk/issues/8870)) ([8420f96](https://github.com/aws/aws-cdk/commit/8420f96ffd6201656e908d6d7f61cdbbc3331cc1)), closes [#8869](https://github.com/aws/aws-cdk/issues/8869)
+* **config:** cannot scope a custom rule without configurationChanges on ([#8738](https://github.com/aws/aws-cdk/issues/8738)) ([841060d](https://github.com/aws/aws-cdk/commit/841060d6adde4ea6d58e008f85cc155b8c3a3768))
+* **core:** asset bundling fails with BuildKit ([#8911](https://github.com/aws/aws-cdk/issues/8911)) ([c1d4e0f](https://github.com/aws/aws-cdk/commit/c1d4e0fecbdf716eb55578ad5721a0ead4b306e2))
+* **eks:** incorrect enableDockerBridge value when enabled ([#8895](https://github.com/aws/aws-cdk/issues/8895)) ([ea0552a](https://github.com/aws/aws-cdk/commit/ea0552a4378d61cffd14483896abadad7afa5a0a)), closes [#5786](https://github.com/aws/aws-cdk/issues/5786)
+* **eks:** kubectl resources fail before fargate profiles are created ([#8859](https://github.com/aws/aws-cdk/issues/8859)) ([4fad9bc](https://github.com/aws/aws-cdk/commit/4fad9bcbd75702e89eea02a140aa010f8952329a)), closes [#8854](https://github.com/aws/aws-cdk/issues/8854) [#8574](https://github.com/aws/aws-cdk/issues/8574)
+* **eks:** missing nodegroup identity in aws-auth after awsAuth.addMasterRole ([#8901](https://github.com/aws/aws-cdk/issues/8901)) ([a9c66f7](https://github.com/aws/aws-cdk/commit/a9c66f780b233ce3c25e12f39e3b1122636411b3)), closes [#7595](https://github.com/aws/aws-cdk/issues/7595)
+* **lambda-nodejs:** maximum call stack size exceeded with relative entry file path ([#8907](https://github.com/aws/aws-cdk/issues/8907)) ([c585e18](https://github.com/aws/aws-cdk/commit/c585e1873e437341ac1b90afbe85a9cb9e6dc2d6)), closes [#8902](https://github.com/aws/aws-cdk/issues/8902)
+* **rds:** proxy for db cluster fails with model validation error ([#8896](https://github.com/aws/aws-cdk/issues/8896)) ([7d47cfb](https://github.com/aws/aws-cdk/commit/7d47cfb39ba40a223ccc511e5706f471b9225c52)), closes [#8885](https://github.com/aws/aws-cdk/issues/8885) [#8476](https://github.com/aws/aws-cdk/issues/8476)
+
 ## [1.49.1](https://github.com/aws/aws-cdk/compare/v1.49.0...v1.49.1) (2020-07-02)
 
 ### Bug Fixes

lerna.json

@@ -10,5 +10,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.49.1"
+  "version": "1.50.0"
 }

packages/@aws-cdk/assert/jest.ts

@@ -1,5 +1,6 @@
 import * as core from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
+import { countResources } from './lib';
 import { JestFriendlyAssertion } from './lib/assertion';
 import { haveOutput, HaveOutputProperties } from './lib/assertions/have-output';
 import { HaveResourceAssertion, ResourcePart } from './lib/assertions/have-resource';
@@ -25,6 +26,8 @@ declare global {
         comparison?: ResourcePart): R;
 
       toHaveOutput(props: HaveOutputProperties): R;
+
+      toCountResources(resourceType: string, count: number): R;
     }
   }
 }
@@ -77,6 +80,14 @@ expect.extend({
 
     return applyAssertion(haveOutput(props), actual);
   },
+
+  toCountResources(
+    actual: cxapi.CloudFormationStackArtifact | core.Stack,
+    resourceType: string,
+    count = 1) {
+
+    return applyAssertion(countResources(resourceType, count), actual);
+  },
 });
 
 function applyAssertion(assertion: JestFriendlyAssertion<StackInspector>, actual: cxapi.CloudFormationStackArtifact | core.Stack) {

packages/@aws-cdk/assert/lib/assertions/count-resources.ts

@@ -1,11 +1,11 @@
-import { Assertion } from '../assertion';
+import { Assertion, JestFriendlyAssertion } from '../assertion';
 import { StackInspector } from '../inspector';
 import { isSuperObject } from './have-resource';
 
 /**
  * An assertion to check whether a resource of a given type and with the given properties exists, disregarding properties
  */
-export function countResources(resourceType: string, count = 1): Assertion<StackInspector> {
+export function countResources(resourceType: string, count = 1): JestFriendlyAssertion<StackInspector> {
   return new CountResourcesAssertion(resourceType, count);
 }
 
@@ -16,7 +16,7 @@ export function countResourcesLike(resourceType: string, count = 1, props: any):
   return new CountResourcesAssertion(resourceType, count, props);
 }
 
-class CountResourcesAssertion extends Assertion<StackInspector> {
+class CountResourcesAssertion extends JestFriendlyAssertion<StackInspector> {
   private inspected: number = 0;
   private readonly props: any;
 
@@ -48,6 +48,10 @@ class CountResourcesAssertion extends Assertion<StackInspector> {
     return counted === this.count;
   }
 
+  public generateErrorMessage(): string {
+    return this.description;
+  }
+
   public get description(): string {
     return `stack only has ${this.inspected} resource of type ${this.resourceType}${this.props ? ' with specified properties' : ''} but we expected to find ${this.count}`;
   }

packages/@aws-cdk/aws-apigateway/lib/integration.ts

@@ -135,9 +135,33 @@ export interface IntegrationProps {
 }
 
 /**
- * Result of binding an Integration to the Method
+ * Result of binding an Integration to a Method.
  */
 export interface IntegrationConfig {
+  /**
+   * Integration options.
+   * @default - no integration options
+   */
+  readonly options?: IntegrationOptions;
+
+  /**
+   * Specifies an API method integration type.
+   */
+  readonly type: IntegrationType;
+
+  /**
+   * The Uniform Resource Identifier (URI) for the integration.
+   * @see https://docs.aws.amazon.com/apigateway/api-reference/resource/integration/#uri
+   * @default - no URI. Usually applies to MOCK integration
+   */
+  readonly uri?: string;
+
+  /**
+   * The integration's HTTP method type.
+   * @default - no integration method specified.
+   */
+  readonly integrationHttpMethod?: string;
+
   /**
    * This value is included in computing the Deployment's fingerprint. When the fingerprint
    * changes, a new deployment is triggered.
@@ -155,23 +179,32 @@ export interface IntegrationConfig {
  * or implement on your own by specifying the set of props.
  */
 export class Integration {
-  constructor(private readonly props: IntegrationProps) { }
-
-  /**
-   * Allows `Method` to access the integration props.
-   *
-   * @internal
-   */
-  public get _props() {
-    return this.props;
+  constructor(private readonly props: IntegrationProps) {
+    const options = this.props.options || { };
+    if (options.credentialsPassthrough !== undefined && options.credentialsRole !== undefined) {
+      throw new Error('\'credentialsPassthrough\' and \'credentialsRole\' are mutually exclusive');
+    }
+
+    if (options.connectionType === ConnectionType.VPC_LINK && options.vpcLink === undefined) {
+      throw new Error('\'connectionType\' of VPC_LINK requires \'vpcLink\' prop to be set');
+    }
+
+    if (options.connectionType === ConnectionType.INTERNET && options.vpcLink !== undefined) {
+      throw new Error('cannot set \'vpcLink\' where \'connectionType\' is INTERNET');
+    }
   }
 
   /**
    * Can be overridden by subclasses to allow the integration to interact with the method
    * being integrated, access the REST API object, method ARNs, etc.
    */
-  public bind(_method: Method): IntegrationConfig | undefined {
-    return;
+  public bind(_method: Method): IntegrationConfig {
+    return {
+      options: this.props.options,
+      type: this.props.type,
+      uri: this.props.uri,
+      integrationHttpMethod: this.props.integrationHttpMethod,
+    };
   }
 }
 

packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts

@@ -92,8 +92,9 @@ export class AwsIntegration extends Integration {
     });
   }
 
-  public bind(method: Method): IntegrationConfig | undefined {
+  public bind(method: Method): IntegrationConfig {
+    const bindResult = super.bind(method);
     this.scope = method;
-    return;
+    return bindResult;
   }
 }

packages/@aws-cdk/aws-apigateway/lib/integrations/lambda.ts

@@ -52,8 +52,8 @@ export class LambdaIntegration extends AwsIntegration {
     this.enableTest = options.allowTestInvoke === undefined ? true : false;
   }
 
-  public bind(method: Method): IntegrationConfig | undefined {
-    super.bind(method);
+  public bind(method: Method): IntegrationConfig {
+    const bindResult = super.bind(method);
     const principal = new iam.ServicePrincipal('apigateway.amazonaws.com');
 
     const desc = `${method.api.node.uniqueId}.${method.httpMethod}.${method.resource.path.replace(/\//g, '.')}`;
@@ -89,6 +89,7 @@ export class LambdaIntegration extends AwsIntegration {
       deploymentToken = JSON.stringify({ functionName });
     }
     return {
+      ...bindResult,
       deploymentToken,
     };
   }

packages/@aws-cdk/aws-apigateway/lib/method.ts

@@ -1,7 +1,7 @@
 import { Construct, Resource, Stack } from '@aws-cdk/core';
 import { CfnMethod, CfnMethodProps } from './apigateway.generated';
 import { Authorizer, IAuthorizer } from './authorizer';
-import { ConnectionType, Integration } from './integration';
+import { Integration, IntegrationConfig } from './integration';
 import { MockIntegration } from './integrations/mock';
 import { MethodResponse } from './methodresponse';
 import { IModel } from './model';
@@ -204,7 +204,7 @@ export class Method extends Resource {
       authorizationType,
       authorizerId,
       requestParameters: options.requestParameters || defaultMethodOptions.requestParameters,
-      integration: this.renderIntegration(integration),
+      integration: this.renderIntegration(bindResult),
       methodResponses: this.renderMethodResponses(options.methodResponses),
       requestModels: this.renderRequestModels(options.requestModels),
       requestValidatorId: this.requestValidatorId(options),
@@ -263,22 +263,9 @@ export class Method extends Resource {
     return this.api.arnForExecuteApi(this.httpMethod, pathForArn(this.resource.path), 'test-invoke-stage');
   }
 
-  private renderIntegration(integration: Integration): CfnMethod.IntegrationProperty {
-    const options = integration._props.options || { };
-
+  private renderIntegration(bindResult: IntegrationConfig): CfnMethod.IntegrationProperty {
+    const options = bindResult.options ?? {};
     let credentials;
-    if (options.credentialsPassthrough !== undefined && options.credentialsRole !== undefined) {
-      throw new Error('\'credentialsPassthrough\' and \'credentialsRole\' are mutually exclusive');
-    }
-
-    if (options.connectionType === ConnectionType.VPC_LINK && options.vpcLink === undefined) {
-      throw new Error('\'connectionType\' of VPC_LINK requires \'vpcLink\' prop to be set');
-    }
-
-    if (options.connectionType === ConnectionType.INTERNET && options.vpcLink !== undefined) {
-      throw new Error('cannot set \'vpcLink\' where \'connectionType\' is INTERNET');
-    }
-
     if (options.credentialsRole) {
       credentials = options.credentialsRole.roleArn;
     } else if (options.credentialsPassthrough) {
@@ -288,12 +275,12 @@ export class Method extends Resource {
     }
 
     return {
-      type: integration._props.type,
-      uri: integration._props.uri,
+      type: bindResult.type,
+      uri: bindResult.uri,
       cacheKeyParameters: options.cacheKeyParameters,
       cacheNamespace: options.cacheNamespace,
       contentHandling: options.contentHandling,
-      integrationHttpMethod: integration._props.integrationHttpMethod,
+      integrationHttpMethod: bindResult.integrationHttpMethod,
       requestParameters: options.requestParameters,
       requestTemplates: options.requestTemplates,
       passthroughBehavior: options.passthroughBehavior,

packages/@aws-cdk/aws-apigateway/test/test.integration.ts

@@ -0,0 +1,58 @@
+import * as ec2 from '@aws-cdk/aws-ec2';
+import * as elbv2 from '@aws-cdk/aws-elasticloadbalancingv2';
+import * as iam from '@aws-cdk/aws-iam';
+import * as cdk from '@aws-cdk/core';
+import { Test } from 'nodeunit';
+import * as apigw from '../lib';
+
+export = {
+  'integration "credentialsRole" and "credentialsPassthrough" are mutually exclusive'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const role = new iam.Role(stack, 'MyRole', { assumedBy: new iam.ServicePrincipal('foo') });
+
+    // THEN
+    test.throws(() => new apigw.Integration({
+      type: apigw.IntegrationType.AWS_PROXY,
+      options: {
+        credentialsPassthrough: true,
+        credentialsRole: role,
+      },
+    }), /'credentialsPassthrough' and 'credentialsRole' are mutually exclusive/);
+    test.done();
+  },
+
+  'integration connectionType VpcLink requires vpcLink to be set'(test: Test) {
+    test.throws(() => new apigw.Integration({
+      type: apigw.IntegrationType.HTTP_PROXY,
+      integrationHttpMethod: 'ANY',
+      options: {
+        connectionType: apigw.ConnectionType.VPC_LINK,
+      },
+    }), /'connectionType' of VPC_LINK requires 'vpcLink' prop to be set/);
+    test.done();
+  },
+
+  'connectionType of INTERNET and vpcLink are mutually exclusive'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const vpc = new ec2.Vpc(stack, 'VPC');
+    const nlb = new elbv2.NetworkLoadBalancer(stack, 'NLB', {
+      vpc,
+    });
+    const link = new apigw.VpcLink(stack, 'link', {
+      targets: [nlb],
+    });
+
+    // THEN
+    test.throws(() => new apigw.Integration({
+      type: apigw.IntegrationType.HTTP_PROXY,
+      integrationHttpMethod: 'ANY',
+      options: {
+        connectionType: apigw.ConnectionType.INTERNET,
+        vpcLink: link,
+      },
+    }), /cannot set 'vpcLink' where 'connectionType' is INTERNET/);
+    test.done();
+  },
+};