fix input fromText has extra quotations

aws · Oct 25, 2024 · 5b81a3e · 5b81a3e
1 parent 1447087
commit 5b81a3e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/packages/@aws-cdk/aws-scheduler-alpha/lib/input.ts b/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;
   }
 }
 

diff --git a/packages/@aws-cdk/aws-scheduler-alpha/test/input.test.ts b/packages/@aws-cdk/aws-scheduler-alpha/test/input.test.ts
@@ -43,7 +43,7 @@ describe('schedule target input', () => {
     Template.fromStack(stack).hasResource('AWS::Scheduler::Schedule', {
       Properties: {
         Target: {
-          Input: '"test"',
+          Input: 'test',
         },
       },
     });
@@ -52,13 +52,14 @@ describe('schedule target input', () => {
   test('create an input from text with a ref inside', () => {
     new Schedule(stack, 'MyScheduleDummy', {
       schedule: expr,
-      target: new SomeLambdaTarget(func, ScheduleTargetInput.fromText(stack.account)),
+      target: new SomeLambdaTarget(func, ScheduleTargetInput.fromText(`a-${stack.account}`)),
     });
+
     Template.fromStack(stack).hasResource('AWS::Scheduler::Schedule', {
       Properties: {
         Target: {
           Input: {
-            'Fn::Join': ['', ['"', { Ref: 'AWS::AccountId' }, '"']],
+            'Fn::Join': ['', ['a-', { Ref: 'AWS::AccountId' }]],
           },
         },
       },
@@ -115,7 +116,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>',
         },
       },
     });

diff --git a/packages/@aws-cdk/aws-scheduler-alpha/test/integ.schedule.ts b/packages/@aws-cdk/aws-scheduler-alpha/test/integ.schedule.ts
@@ -103,7 +103,10 @@ integ.assertions.awsApiCall('SQS', 'receiveMessage', {
   QueueUrl: queue.queueUrl,
   MaxNumberOfMessages: 10,
 }).expect(ExpectedResult.objectLike({
-  Messages: Match.arrayWith([{ Body: `valueA-${stack.region}` }, { Body: `valueB-${stack.region}` }]),
+  Messages: Match.arrayWith([
+    Match.objectLike({ Body: `valueA-${stack.region}` }),
+    Match.objectLike({ Body: `valueB-${stack.region}` }),
+  ]),
 })).waitForAssertions({
   totalTimeout: cdk.Duration.minutes(5),
   interval: cdk.Duration.seconds(20),