Merge pull request #21 from amplify-education/fix_identifier_handling

Don't treat identifiers as tokens

Author: aoskotsky-amplify

hcl2/hcl2.lark

@@ -1,12 +1,12 @@
 start : new_line_or_comment? body new_line_or_comment?
 body : (attribute | block | one_line_block)*
-attribute : IDENTIFIER "=" expression new_line_or_comment
-block : IDENTIFIER (IDENTIFIER | STRING_LIT)* "{" new_line_or_comment body "}" new_line_or_comment
-one_line_block : IDENTIFIER (IDENTIFIER | STRING_LIT)* "{" (IDENTIFIER "=" expression)? "}" new_line_or_comment
+attribute : identifier "=" expression new_line_or_comment
+block : identifier (identifier | STRING_LIT)* "{" new_line_or_comment body "}" new_line_or_comment
+one_line_block : identifier (identifier | STRING_LIT)* "{" (identifier "=" expression)? "}" new_line_or_comment
 new_line_and_or_comma: new_line_or_comment | "," | "," new_line_or_comment
 new_line_or_comment: ( /\n/ | /#.*\n/ | /\/\/.*\n/ )+
 
-IDENTIFIER : /[a-zA-Z_][a-zA-Z0-9_-]*/
+identifier : /[a-zA-Z_][a-zA-Z0-9_-]*/
 
 ?expression : expr_term | operation | conditional
 
@@ -30,7 +30,7 @@ expr_term : "(" expression ")"
             | function_call
             | index_expr_term
             | get_attr_expr_term
-            | IDENTIFIER
+            | identifier
             | heredoc_template
             | heredoc_template_trim
             | attr_splat_expr_term
@@ -54,26 +54,26 @@ EXP_MARK : ("e" | "E") ("+" | "-")?
 
 tuple : "[" (new_line_or_comment? expression (new_line_or_comment? "," new_line_or_comment? expression)* new_line_or_comment? ","?)? new_line_or_comment? "]"
 object : "{" (new_line_or_comment? object_elem (new_line_and_or_comma object_elem )* new_line_and_or_comma?)? "}"
-object_elem : (IDENTIFIER | expression) "="? expression
+object_elem : (identifier | expression) "="? expression
 
 heredoc_template : /<<(?P<heredoc>[a-zA-Z][a-zA-Z0-9._-]+)\n(?:.|\n)+?\n+\s*(?P=heredoc)/
 heredoc_template_trim : /<<-(?P<heredoc_trim>[a-zA-Z][a-zA-Z0-9._-]+)\n(?:.|\n)+?\n+\s*(?P=heredoc_trim)/
 
-function_call : IDENTIFIER "(" new_line_or_comment? arguments? new_line_or_comment? ")"
+function_call : identifier "(" new_line_or_comment? arguments? new_line_or_comment? ")"
 arguments : (expression (new_line_or_comment? "," new_line_or_comment?  expression)* ("," | "...")? new_line_or_comment?)
 
 index_expr_term : expr_term index
 get_attr_expr_term : expr_term get_attr
 attr_splat_expr_term : expr_term attr_splat
 full_splat_expr_term : expr_term full_splat
 ?index : "[" expression "]"
-?get_attr : "." IDENTIFIER
+?get_attr : "." identifier
 ?attr_splat : ".*" get_attr*
 ?full_splat : "[" "*" "]" (get_attr | index)*
 
 !for_tuple_expr : "[" new_line_or_comment? for_intro new_line_or_comment? expression new_line_or_comment? for_cond? new_line_or_comment? "]"
 !for_object_expr : "{" new_line_or_comment? for_intro expression "=>" expression "..."? new_line_or_comment? for_cond? new_line_or_comment? "}"
-!for_intro : "for" new_line_or_comment? IDENTIFIER ("," IDENTIFIER new_line_or_comment?)? new_line_or_comment? "in" new_line_or_comment? expression ":" new_line_or_comment?
+!for_intro : "for" new_line_or_comment? identifier ("," identifier new_line_or_comment?)? new_line_or_comment? "in" new_line_or_comment? expression ":" new_line_or_comment?
 !for_cond : "if" new_line_or_comment? expression
 
 %ignore /[ \t]+/

hcl2/transformer.py

@@ -220,3 +220,10 @@ def strip_quotes(self, value: Any) -> Any:
             if value.startswith('"') and value.endswith('"'):
                 return str(value)[1:-1]
         return value
+
+    def identifier(self, value: Any) -> Any:
+        # Making identifier a token by capitalizing it to IDENTIFIER
+        # seems to return a token object instead of the str
+        # So treat it like a regular rule
+        # In this case we just convert the whole thing to a string
+        return str(value[0])

hcl2/version.py

@@ -1,4 +1,4 @@
 """Place of record for the package version"""
 
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 __git_hash__ = "GIT_HASH"

requirements.pip

@@ -1,4 +1,4 @@
 # Place dependencies in this file, following the distutils format:
 # http://docs.python.org/2/distutils/setupscript.html#relationships-between-distributions-and-packages
 docopt==0.6.2
-lark-parser>=0.7.3,<0.8.0
+lark-parser>=0.7.8,<0.8.0

test/helpers/terraform-config-json/variables.json

@@ -5,6 +5,22 @@
     },
     {
       "account": {}
+    },
+    {
+      "azs": {
+        "default": [
+          {
+            "us-west-1": "us-west-1c,us-west-1b",
+            "us-west-2": "us-west-2c,us-west-2b,us-west-2a",
+            "us-east-1": "us-east-1c,us-east-1b,us-east-1a",
+            "eu-central-1": "eu-central-1a,eu-central-1b,eu-central-1c",
+            "sa-east-1": "sa-east-1a,sa-east-1c",
+            "ap-northeast-1": "ap-northeast-1a,ap-northeast-1c,ap-northeast-1d",
+            "ap-southeast-1": "ap-southeast-1a,ap-southeast-1b,ap-southeast-1c",
+            "ap-southeast-2": "ap-southeast-2a,ap-southeast-2b,ap-southeast-2c"
+          }
+        ]
+      }
     }
   ],
   "locals": [

test/helpers/terraform-config/variables.tf

@@ -8,3 +8,15 @@ locals {
   foo = "${var.account}_bar"
 }
 
+variable "azs" {
+  default = {
+    us-west-1      = "us-west-1c,us-west-1b"
+    us-west-2      = "us-west-2c,us-west-2b,us-west-2a"
+    us-east-1      = "us-east-1c,us-east-1b,us-east-1a"
+    eu-central-1   = "eu-central-1a,eu-central-1b,eu-central-1c"
+    sa-east-1      = "sa-east-1a,sa-east-1c"
+    ap-northeast-1 = "ap-northeast-1a,ap-northeast-1c,ap-northeast-1d"
+    ap-southeast-1 = "ap-southeast-1a,ap-southeast-1b,ap-southeast-1c"
+    ap-southeast-2 = "ap-southeast-2a,ap-southeast-2b,ap-southeast-2c"
+  }
+}