fix(scheduler-alpha): scheduler input always get transformed to string with extra double quotes

packages/@aws-cdk/aws-scheduler-alpha/lib/input.ts

@@ -18,7 +18,7 @@ export abstract class ScheduleTargetInput {
    * @param text Text to use as the input for the target
    */
   public static fromText(text: string): ScheduleTargetInput {
-    return new FieldAwareEventInput(text);
+    return new FieldAwareEventInput(text, false);
   }
 
   /**
@@ -28,7 +28,7 @@ export abstract class ScheduleTargetInput {
    * @param obj object to use to convert to JSON to use as input for the target
    */
   public static fromObject(obj: any): ScheduleTargetInput {
-    return new FieldAwareEventInput(obj);
+    return new FieldAwareEventInput(obj, true);
   }
 
   protected constructor() {
@@ -41,7 +41,7 @@ export abstract class ScheduleTargetInput {
 }
 
 class FieldAwareEventInput extends ScheduleTargetInput {
-  constructor(private readonly input: any) {
+  constructor(private readonly input: any, private readonly toJsonString: boolean) {
     super();
   }
 
@@ -57,10 +57,11 @@ class FieldAwareEventInput extends ScheduleTargetInput {
     }
 
     const stack = Stack.of(schedule);
-    return stack.toJsonString(Tokenization.resolve(this.input, {
+    const inputString = Tokenization.resolve(this.input, {
       scope: schedule,
       resolver: new Replacer(),
-    }));
+    });
+    return this.toJsonString ? stack.toJsonString(inputString) : inputString;
   }
 }
 

packages/@aws-cdk/aws-scheduler-alpha/test/input.test.ts

@@ -43,28 +43,44 @@ describe('schedule target input', () => {
     Template.fromStack(stack).hasResource('AWS::Scheduler::Schedule', {
       Properties: {
         Target: {
-          Input: '"test"',
+          Input: 'test',
         },
       },
     });
   });
 
-  test('create an input from text with a ref inside', () => {
+  test('create an input from text concatenated from literal string with a token', () => {
     new Schedule(stack, 'MyScheduleDummy', {
       schedule: expr,
-      target: new SomeLambdaTarget(func, ScheduleTargetInput.fromText(stack.account)),
+      target: new SomeLambdaTarget(func, ScheduleTargetInput.fromText(`ac-${stack.account}`)),
     });
+
     Template.fromStack(stack).hasResource('AWS::Scheduler::Schedule', {
       Properties: {
         Target: {
           Input: {
-            'Fn::Join': ['', ['"', { Ref: 'AWS::AccountId' }, '"']],
+            'Fn::Join': ['', ['ac-', { Ref: 'AWS::AccountId' }]],
           },
         },
       },
     });
   });
 
+  test('create an input from text with a ref inside', () => {
+    new Schedule(stack, 'MyScheduleDummy', {
+      schedule: expr,
+      target: new SomeLambdaTarget(func, ScheduleTargetInput.fromText(stack.account)),
+    });
+
+    Template.fromStack(stack).hasResource('AWS::Scheduler::Schedule', {
+      Properties: {
+        Target: {
+          Input: { Ref: 'AWS::AccountId' },
+        },
+      },
+    });
+  });
+
   test('create an input from object', () => {
     const input = ScheduleTargetInput.fromObject({
       test: 'test',
@@ -115,7 +131,7 @@ describe('schedule target input', () => {
     Template.fromStack(stack).hasResource('AWS::Scheduler::Schedule', {
       Properties: {
         Target: {
-          Input: '"Test=<aws.scheduler.schedule-arn>"',
+          Input: 'Test=<aws.scheduler.schedule-arn>',
         },
       },
     });

packages/@aws-cdk/aws-scheduler-alpha/test/integ.schedule.ts

@@ -15,7 +15,7 @@ class SomeLambdaTarget implements scheduler.IScheduleTarget {
     return {
       arn: this.fn.functionArn,
       role: this.role,
-      input: scheduler.ScheduleTargetInput.fromText('Input Text'),
+      input: scheduler.ScheduleTargetInput.fromObject('Input Text'),
       retryPolicy: {
         maximumEventAgeInSeconds: 180,
         maximumRetryAttempts: 3,

packages/@aws-cdk/aws-scheduler-targets-alpha/test/integ.lambda-invoke.ts

@@ -62,7 +62,7 @@ const importedLambdaTagValue = 'importedLambdaTagValue';
 new scheduler.Schedule(scheduleStack, 'ScheduleWithImportedLambda', {
   schedule: scheduler.ScheduleExpression.rate(cdk.Duration.minutes(1)),
   target: new LambdaInvoke(importedFunc, {
-    input: scheduler.ScheduleTargetInput.fromText(importedLambdaTagValue),
+    input: scheduler.ScheduleTargetInput.fromObject(importedLambdaTagValue),
   }),
 });
 
@@ -88,7 +88,7 @@ const sameStackLambdaTagValue = 'sameStackLambdaTagValue';
 new scheduler.Schedule(scheduleStack, 'ScheduleWithSameStackLambda', {
   schedule: scheduler.ScheduleExpression.rate(cdk.Duration.minutes(1)),
   target: new LambdaInvoke(sameStackFunc, {
-    input: scheduler.ScheduleTargetInput.fromText(sameStackLambdaTagValue),
+    input: scheduler.ScheduleTargetInput.fromObject(sameStackLambdaTagValue),
   }),
 });
 

packages/@aws-cdk/aws-scheduler-targets-alpha/test/integ.sns-publish.js.snapshot/AwsSchedulerTargetsSnsPublish.template.json

@@ -75,7 +75,7 @@
      "Arn": {
       "Ref": "TopicBFC7AF6E"
      },
-     "Input": "\"Hello, Scheduler!\"",
+     "Input": "Hello, Scheduler!",
      "RetryPolicy": {
       "MaximumEventAgeInSeconds": 86400,
       "MaximumRetryAttempts": 185