From f9eb921f34a895d6ea7dc7bc27afa03744963691 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Mon, 17 Sep 2018 12:03:18 +0200 Subject: [PATCH 1/2] fix(aws-events): ruleName can now be specified Fix bug where ruleName property would not be propagated to the L1. Fixes #708. --- packages/@aws-cdk/aws-events/lib/rule.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@aws-cdk/aws-events/lib/rule.ts b/packages/@aws-cdk/aws-events/lib/rule.ts index 14e1fa20f241a..fd71ec2473987 100644 --- a/packages/@aws-cdk/aws-events/lib/rule.ts +++ b/packages/@aws-cdk/aws-events/lib/rule.ts @@ -74,6 +74,7 @@ export class EventRule extends EventRuleRef { super(parent, name); const resource = new cloudformation.RuleResource(this, 'Resource', { + ruleName: props.ruleName, description: props.description, state: props.enabled == null ? 'ENABLED' : (props.enabled ? 'ENABLED' : 'DISABLED'), scheduleExpression: new Token(() => this.scheduleExpression), From e719826140866a300480671d82dabe4e0a930b2d Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Mon, 17 Sep 2018 13:49:18 +0200 Subject: [PATCH 2/2] Add test --- .../@aws-cdk/aws-events/test/test.rule.ts | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-events/test/test.rule.ts b/packages/@aws-cdk/aws-events/test/test.rule.ts index 7ef0d9a0fd19d..d21ce1552b6a6 100644 --- a/packages/@aws-cdk/aws-events/test/test.rule.ts +++ b/packages/@aws-cdk/aws-events/test/test.rule.ts @@ -1,4 +1,4 @@ -import { expect } from '@aws-cdk/assert'; +import { expect, haveResource } from '@aws-cdk/assert'; import iam = require('@aws-cdk/aws-iam'); import cdk = require('@aws-cdk/cdk'); import { resolve } from '@aws-cdk/cdk'; @@ -30,6 +30,24 @@ export = { test.done(); }, + 'rule with physical name'(test: Test) { + // GIVEN + const stack = new cdk.Stack(); + + // WHEN + new EventRule(stack, 'MyRule', { + ruleName: 'PhysicalName', + scheduleExpression: 'rate(10 minutes)' + }); + + // THEN + expect(stack).to(haveResource('AWS::Events::Rule', { + Name: 'PhysicalName' + })); + + test.done(); + }, + 'eventPattern is rendered properly'(test: Test) { const stack = new cdk.Stack();