Merge remote-tracking branch 'origin/master' into fix_identifier_handling

Author: aoskotsky-amplify

hcl2/hcl2.lark

@@ -72,7 +72,7 @@ full_splat_expr_term : expr_term full_splat
 ?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 "..."? 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_cond : "if" new_line_or_comment? expression
 

hcl2/version.py

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

setup.py

@@ -52,6 +52,7 @@ def get_requirements():
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     keywords='',
     author='Amplify Education',

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

@@ -0,0 +1,16 @@
+{
+  "data": [
+    {
+      "terraform_remote_state": {
+        "map": {
+          "for_each": [
+            "${{for s3_bucket_key in data.aws_s3_bucket_objects.remote_state_objects.keys : regex(local.remote_state_regex,s3_bucket_key)[\"account_alias\"] => s3_bucket_key if length(regexall(local.remote_state_regex,s3_bucket_key)) > 0}}"
+          ],
+          "backend": [
+            "s3"
+          ]
+        }
+      }
+    }
+  ]
+}

test/helpers/terraform-config/backend.tf

@@ -12,7 +12,7 @@ provider "aws" {
 /*
 one last comment
 */
-terraform { required_version = "0.12"}
+terraform { required_version = "0.12" }
 
 terraform {
   backend "gcs" {}

test/helpers/terraform-config/cloudwatch.tf

@@ -1,5 +1,5 @@
 resource "aws_cloudwatch_event_rule" "aws_cloudwatch_event_rule" {
-  name = "name"
+  name          = "name"
   event_pattern = <<EOF_CONFIG
     {
       "foo": "bar"
@@ -8,7 +8,7 @@ resource "aws_cloudwatch_event_rule" "aws_cloudwatch_event_rule" {
 }
 
 resource "aws_cloudwatch_event_rule" "aws_cloudwatch_event_rule2" {
-  name = "name"
+  name          = "name"
   event_pattern = <<-EOF_CONFIG
     {
       "foo": "bar"

test/helpers/terraform-config/data_sources.tf

@@ -0,0 +1,8 @@
+data "terraform_remote_state" "map" {
+  for_each = {
+    for s3_bucket_key in data.aws_s3_bucket_objects.remote_state_objects.keys :
+    regex(local.remote_state_regex, s3_bucket_key)["account_alias"] => s3_bucket_key
+    if length(regexall(local.remote_state_regex, s3_bucket_key)) > 0
+  }
+  backend = "s3"
+}

test/helpers/terraform-config/iam.tf

@@ -25,13 +25,13 @@ data "aws_iam_policy_document" "s3_proxy_policy" {
     ]
 
     resources = [
-    for
-    bucket_name
-    in
-    local.buckets_to_proxy :
-    "arn:aws:s3:::${bucket_name}/*"
-    if
-    substr(bucket_name, 0, 1) == "l"
+      for
+      bucket_name
+      in
+      local.buckets_to_proxy :
+      "arn:aws:s3:::${bucket_name}/*"
+      if
+      substr(bucket_name, 0, 1) == "l"
     ]
   }
 }

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=lint,{py36}-unit,{py37}-unit
+envlist=lint,{py36}-unit,{py37}-unit,{py38}-unit
 skipsdist=true
 
 [testenv]