Merge pull request #138 from amplify-education/fix-conditional-grammar

support conditional without parentheses inside nested locals
amplify-education · May 24, 2023 · 48be3a3 · 48be3a3
2 parents fa7120a + c4982be
commit 48be3a3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/hcl2/hcl2.lark b/hcl2/hcl2.lark
@@ -9,7 +9,7 @@ identifier : /[a-zA-Z_][a-zA-Z0-9_-]*/
 
 ?expression : expr_term | operation | conditional
 
-conditional : expression "?" new_line_or_comment? expression new_line_or_comment? ":" new_line_or_comment? expression new_line_or_comment?
+conditional : expression "?" new_line_or_comment? expression new_line_or_comment? ":" new_line_or_comment? expression
 
 ?operation : unary_op | binary_op
 !unary_op : ("-" | "!") expr_term

diff --git a/test/helpers/terraform-config-json/locals_embedded_condition.json b/test/helpers/terraform-config-json/locals_embedded_condition.json
@@ -0,0 +1,10 @@
+{
+  "locals": [
+    {
+      "terraform": {
+        "channels": "${local.running_in_ci ? local.ci_channels : local.local_channels}",
+        "authentication": []
+      }
+    }
+  ]
+}
diff --git a/test/helpers/terraform-config/locals_embedded_condition.tf b/test/helpers/terraform-config/locals_embedded_condition.tf
@@ -0,0 +1,6 @@
+locals {
+  terraform = {
+    channels = local.running_in_ci ? local.ci_channels : local.local_channels
+    authentication = []
+  }
+}