fix(events): correct token resolution in RuleTargetInput

Fixes aws#3119
jogold · Jun 28, 2019 · 325a79f · 325a79f
1 parent edc70b4
commit 325a79f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/packages/@aws-cdk/aws-events/lib/input.ts b/packages/@aws-cdk/aws-events/lib/input.ts
@@ -148,7 +148,7 @@ class FieldAwareEventInput extends RuleTargetInput {
  }
 
  public resolveToken(t: Token, _context: IResolveContext) {
- if (!isEventField(t)) { return t; }
+ if (!isEventField(t)) { return Token.asString(t); }
 
  const key = keyForField(t);
  if (inputPathsMap[key] && inputPathsMap[key] !== t.path) {

diff --git a/packages/@aws-cdk/aws-events/test/test.input.ts b/packages/@aws-cdk/aws-events/test/test.input.ts
@@ -1,4 +1,5 @@
 import { expect, haveResourceLike } from '@aws-cdk/assert';
+import { User } from '@aws-cdk/aws-iam';
 import cdk = require('@aws-cdk/core');
 import { Duration, Stack } from '@aws-cdk/core';
 import { Test } from 'nodeunit';
@@ -27,6 +28,42 @@ export = {
  }));
  test.done();
  },
+
+ 'can use token'(test: Test) {
+ // GIVEN
+ const stack = new Stack();
+ const rule = new Rule(stack, 'Rule', {
+ schedule: Schedule.rate(Duration.minutes(1)),
+ });
+ const user = new User(stack, 'User');
+
+ // WHEN
+ rule.addTarget(new SomeTarget(RuleTargetInput.fromObject({ userArn: user.userArn })));
+
+ // THEN
+ expect(stack).to(haveResourceLike('AWS::Events::Rule', {
+ Targets: [
+ {
+ Input: {
+ 'Fn::Join': [
+ '',
+ [
+ '{\"userArn\":\"',
+ {
+ 'Fn::GetAtt': [
+ 'User00B015A1',
+ 'Arn'
+ ]
+ },
+ '\"}'
+ ]
+ ]
+ }
+ }
+ ]
+ }));
+ test.done();
+ },
  },
 
  'text templates': {
@@ -107,4 +144,4 @@ class SomeTarget implements IRuleTarget {
  public bind() {
  return { id: 'T1', arn: 'ARN1', input: this.input };
  }
-}
+}