🐛 : allow trailing coma in arrays

also corrects object field rule, for allowing object fields to be expressions
gaia-app · Nov 15, 2019 · a02dae8 · a02dae8
1 parent 7b97a5d
commit a02dae8
Show file tree

Hide file tree

Showing 3 changed files with 1,835 additions and 2 deletions.
diff --git a/src/main/antlr4/io/codeka/gaia/hcl/antlr/hcl.g4 b/src/main/antlr4/io/codeka/gaia/hcl/antlr/hcl.g4
@@ -43,6 +43,7 @@ variableType
 
 type
   : TYPE
+  | 'list'
   | 'list(' type ')'
   | 'map(' type ')'
   | 'object' '(' object ')'
@@ -53,7 +54,7 @@ object
   | '{' field+ '}'
   ;
 
-field: IDENTIFIER '=' type;
+field: IDENTIFIER '=' expression;
 
 variableDescription
   : 'description' '=' STRING
@@ -86,7 +87,7 @@ complexExpression
 
 array
   : '[' ']'
-  | '[' expression ( ',' expression )* ']'
+  | '[' expression ( ',' expression )* ','? ']'
   ;
 
 index

diff --git a/src/test/java/io/codeka/gaia/hcl/HCLParserTest.java b/src/test/java/io/codeka/gaia/hcl/HCLParserTest.java
@@ -54,6 +54,18 @@ void parsing_variables_shouldWork_withComplexFile() throws IOException {
         assertThat(variables).hasSize(49);
     }
 
+    @Test
+    void parsing_variables_shouldWork_withAnotherComplexFile() throws IOException {
+        // given
+        var fileContent = IOUtils.toString(new ClassPathResource("hcl/variables_aws_vpc.tf").getURL(), Charset.defaultCharset());
+
+        // when
+        var variables = hclParser.parseVariables(fileContent);
+
+        // then
+        assertThat(variables).hasSize(282);
+    }
+
     @Test
     void parsing_outputs_shouldWorkWithVisitor() throws IOException {
         // given