Merge branch 'master' into ebs_L2

aws · Jun 26, 2020 · 17128cf · 17128cf
2 parents 2da39bf + 10bd8e4
commit 17128cf
Show file tree

Hide file tree

Showing 28 changed files with 163 additions and 60 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.47.0](https://github.com/aws/aws-cdk/compare/v1.46.0...v1.47.0) (2020-06-24)
+
+
+### ⚠ BREAKING CHANGES
+
+* **stepfunctions-tasks:** `Dynamo*` tasks no longer implement`IStepFunctionsTask` and have been replaced by constructs that can be instantiated directly. See README for examples 
+
+### Features
+
+* **cfn-include:** add support for retrieving parameter objects ([#8658](https://github.com/aws/aws-cdk/issues/8658)) ([52dc123](https://github.com/aws/aws-cdk/commit/52dc123ba8696abcfad99d8093e98cd39b5b104f)), closes [#8657](https://github.com/aws/aws-cdk/issues/8657)
+* **cfn-include:** support logical id overrides ([#8529](https://github.com/aws/aws-cdk/issues/8529)) ([d9c4f5e](https://github.com/aws/aws-cdk/commit/d9c4f5e67c54e1a2a436978fbc28fffd92b24cd6)), closes [#7375](https://github.com/aws/aws-cdk/issues/7375)
+* **cloudwatch:** CompositeAlarm ([#8498](https://github.com/aws/aws-cdk/issues/8498)) ([1e6d293](https://github.com/aws/aws-cdk/commit/1e6d293f4c445318b11bd6fe998325688a675807))
+* **efs:** access point ([#8631](https://github.com/aws/aws-cdk/issues/8631)) ([dde0ef5](https://github.com/aws/aws-cdk/commit/dde0ef52cc0cdbc40fd212f518f3cee4f30450b9))
+* **stepfunctions:** grant APIs for state machine construct ([#8486](https://github.com/aws/aws-cdk/issues/8486)) ([fe71364](https://github.com/aws/aws-cdk/commit/fe71364b6cd8274e937cc2dc9185249dcbbb9388)), closes [#5933](https://github.com/aws/aws-cdk/issues/5933)
+* **stepfunctions-tasks:** task constructs to call DynamoDB APIs ([#8466](https://github.com/aws/aws-cdk/issues/8466)) ([a7cb3b7](https://github.com/aws/aws-cdk/commit/a7cb3b7633c433ecb0619c030914bfa497ee39bc)), closes [#8108](https://github.com/aws/aws-cdk/issues/8108)
+
+
+### Bug Fixes
+
+* **appsync:** Not to throw an Error even if 'additionalAuthorizationModes' is undefined ([#8673](https://github.com/aws/aws-cdk/issues/8673)) ([6b5d77b](https://github.com/aws/aws-cdk/commit/6b5d77b452bccb35564d6acee118112156149eb0)), closes [#8666](https://github.com/aws/aws-cdk/issues/8666) [#8668](https://github.com/aws/aws-cdk/issues/8668)
+* **cli:** cannot change policies or trust after initial bootstrap ([#8677](https://github.com/aws/aws-cdk/issues/8677)) ([6e6b23e](https://github.com/aws/aws-cdk/commit/6e6b23e329d8a1b6455210768371a5ab9de478ef)), closes [#6581](https://github.com/aws/aws-cdk/issues/6581)
+* **cli:** crash on tiny reported terminal width ([#8675](https://github.com/aws/aws-cdk/issues/8675)) ([a186c24](https://github.com/aws/aws-cdk/commit/a186c24918fddc697270b794b6603add5a47e947)), closes [#8667](https://github.com/aws/aws-cdk/issues/8667)
+* **toolkit:** CLI tool fails on CloudFormation Throttling ([#8711](https://github.com/aws/aws-cdk/issues/8711)) ([e512a40](https://github.com/aws/aws-cdk/commit/e512a4057b21d32432d4dc7ac14ae7caa812265d)), closes [#5637](https://github.com/aws/aws-cdk/issues/5637)
+
 ## [1.46.0](https://github.com/aws/aws-cdk/compare/v1.45.0...v1.46.0) (2020-06-19)
 
 

diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.46.0"
+  "version": "1.47.0"
 }
diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json
@@ -64,7 +64,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@types/nodeunit": "^0.0.31",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",

diff --git a/packages/@aws-cdk/aws-cloudtrail/package.json b/packages/@aws-cdk/aws-cloudtrail/package.json
@@ -64,7 +64,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",

diff --git a/packages/@aws-cdk/aws-codebuild/package.json b/packages/@aws-cdk/aws-codebuild/package.json
@@ -70,7 +70,7 @@
     "@aws-cdk/aws-sns": "0.0.0",
     "@aws-cdk/aws-sqs": "0.0.0",
     "@types/nodeunit": "^0.0.31",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",

diff --git a/packages/@aws-cdk/aws-codecommit/package.json b/packages/@aws-cdk/aws-codecommit/package.json
@@ -70,7 +70,7 @@
     "@aws-cdk/assert": "0.0.0",
     "@aws-cdk/aws-sns": "0.0.0",
     "@types/nodeunit": "^0.0.31",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",

diff --git a/packages/@aws-cdk/aws-cognito/lib/user-pool-domain.ts b/packages/@aws-cdk/aws-cognito/lib/user-pool-domain.ts
@@ -83,6 +83,8 @@ export class UserPoolDomain extends Resource implements IUserPoolDomain {
   public readonly domainName: string;
   private isCognitoDomain: boolean;
 
+  private cloudFrontCustomResource?: AwsCustomResource;
+
   constructor(scope: Construct, id: string, props: UserPoolDomainProps) {
     super(scope, id);
 
@@ -113,25 +115,27 @@ export class UserPoolDomain extends Resource implements IUserPoolDomain {
    * The domain name of the CloudFront distribution associated with the user pool domain.
    */
   public get cloudFrontDomainName(): string {
-    const sdkCall: AwsSdkCall = {
-      service: 'CognitoIdentityServiceProvider',
-      action: 'describeUserPoolDomain',
-      parameters: {
-        Domain: this.domainName,
-      },
-      physicalResourceId: PhysicalResourceId.of(this.domainName),
-    };
-    const customResource = new AwsCustomResource(this, 'CloudFrontDomainName', {
-      resourceType: 'Custom::UserPoolCloudFrontDomainName',
-      onCreate: sdkCall,
-      onUpdate: sdkCall,
-      policy: AwsCustomResourcePolicy.fromSdkCalls({
-        // DescribeUserPoolDomain only supports access level '*'
-        // https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncognitouserpools.html#amazoncognitouserpools-actions-as-permissions
-        resources: [ '*' ],
-      }),
-    });
-    return customResource.getResponseField('DomainDescription.CloudFrontDistribution');
+    if (!this.cloudFrontCustomResource) {
+      const sdkCall: AwsSdkCall = {
+        service: 'CognitoIdentityServiceProvider',
+        action: 'describeUserPoolDomain',
+        parameters: {
+          Domain: this.domainName,
+        },
+        physicalResourceId: PhysicalResourceId.of(this.domainName),
+      };
+      this.cloudFrontCustomResource = new AwsCustomResource(this, 'CloudFrontDomainName', {
+        resourceType: 'Custom::UserPoolCloudFrontDomainName',
+        onCreate: sdkCall,
+        onUpdate: sdkCall,
+        policy: AwsCustomResourcePolicy.fromSdkCalls({
+          // DescribeUserPoolDomain only supports access level '*'
+          // https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncognitouserpools.html#amazoncognitouserpools-actions-as-permissions
+          resources: [ '*' ],
+        }),
+      });
+    }
+    return this.cloudFrontCustomResource.getResponseField('DomainDescription.CloudFrontDistribution');
   }
 
   /**

diff --git a/packages/@aws-cdk/aws-cognito/test/user-pool-domain.test.ts b/packages/@aws-cdk/aws-cognito/test/user-pool-domain.test.ts
@@ -103,7 +103,7 @@ describe('User Pool Client', () => {
     })).not.toThrow();
   });
 
-  test('custom resource is added when cloudFrontDistribution method is called', () => {
+  test('custom resource is added when cloudFrontDomainName property is used', () => {
     // GIVEN
     const stack = new Stack();
     const pool = new UserPool(stack, 'Pool');
@@ -137,6 +137,21 @@ describe('User Pool Client', () => {
     });
   });
 
+  test('cloudFrontDomainName property can be called multiple times', () => {
+    const stack = new Stack();
+    const pool = new UserPool(stack, 'Pool');
+    const domain = pool.addDomain('Domain', {
+      cognitoDomain: {
+        domainPrefix: 'cognito-domain-prefix',
+      },
+    });
+
+    const cfDomainNameFirst = domain.cloudFrontDomainName;
+    const cfDomainNameSecond = domain.cloudFrontDomainName;
+
+    expect(cfDomainNameSecond).toEqual(cfDomainNameFirst);
+  });
+
   describe('signInUrl', () => {
     test('returns the expected URL', () => {
       // GIVEN

diff --git a/packages/@aws-cdk/aws-dynamodb/package.json b/packages/@aws-cdk/aws-dynamodb/package.json
@@ -65,7 +65,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@types/jest": "^26.0.3",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "aws-sdk-mock": "^5.1.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",

diff --git a/packages/@aws-cdk/aws-eks/package.json b/packages/@aws-cdk/aws-eks/package.json
@@ -64,7 +64,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@types/nodeunit": "^0.0.31",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",

diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts
@@ -205,11 +205,13 @@ const ELBV2_ACCOUNTS: { [region: string]: string } = {
   'us-east-2': '033677994240',
   'us-west-1': '027434742980',
   'us-west-2': '797873946194',
+  'af-south-1': '098369216593',
   'ca-central-1': '985666609251',
   'eu-central-1': '054676820928',
   'eu-west-1': '156460612806',
   'eu-west-2': '652711504416',
   'eu-west-3': '009996457667',
+  'eu-south-1': '635631232127',
   'eu-north-1': '897822967062',
   'ap-east-1': '754344448648',
   'ap-northeast-1': '582318560864',

diff --git a/packages/@aws-cdk/aws-events-targets/package.json b/packages/@aws-cdk/aws-events-targets/package.json
@@ -68,7 +68,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@aws-cdk/aws-codecommit": "0.0.0",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "aws-sdk-mock": "^5.1.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",

diff --git a/packages/@aws-cdk/aws-lambda/package.json b/packages/@aws-cdk/aws-lambda/package.json
@@ -71,7 +71,7 @@
     "@types/lodash": "^4.14.157",
     "@types/nodeunit": "^0.0.31",
     "@types/sinon": "^9.0.4",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "aws-sdk-mock": "^5.1.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",

diff --git a/packages/@aws-cdk/aws-route53/package.json b/packages/@aws-cdk/aws-route53/package.json
@@ -64,7 +64,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@types/nodeunit": "^0.0.31",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",

diff --git a/packages/@aws-cdk/aws-s3-notifications/lib/lambda.ts b/packages/@aws-cdk/aws-s3-notifications/lib/lambda.ts
@@ -13,7 +13,7 @@ export class LambdaDestination implements s3.IBucketNotificationDestination {
   public bind(_scope: Construct, bucket: s3.IBucket): s3.BucketNotificationDestinationConfig {
     const permissionId = `AllowBucketNotificationsFrom${bucket.node.uniqueId}`;
 
-    if (this.fn.node.tryFindChild(permissionId) === undefined) {
+    if (this.fn.permissionsNode.tryFindChild(permissionId) === undefined) {
       this.fn.addPermission(permissionId, {
         sourceAccount: Stack.of(bucket).account,
         principal: new iam.ServicePrincipal('s3.amazonaws.com'),
@@ -23,7 +23,7 @@ export class LambdaDestination implements s3.IBucketNotificationDestination {
 
     // if we have a permission resource for this relationship, add it as a dependency
     // to the bucket notifications resource, so it will be created first.
-    const permission = this.fn.node.tryFindChild(permissionId) as CfnResource | undefined;
+    const permission = this.fn.permissionsNode.tryFindChild(permissionId) as CfnResource | undefined;
 
     return {
       type: s3.BucketNotificationDestinationType.LAMBDA,

diff --git a/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts b/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts
@@ -70,3 +70,52 @@ test('lambda as notification target specified by function arn', () => {
     },
   });
 });
+
+test('permissions are added as a dependency to the notifications resource when using singleton function', () => {
+
+  const stack = new Stack();
+  const bucket = new s3.Bucket(stack, 'MyBucket');
+  const fn = new lambda.SingletonFunction(stack, 'MyFunction', {
+    uuid: 'uuid',
+    runtime: lambda.Runtime.NODEJS_10_X,
+    handler: 'index.handler',
+    code: lambda.Code.fromInline('foo'),
+  });
+
+  const lambdaDestination = new s3n.LambdaDestination(fn);
+
+  bucket.addEventNotification(s3.EventType.OBJECT_CREATED, lambdaDestination, { prefix: 'v1/'});
+
+  const notifications = stack.node.findAll().filter(c => c.node.id === 'Notifications')[0];
+  const dependencies = notifications!.node.dependencies;
+
+  expect(dependencies[0].target.node.id).toEqual('AllowBucketNotificationsFromMyBucket');
+
+});
+
+test('add multiple event notifications using a singleton function', () => {
+
+  const stack = new Stack();
+  const bucket = new s3.Bucket(stack, 'MyBucket');
+  const fn = new lambda.SingletonFunction(stack, 'MyFunction', {
+    uuid: 'uuid',
+    runtime: lambda.Runtime.NODEJS_10_X,
+    handler: 'index.handler',
+    code: lambda.Code.fromInline('foo'),
+  });
+
+  const lambdaDestination = new s3n.LambdaDestination(fn);
+
+  bucket.addEventNotification(s3.EventType.OBJECT_CREATED, lambdaDestination, { prefix: 'v1/'});
+  bucket.addEventNotification(s3.EventType.OBJECT_CREATED, lambdaDestination, { prefix: 'v2/'});
+
+  expect(stack).toHaveResourceLike('Custom::S3BucketNotifications', {
+    NotificationConfiguration: {
+      LambdaFunctionConfigurations: [
+        { Filter: { Key: { FilterRules: [{ Name: 'prefix', Value: 'v1/'}]}}},
+        { Filter: { Key: { FilterRules: [{ Name: 'prefix', Value: 'v2/'}]}}},
+      ],
+    },
+  });
+
+});
diff --git a/packages/@aws-cdk/aws-sqs/package.json b/packages/@aws-cdk/aws-sqs/package.json
@@ -65,7 +65,7 @@
     "@aws-cdk/assert": "0.0.0",
     "@aws-cdk/aws-s3": "0.0.0",
     "@types/nodeunit": "^0.0.31",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/delete-item.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/delete-item.test.ts
@@ -26,7 +26,7 @@ test('DeleteItem task', () => {
     conditionExpression: 'ForumName <> :f and Subject <> :s',
     expressionAttributeNames: { OTHER_KEY: '#OK' },
     expressionAttributeValues: {
-      ':val': tasks.DynamoAttributeValue.numberFromString(sfn.Data.stringAt('$.Item.TotalCount.N')),
+      ':val': tasks.DynamoAttributeValue.numberFromString(sfn.JsonPath.stringAt('$.Item.TotalCount.N')),
     },
     returnConsumedCapacity: tasks.DynamoConsumedCapacity.TOTAL,
     returnItemCollectionMetrics: tasks.DynamoItemCollectionMetrics.SIZE,

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/get-item.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/get-item.test.ts
@@ -68,12 +68,12 @@ test('supports tokens', () => {
   // WHEN
   const task = new tasks.DynamoGetItem(stack, 'GetItem', {
     key: {
-      SOME_KEY: tasks.DynamoAttributeValue.fromString(sfn.Data.stringAt('$.partitionKey')),
-      OTHER_KEY: tasks.DynamoAttributeValue.numberFromString(sfn.Data.stringAt('$.sortKey')),
+      SOME_KEY: tasks.DynamoAttributeValue.fromString(sfn.JsonPath.stringAt('$.partitionKey')),
+      OTHER_KEY: tasks.DynamoAttributeValue.numberFromString(sfn.JsonPath.stringAt('$.sortKey')),
     },
     table,
     consistentRead: true,
-    expressionAttributeNames: { OTHER_KEY: sfn.Data.stringAt('$.otherKey') },
+    expressionAttributeNames: { OTHER_KEY: sfn.JsonPath.stringAt('$.otherKey') },
     projectionExpression: [
       new tasks.DynamoProjectionExpression().withAttribute('Messages').atIndex(1).withAttribute('Tags'),
       new tasks.DynamoProjectionExpression().withAttribute('ID'),

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/integ.call-dynamodb.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/integ.call-dynamodb.ts
@@ -34,7 +34,7 @@ class CallDynamoDBStack extends cdk.Stack {
     const putItemTask = new tasks.DynamoPutItem(this, 'PutItem', {
       item: {
         MessageId: tasks.DynamoAttributeValue.fromString(MESSAGE_ID),
-        Text: tasks.DynamoAttributeValue.fromString(sfn.Data.stringAt('$.bar')),
+        Text: tasks.DynamoAttributeValue.fromString(sfn.JsonPath.stringAt('$.bar')),
         TotalCount: tasks.DynamoAttributeValue.fromNumber(firstNumber),
       },
       table,

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/put-item.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/put-item.test.ts
@@ -26,7 +26,7 @@ test('PutItem task', () => {
     conditionExpression: 'ForumName <> :f and Subject <> :s',
     expressionAttributeNames: { OTHER_KEY: '#OK' },
     expressionAttributeValues: {
-      ':val': tasks.DynamoAttributeValue.numberFromString(sfn.Data.stringAt('$.Item.TotalCount.N')),
+      ':val': tasks.DynamoAttributeValue.numberFromString(sfn.JsonPath.stringAt('$.Item.TotalCount.N')),
     },
     returnConsumedCapacity: tasks.DynamoConsumedCapacity.TOTAL,
     returnItemCollectionMetrics: tasks.DynamoItemCollectionMetrics.SIZE,

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/shared-types.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/shared-types.test.ts
@@ -43,7 +43,7 @@ describe('DynamoAttributeValue', () => {
     const s = '$.string';
 
     // WHEN
-    const attribute = tasks.DynamoAttributeValue.fromString(sfn.Data.stringAt(s));
+    const attribute = tasks.DynamoAttributeValue.fromString(sfn.JsonPath.stringAt(s));
 
     // THEN
     expect(sfn.FieldUtils.renderObject(attribute)).toEqual({

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/update-item.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/update-item.test.ts
@@ -26,7 +26,7 @@ test('UpdateItem task', () => {
     conditionExpression: 'ForumName <> :f and Subject <> :s',
     expressionAttributeNames: { OTHER_KEY: '#OK' },
     expressionAttributeValues: {
-      ':val': tasks.DynamoAttributeValue.numberFromString(sfn.Data.stringAt('$.Item.TotalCount.N')),
+      ':val': tasks.DynamoAttributeValue.numberFromString(sfn.JsonPath.stringAt('$.Item.TotalCount.N')),
     },
     returnConsumedCapacity: tasks.DynamoConsumedCapacity.TOTAL,
     returnItemCollectionMetrics: tasks.DynamoItemCollectionMetrics.SIZE,

diff --git a/packages/@aws-cdk/custom-resources/package.json b/packages/@aws-cdk/custom-resources/package.json
@@ -73,7 +73,7 @@
     "@types/aws-lambda": "^8.10.39",
     "@types/fs-extra": "^8.1.0",
     "@types/sinon": "^9.0.4",
-    "aws-sdk": "^2.704.0",
+    "aws-sdk": "^2.705.0",
     "aws-sdk-mock": "^5.1.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",