Fix error messages

aws · Mar 5, 2021 · f56c8c7 · f56c8c7
1 parent 109419c
commit f56c8c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/@aws-cdk/aws-stepfunctions/lib/state-machine.ts b/packages/@aws-cdk/aws-stepfunctions/lib/state-machine.ts
@@ -432,10 +432,10 @@ export class StateMachine extends StateMachineBase {
 
   private validateStateMachineName(stateMachineName: string) {
     if (stateMachineName.length < 1 || stateMachineName.length > 80) {
-      throw new Error('StateMachine name length must be between 1 and 80 characters');
+      throw new Error(`State Machine name must be between 1 and 80 characters. Received: ${stateMachineName}`);
     }
-    if (stateMachineName.match('[0-9a-zA-Z\_\-]+')?.length != 1) {
-      throw new Error('StateMachine name must match [0-9a-zA-Z\_\-]+');
+    if (!stateMachineName.match('^[0-9a-zA-Z\_\-]+$')) {
+      throw new Error(`State Machine name must match "^[0-9a-zA-Z\_\-]+$". Received: ${stateMachineName}`);
     }
   }
 

diff --git a/packages/@aws-cdk/aws-stepfunctions/test/state-machine.test.ts b/packages/@aws-cdk/aws-stepfunctions/test/state-machine.test.ts
@@ -74,15 +74,17 @@ describe('State Machine', () => {
         stateMachineType: stepfunctions.StateMachineType.EXPRESS,
       });
     };
+    const tooLongName = 'M'.repeat(81);
+    const invalidCharactersName = '*';
 
     // THEN
     expect(() => {
-      createStateMachine('M'.repeat(81));
-    }).toThrow('StateMachine name length must be between 1 and 80 characters');
+      createStateMachine(tooLongName);
+    }).toThrow(`State Machine name must be between 1 and 80 characters. Received: ${tooLongName}`);
 
     expect(() => {
-      createStateMachine('*');
-    }).toThrow('StateMachine name must match [0-9a-zA-Z\_\-]+');
+      createStateMachine(invalidCharactersName);
+    }).toThrow(`State Machine name must match "^[0-9a-zA-Z\_\-]+$". Received: ${invalidCharactersName}`);
   });
 
   test('log configuration', () => {