From efed27484729b54fe84a5cd20901881894af42b0 Mon Sep 17 00:00:00 2001
From: dimitriosoodle <Dimitrios.Zilaskos@oodlefinance.com>
Date: Fri, 4 Jan 2019 13:42:19 +0000
Subject: [PATCH 1/3] Changed "tags {" to "tags = {" as required by terraform
 0.12 see terraform issue #19240
 https://github.com/hashicorp/terraform/issues/19240

---
 lib/terraforming/template/tf/alb.erb                | 2 +-
 lib/terraforming/template/tf/ec2.erb                | 2 +-
 lib/terraforming/template/tf/elastic_filesystem.erb | 2 +-
 lib/terraforming/template/tf/elb.erb                | 2 +-
 lib/terraforming/template/tf/internet_gateway.erb   | 2 +-
 lib/terraforming/template/tf/network_acl.erb        | 2 +-
 lib/terraforming/template/tf/network_interface.erb  | 2 +-
 lib/terraforming/template/tf/route53_zone.erb       | 2 +-
 lib/terraforming/template/tf/route_table.erb        | 2 +-
 lib/terraforming/template/tf/security_group.erb     | 2 +-
 lib/terraforming/template/tf/subnet.erb             | 2 +-
 lib/terraforming/template/tf/vpc.erb                | 2 +-
 lib/terraforming/template/tf/vpn_gateway.erb        | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/terraforming/template/tf/alb.erb b/lib/terraforming/template/tf/alb.erb
index b59a63de..041d9d24 100644
--- a/lib/terraforming/template/tf/alb.erb
+++ b/lib/terraforming/template/tf/alb.erb
@@ -18,7 +18,7 @@ resource "aws_alb" "<%= module_name_of(load_balancer) %>" {
     }
 
 <%- end -%>
-    tags {
+    tags = {
 <% tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/ec2.erb b/lib/terraforming/template/tf/ec2.erb
index a4e17b93..facec86b 100644
--- a/lib/terraforming/template/tf/ec2.erb
+++ b/lib/terraforming/template/tf/ec2.erb
@@ -46,7 +46,7 @@ resource "aws_instance" "<%= module_name_of(instance) %>" {
 <% end -%>
 
 <% end -%>
-    tags {
+    tags = {
 <% instance.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/elastic_filesystem.erb b/lib/terraforming/template/tf/elastic_filesystem.erb
index b5af48b9..d0b36478 100644
--- a/lib/terraforming/template/tf/elastic_filesystem.erb
+++ b/lib/terraforming/template/tf/elastic_filesystem.erb
@@ -10,7 +10,7 @@ resource "aws_efs_file_system" "<%= module_name_of(efs) %>" {
     performance_mode = "<%= efs.performance_mode %>"
 <% end -%>
 <% if efs.name -%>
-    tags {
+    tags = {
         Name = "<%= efs.name %>"
     }
 <% end -%>
diff --git a/lib/terraforming/template/tf/elb.erb b/lib/terraforming/template/tf/elb.erb
index fcb9c164..e3ef7e0e 100644
--- a/lib/terraforming/template/tf/elb.erb
+++ b/lib/terraforming/template/tf/elb.erb
@@ -41,7 +41,7 @@ resource "aws_elb" "<%= module_name_of(load_balancer) %>" {
         timeout             = <%= load_balancer.health_check.timeout %>
     }
 
-    tags {
+    tags = {
 <% @client.describe_tags(load_balancer_names: [load_balancer.load_balancer_name]).tag_descriptions.first.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/internet_gateway.erb b/lib/terraforming/template/tf/internet_gateway.erb
index 97c55857..a9f96600 100644
--- a/lib/terraforming/template/tf/internet_gateway.erb
+++ b/lib/terraforming/template/tf/internet_gateway.erb
@@ -3,7 +3,7 @@
 resource "aws_internet_gateway" "<%= module_name_of(internet_gateway) %>" {
     vpc_id = "<%= internet_gateway.attachments[0].vpc_id %>"
 
-    tags {
+    tags = {
 <% internet_gateway.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/network_acl.erb b/lib/terraforming/template/tf/network_acl.erb
index 9d7f9a4f..ee0e22ed 100644
--- a/lib/terraforming/template/tf/network_acl.erb
+++ b/lib/terraforming/template/tf/network_acl.erb
@@ -33,7 +33,7 @@ resource "aws_network_acl" "<%= module_name_of(network_acl) %>" {
     }
 
 <% end -%>
-    tags {
+    tags = {
 <% network_acl.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/network_interface.erb b/lib/terraforming/template/tf/network_interface.erb
index 61a6fc96..4ced7eaa 100644
--- a/lib/terraforming/template/tf/network_interface.erb
+++ b/lib/terraforming/template/tf/network_interface.erb
@@ -11,7 +11,7 @@ resource "aws_network_interface" "<%= module_name_of(network_interface) %>" {
     }
 <% end -%>
 <% if network_interface.tag_set.length > 0 -%>
-    tags {
+    tags = {
 <% network_interface.tag_set.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/route53_zone.erb b/lib/terraforming/template/tf/route53_zone.erb
index c26a0433..e6e35bad 100644
--- a/lib/terraforming/template/tf/route53_zone.erb
+++ b/lib/terraforming/template/tf/route53_zone.erb
@@ -8,7 +8,7 @@ resource "aws_route53_zone" "<%= module_name_of(hosted_zone) %>" {
     vpc_region = "<%= vpc.vpc_region %>"
 <%- end -%>
 
-    tags {
+    tags = {
 <% tags_of(hosted_zone).each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/route_table.erb b/lib/terraforming/template/tf/route_table.erb
index 8aa77d80..c1df3896 100644
--- a/lib/terraforming/template/tf/route_table.erb
+++ b/lib/terraforming/template/tf/route_table.erb
@@ -24,7 +24,7 @@ resource "aws_route_table" "<%= module_name_of(route_table) %>" {
     propagating_vgws = <%= propagaving_vgws_of(route_table).inspect %>
 
 <% end -%>
-    tags {
+    tags = {
 <% route_table.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/security_group.erb b/lib/terraforming/template/tf/security_group.erb
index f30760b8..d3928fd7 100644
--- a/lib/terraforming/template/tf/security_group.erb
+++ b/lib/terraforming/template/tf/security_group.erb
@@ -45,7 +45,7 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
 
 <% end -%>
 <% if security_group.tags.length > 0 -%>
-    tags {
+    tags = {
 <% security_group.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/subnet.erb b/lib/terraforming/template/tf/subnet.erb
index 700e96a2..0017d63c 100644
--- a/lib/terraforming/template/tf/subnet.erb
+++ b/lib/terraforming/template/tf/subnet.erb
@@ -5,7 +5,7 @@ resource "aws_subnet" "<%= module_name_of(subnet) %>" {
     availability_zone       = "<%= subnet.availability_zone %>"
     map_public_ip_on_launch = <%= subnet.map_public_ip_on_launch %>
 
-    tags {
+    tags = {
 <% subnet.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/vpc.erb b/lib/terraforming/template/tf/vpc.erb
index e0574852..778bdd7c 100644
--- a/lib/terraforming/template/tf/vpc.erb
+++ b/lib/terraforming/template/tf/vpc.erb
@@ -5,7 +5,7 @@ resource "aws_vpc" "<%= module_name_of(vpc) %>" {
     enable_dns_support   = <%= enable_dns_support?(vpc) %>
     instance_tenancy     = "<%= vpc.instance_tenancy %>"
 
-    tags {
+    tags = {
 <% vpc.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>
diff --git a/lib/terraforming/template/tf/vpn_gateway.erb b/lib/terraforming/template/tf/vpn_gateway.erb
index 1882f057..4ff1acc1 100644
--- a/lib/terraforming/template/tf/vpn_gateway.erb
+++ b/lib/terraforming/template/tf/vpn_gateway.erb
@@ -3,7 +3,7 @@
 resource "aws_vpn_gateway" "<%= module_name_of(vpn_gateway) %>" {
     vpc_id = "<%= vpn_gateway.vpc_attachments[0].vpc_id %>"
     availability_zone = "<%= vpn_gateway.availability_zone %>"
-    tags {
+    tags = {
 <% vpn_gateway.tags.each do |tag| -%>
         "<%= tag.key %>" = "<%= tag.value %>"
 <% end -%>

From 8d3a28136c4cfd8f0ccdff111efdf35a717c7f38 Mon Sep 17 00:00:00 2001
From: dimitriosoodle <Dimitrios.Zilaskos@oodlefinance.com>
Date: Tue, 28 May 2019 17:27:03 +0100
Subject: [PATCH 2/3] update unit tests

---
 spec/lib/terraforming/resource/alb_spec.rb               | 4 ++--
 spec/lib/terraforming/resource/dynamo_db_spec.rb         | 2 +-
 spec/lib/terraforming/resource/ec2_spec.rb               | 6 +++---
 spec/lib/terraforming/resource/efs_file_system_spec.rb   | 4 ++--
 spec/lib/terraforming/resource/elb_spec.rb               | 4 ++--
 spec/lib/terraforming/resource/internet_gateway_spec.rb  | 4 ++--
 spec/lib/terraforming/resource/network_acl_spec.rb       | 4 ++--
 spec/lib/terraforming/resource/network_interface_spec.rb | 2 +-
 spec/lib/terraforming/resource/route53_zone_spec.rb      | 4 ++--
 spec/lib/terraforming/resource/route_table_spec.rb       | 4 ++--
 spec/lib/terraforming/resource/security_group_spec.rb    | 4 ++--
 spec/lib/terraforming/resource/subnet_spec.rb            | 4 ++--
 spec/lib/terraforming/resource/vpc_spec.rb               | 4 ++--
 spec/lib/terraforming/resource/vpn_gateway_spec.rb       | 4 ++--
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/spec/lib/terraforming/resource/alb_spec.rb b/spec/lib/terraforming/resource/alb_spec.rb
index 9b86d2fc..ec395b79 100644
--- a/spec/lib/terraforming/resource/alb_spec.rb
+++ b/spec/lib/terraforming/resource/alb_spec.rb
@@ -114,7 +114,7 @@ module Resource
         prefix  = "hoge"
     }
 
-    tags {
+    tags = {
         "Environment" = "Production"
     }
 }
@@ -128,7 +128,7 @@ module Resource
 
     enable_deletion_protection = true
 
-    tags {
+    tags = {
     }
 }
 
diff --git a/spec/lib/terraforming/resource/dynamo_db_spec.rb b/spec/lib/terraforming/resource/dynamo_db_spec.rb
index c4080455..ac773411 100644
--- a/spec/lib/terraforming/resource/dynamo_db_spec.rb
+++ b/spec/lib/terraforming/resource/dynamo_db_spec.rb
@@ -193,7 +193,7 @@ module Resource
         projection_type = "INCLUDE"
         non_key_attributes = ["fghi", "jklm"]
     }
-    tags {
+    tags = {
         abcd = "efgh"
     }
     stream_enabled = true
diff --git a/spec/lib/terraforming/resource/ec2_spec.rb b/spec/lib/terraforming/resource/ec2_spec.rb
index 99655ed9..6d7314ee 100644
--- a/spec/lib/terraforming/resource/ec2_spec.rb
+++ b/spec/lib/terraforming/resource/ec2_spec.rb
@@ -331,7 +331,7 @@ module Resource
         iops                  = 24
     }
 
-    tags {
+    tags = {
         "Name" = "hoge"
     }
 }
@@ -357,7 +357,7 @@ module Resource
         delete_on_termination = true
     }
 
-    tags {
+    tags = {
     }
 }
 
@@ -373,7 +373,7 @@ module Resource
     private_ip                  = "10.0.0.102"
     source_dest_check           = true
 
-    tags {
+    tags = {
     }
 }
 
diff --git a/spec/lib/terraforming/resource/efs_file_system_spec.rb b/spec/lib/terraforming/resource/efs_file_system_spec.rb
index ee753cc8..225b9dbf 100644
--- a/spec/lib/terraforming/resource/efs_file_system_spec.rb
+++ b/spec/lib/terraforming/resource/efs_file_system_spec.rb
@@ -48,7 +48,7 @@ module Resource
     creation_token = "console-1234abcd-1234-abcd-a123-d34db33f0000"
     file_system_id = "fs-0000abcd"
     performance_mode = "generalPurpose"
-    tags {
+    tags = {
         Name = "efs_name_0"
     }
 }
@@ -56,7 +56,7 @@ module Resource
     creation_token = "console-0000abcd-4321-dcba-a123-d34db33f0000"
     file_system_id = "fs-abcd1234"
     performance_mode = "generalPurpose"
-    tags {
+    tags = {
         Name = "efs_name_1"
     }
 }
diff --git a/spec/lib/terraforming/resource/elb_spec.rb b/spec/lib/terraforming/resource/elb_spec.rb
index b9f0b3ae..a1ad4d1c 100644
--- a/spec/lib/terraforming/resource/elb_spec.rb
+++ b/spec/lib/terraforming/resource/elb_spec.rb
@@ -204,7 +204,7 @@ module Resource
         timeout             = 5
     }
 
-    tags {
+    tags = {
         "name" = "elb-1"
     }
 }
@@ -242,7 +242,7 @@ module Resource
         timeout             = 5
     }
 
-    tags {
+    tags = {
         "name" = "elb-1"
     }
 }
diff --git a/spec/lib/terraforming/resource/internet_gateway_spec.rb b/spec/lib/terraforming/resource/internet_gateway_spec.rb
index accc16a1..6fa9e37b 100644
--- a/spec/lib/terraforming/resource/internet_gateway_spec.rb
+++ b/spec/lib/terraforming/resource/internet_gateway_spec.rb
@@ -43,14 +43,14 @@ module Resource
 resource "aws_internet_gateway" "igw-1234abcd" {
     vpc_id = "vpc-1234abcd"
 
-    tags {
+    tags = {
     }
 }
 
 resource "aws_internet_gateway" "test" {
     vpc_id = "vpc-5678efgh"
 
-    tags {
+    tags = {
         "Name" = "test"
     }
 }
diff --git a/spec/lib/terraforming/resource/network_acl_spec.rb b/spec/lib/terraforming/resource/network_acl_spec.rb
index aecc9cb2..6d93e4ad 100644
--- a/spec/lib/terraforming/resource/network_acl_spec.rb
+++ b/spec/lib/terraforming/resource/network_acl_spec.rb
@@ -138,7 +138,7 @@ module Resource
         cidr_block = "0.0.0.0/0"
     }
 
-    tags {
+    tags = {
         "Name" = "hoge"
     }
 }
@@ -178,7 +178,7 @@ module Resource
         icmp_type  = "4"
     }
 
-    tags {
+    tags = {
         "Name" = "fuga"
     }
 }
diff --git a/spec/lib/terraforming/resource/network_interface_spec.rb b/spec/lib/terraforming/resource/network_interface_spec.rb
index 5a3c878e..1ea99a1a 100644
--- a/spec/lib/terraforming/resource/network_interface_spec.rb
+++ b/spec/lib/terraforming/resource/network_interface_spec.rb
@@ -122,7 +122,7 @@ module Resource
         instance     = "i-12345678"
         device_index = 0
     }
-    tags {
+    tags = {
         "Name" = "fuga"
     }
 }
diff --git a/spec/lib/terraforming/resource/route53_zone_spec.rb b/spec/lib/terraforming/resource/route53_zone_spec.rb
index 83f2f757..40abefb2 100644
--- a/spec/lib/terraforming/resource/route53_zone_spec.rb
+++ b/spec/lib/terraforming/resource/route53_zone_spec.rb
@@ -89,7 +89,7 @@ module Resource
     name       = "hoge.net"
     comment    = ""
 
-    tags {
+    tags = {
         "Environment" = "dev"
     }
 }
@@ -100,7 +100,7 @@ module Resource
     vpc_id     = "vpc-1234abcd"
     vpc_region = "ap-northeast-1"
 
-    tags {
+    tags = {
         "Environment" = "dev"
     }
 }
diff --git a/spec/lib/terraforming/resource/route_table_spec.rb b/spec/lib/terraforming/resource/route_table_spec.rb
index 00335ed0..6d77fa33 100644
--- a/spec/lib/terraforming/resource/route_table_spec.rb
+++ b/spec/lib/terraforming/resource/route_table_spec.rb
@@ -153,7 +153,7 @@ module Resource
 
     propagating_vgws = ["vgw-1a4j20b"]
 
-    tags {
+    tags = {
         "Name" = "my-route-table"
     }
 }
@@ -166,7 +166,7 @@ module Resource
         gateway_id = "vgw-2345cdef"
     }
 
-    tags {
+    tags = {
         "Name" = "my-route-table-2"
     }
 }
diff --git a/spec/lib/terraforming/resource/security_group_spec.rb b/spec/lib/terraforming/resource/security_group_spec.rb
index 815dd665..2ddc4aa5 100644
--- a/spec/lib/terraforming/resource/security_group_spec.rb
+++ b/spec/lib/terraforming/resource/security_group_spec.rb
@@ -269,7 +269,7 @@ module Resource
         self            = true
     }
 
-    tags {
+    tags = {
         "Name" = "fuga"
     }
 }
@@ -299,7 +299,7 @@ module Resource
         ipv6_cidr_blocks     = ["::/0"]
     }
 
-    tags {
+    tags = {
         "Name" = "piyo"
     }
 }
diff --git a/spec/lib/terraforming/resource/subnet_spec.rb b/spec/lib/terraforming/resource/subnet_spec.rb
index 8c7b0665..b4a1ee1f 100644
--- a/spec/lib/terraforming/resource/subnet_spec.rb
+++ b/spec/lib/terraforming/resource/subnet_spec.rb
@@ -51,7 +51,7 @@ module Resource
     availability_zone       = "ap-northeast-1c"
     map_public_ip_on_launch = false
 
-    tags {
+    tags = {
         "Name" = "hoge"
     }
 }
@@ -62,7 +62,7 @@ module Resource
     availability_zone       = "ap-northeast-1c"
     map_public_ip_on_launch = false
 
-    tags {
+    tags = {
         "Name" = "fuga"
     }
 }
diff --git a/spec/lib/terraforming/resource/vpc_spec.rb b/spec/lib/terraforming/resource/vpc_spec.rb
index 665d9b91..fd08f251 100644
--- a/spec/lib/terraforming/resource/vpc_spec.rb
+++ b/spec/lib/terraforming/resource/vpc_spec.rb
@@ -63,7 +63,7 @@ module Resource
     enable_dns_support   = true
     instance_tenancy     = "default"
 
-    tags {
+    tags = {
         "Name" = "hoge"
     }
 }
@@ -74,7 +74,7 @@ module Resource
     enable_dns_support   = true
     instance_tenancy     = "default"
 
-    tags {
+    tags = {
         "Name" = "fuga"
     }
 }
diff --git a/spec/lib/terraforming/resource/vpn_gateway_spec.rb b/spec/lib/terraforming/resource/vpn_gateway_spec.rb
index 8aeb2394..687e7727 100644
--- a/spec/lib/terraforming/resource/vpn_gateway_spec.rb
+++ b/spec/lib/terraforming/resource/vpn_gateway_spec.rb
@@ -45,14 +45,14 @@ module Resource
 resource "aws_vpn_gateway" "vgw-1234abcd" {
     vpc_id = "vpc-1234abcd"
     availability_zone = "us-east-1c"
-    tags {
+    tags = {
     }
 }
 
 resource "aws_vpn_gateway" "test" {
     vpc_id = "vpc-5678efgh"
     availability_zone = "us-east-1d"
-    tags {
+    tags = {
         "Name" = "test"
     }
 }

From a99dd96d088afadab33d1423ab53357cb6ba1ad7 Mon Sep 17 00:00:00 2001
From: dimitriosoodle <Dimitrios.Zilaskos@oodlefinance.com>
Date: Tue, 28 May 2019 17:36:19 +0100
Subject: [PATCH 3/3] Added equals for tags in dynamoDB template

---
 lib/terraforming/template/tf/dynamo_db.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/terraforming/template/tf/dynamo_db.erb b/lib/terraforming/template/tf/dynamo_db.erb
index f7922578..1179fb15 100644
--- a/lib/terraforming/template/tf/dynamo_db.erb
+++ b/lib/terraforming/template/tf/dynamo_db.erb
@@ -49,7 +49,7 @@ resource "aws_dynamodb_table" "<%= table.table_name -%>" {
     }
 <%- end -%>
 <%- tags(table).each do |tag| -%>
-    tags {
+    tags = {
         <%= tag.key %> = "<%= tag.value -%>"
     }
 <%- end -%>
@@ -63,4 +63,4 @@ resource "aws_dynamodb_table" "<%= table.table_name -%>" {
     }
 <%- end -%>
 }
-<%- end -%>
\ No newline at end of file
+<%- end -%>