fix dodgy parameter type regex

martysweet · Nov 19, 2017 · c289340 · c289340
1 parent fc3139c
commit c289340
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/test/validatorTest.ts b/src/test/validatorTest.ts
@@ -490,6 +490,13 @@ describe('validator', () => {
             expect(result['errors']['crit'][0]).to.have.property('message', 'Required property FunctionName missing for type AWS::Lambda::Version');
             expect(result['errors']['crit'][1]).to.have.property('message', 'Required property FunctionName missing for type AWS::Lambda::Version');
         });
+
+        it('a list of an extended parameter type should be properly mocked without causing an exception', () => {
+            const input = 'testData/valid/yaml/issue-94-list-security-group.yaml';
+            let result = validator.validateFile(input);
+            expect(result).to.have.deep.property('templateValid', true);
+            expect(result['errors']['crit']).to.have.lengthOf(0);
+        })
     });
 
     describe('parameters-validation', () => {

diff --git a/src/validator.ts b/src/validator.ts
@@ -206,7 +206,7 @@ function guessParameterValue(parameterName: string, parameter: any): string | st
     } else {
         const rawParameterType = parameter['Type'];
 
-        const listMatch = /^List<(\w+)>$/.exec(rawParameterType);
+        const listMatch = /^List<(.+)>$/.exec(rawParameterType);
         let isList: boolean;
         let parameterType: string;