diff --git a/lib/terraforming/template/tf/alb.erb b/lib/terraforming/template/tf/alb.erb index b59a63de..fdae691c 100644 --- a/lib/terraforming/template/tf/alb.erb +++ b/lib/terraforming/template/tf/alb.erb @@ -18,9 +18,9 @@ resource "aws_alb" "<%= module_name_of(load_balancer) %>" { } <%- end -%> - tags { + tags = { <% tags.each do |tag| -%> - "<%= tag.key %>" = "<%= tag.value %>" + <%= tag.key %> = "<%= tag.value %>" <% end -%> } } diff --git a/lib/terraforming/template/tf/dynamo_db.erb b/lib/terraforming/template/tf/dynamo_db.erb index f7922578..342826e8 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 -%> diff --git a/lib/terraforming/template/tf/ec2.erb b/lib/terraforming/template/tf/ec2.erb index a4e17b93..7a37ee26 100644 --- a/lib/terraforming/template/tf/ec2.erb +++ b/lib/terraforming/template/tf/ec2.erb @@ -46,9 +46,9 @@ resource "aws_instance" "<%= module_name_of(instance) %>" { <% end -%> <% end -%> - tags { + tags = { <% instance.tags.each do |tag| -%> - "<%= tag.key %>" = "<%= tag.value %>" + <%= tag.key %> = "<%= tag.value %>" <% end -%> } } diff --git a/lib/terraforming/template/tf/elastic_file_system.erb b/lib/terraforming/template/tf/elastic_file_system.erb index b5af48b9..d0b36478 100644 --- a/lib/terraforming/template/tf/elastic_file_system.erb +++ b/lib/terraforming/template/tf/elastic_file_system.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..fd40ec7c 100644 --- a/lib/terraforming/template/tf/elb.erb +++ b/lib/terraforming/template/tf/elb.erb @@ -41,9 +41,9 @@ 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 %>" + <%= 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..649e9912 100644 --- a/lib/terraforming/template/tf/internet_gateway.erb +++ b/lib/terraforming/template/tf/internet_gateway.erb @@ -3,9 +3,9 @@ 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 %>" + <%= 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..6893cf01 100644 --- a/lib/terraforming/template/tf/network_acl.erb +++ b/lib/terraforming/template/tf/network_acl.erb @@ -33,9 +33,9 @@ resource "aws_network_acl" "<%= module_name_of(network_acl) %>" { } <% end -%> - tags { + tags = { <% network_acl.tags.each do |tag| -%> - "<%= tag.key %>" = "<%= tag.value %>" + <%= 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..16b5ca9d 100644 --- a/lib/terraforming/template/tf/network_interface.erb +++ b/lib/terraforming/template/tf/network_interface.erb @@ -11,9 +11,9 @@ 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 %>" + <%= tag.key %> = "<%= tag.value %>" <% end -%> } <% end -%> diff --git a/lib/terraforming/template/tf/route53_zone.erb b/lib/terraforming/template/tf/route53_zone.erb index c26a0433..eb78c866 100644 --- a/lib/terraforming/template/tf/route53_zone.erb +++ b/lib/terraforming/template/tf/route53_zone.erb @@ -8,9 +8,9 @@ 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 %>" + <%= 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..04595511 100644 --- a/lib/terraforming/template/tf/route_table.erb +++ b/lib/terraforming/template/tf/route_table.erb @@ -24,9 +24,9 @@ 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 %>" + <%= tag.key %> = "<%= tag.value %>" <% end -%> } } diff --git a/lib/terraforming/template/tf/security_group.erb b/lib/terraforming/template/tf/security_group.erb index 8687923f..7dd5f320 100644 --- a/lib/terraforming/template/tf/security_group.erb +++ b/lib/terraforming/template/tf/security_group.erb @@ -51,9 +51,9 @@ 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 %>" + <%= tag.key %> = "<%= tag.value %>" <% end -%> } <% end -%> diff --git a/lib/terraforming/template/tf/subnet.erb b/lib/terraforming/template/tf/subnet.erb index 700e96a2..b437dd5a 100644 --- a/lib/terraforming/template/tf/subnet.erb +++ b/lib/terraforming/template/tf/subnet.erb @@ -5,9 +5,9 @@ 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 %>" + <%= tag.key %> = "<%= tag.value %>" <% end -%> } } diff --git a/lib/terraforming/template/tf/vpc.erb b/lib/terraforming/template/tf/vpc.erb index e0574852..689a3c42 100644 --- a/lib/terraforming/template/tf/vpc.erb +++ b/lib/terraforming/template/tf/vpc.erb @@ -5,9 +5,9 @@ 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 %>" + <%= 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..1287f0e6 100644 --- a/lib/terraforming/template/tf/vpn_gateway.erb +++ b/lib/terraforming/template/tf/vpn_gateway.erb @@ -3,9 +3,9 @@ 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 %>" + <%= tag.key %> = "<%= tag.value %>" <% end -%> } } diff --git a/spec/lib/terraforming/resource/alb_spec.rb b/spec/lib/terraforming/resource/alb_spec.rb index 9b86d2fc..0b0628e3 100644 --- a/spec/lib/terraforming/resource/alb_spec.rb +++ b/spec/lib/terraforming/resource/alb_spec.rb @@ -114,8 +114,8 @@ module Resource prefix = "hoge" } - tags { - "Environment" = "Production" + 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..0dce1364 100644 --- a/spec/lib/terraforming/resource/ec2_spec.rb +++ b/spec/lib/terraforming/resource/ec2_spec.rb @@ -331,8 +331,8 @@ module Resource iops = 24 } - tags { - "Name" = "hoge" + 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..700d28c0 100644 --- a/spec/lib/terraforming/resource/elb_spec.rb +++ b/spec/lib/terraforming/resource/elb_spec.rb @@ -204,8 +204,8 @@ module Resource timeout = 5 } - tags { - "name" = "elb-1" + tags = { + name = "elb-1" } } @@ -242,8 +242,8 @@ module Resource timeout = 5 } - tags { - "name" = "elb-1" + 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..0debc189 100644 --- a/spec/lib/terraforming/resource/internet_gateway_spec.rb +++ b/spec/lib/terraforming/resource/internet_gateway_spec.rb @@ -43,15 +43,15 @@ module Resource resource "aws_internet_gateway" "igw-1234abcd" { vpc_id = "vpc-1234abcd" - tags { + tags = { } } resource "aws_internet_gateway" "test" { vpc_id = "vpc-5678efgh" - tags { - "Name" = "test" + 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..09f3b965 100644 --- a/spec/lib/terraforming/resource/network_acl_spec.rb +++ b/spec/lib/terraforming/resource/network_acl_spec.rb @@ -138,8 +138,8 @@ module Resource cidr_block = "0.0.0.0/0" } - tags { - "Name" = "hoge" + tags = { + Name = "hoge" } } @@ -178,8 +178,8 @@ module Resource icmp_type = "4" } - tags { - "Name" = "fuga" + 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..ebab3c63 100644 --- a/spec/lib/terraforming/resource/network_interface_spec.rb +++ b/spec/lib/terraforming/resource/network_interface_spec.rb @@ -122,8 +122,8 @@ module Resource instance = "i-12345678" device_index = 0 } - tags { - "Name" = "fuga" + 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..d49f200e 100644 --- a/spec/lib/terraforming/resource/route53_zone_spec.rb +++ b/spec/lib/terraforming/resource/route53_zone_spec.rb @@ -89,8 +89,8 @@ module Resource name = "hoge.net" comment = "" - tags { - "Environment" = "dev" + tags = { + Environment = "dev" } } @@ -100,8 +100,8 @@ module Resource vpc_id = "vpc-1234abcd" vpc_region = "ap-northeast-1" - tags { - "Environment" = "dev" + 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..5a77a219 100644 --- a/spec/lib/terraforming/resource/route_table_spec.rb +++ b/spec/lib/terraforming/resource/route_table_spec.rb @@ -153,8 +153,8 @@ module Resource propagating_vgws = ["vgw-1a4j20b"] - tags { - "Name" = "my-route-table" + tags = { + Name = "my-route-table" } } @@ -166,8 +166,8 @@ module Resource gateway_id = "vgw-2345cdef" } - tags { - "Name" = "my-route-table-2" + 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..5071edac 100644 --- a/spec/lib/terraforming/resource/security_group_spec.rb +++ b/spec/lib/terraforming/resource/security_group_spec.rb @@ -269,8 +269,8 @@ module Resource self = true } - tags { - "Name" = "fuga" + tags = { + Name = "fuga" } } @@ -299,8 +299,8 @@ module Resource ipv6_cidr_blocks = ["::/0"] } - tags { - "Name" = "piyo" + tags = { + Name = "piyo" } } diff --git a/spec/lib/terraforming/resource/subnet_spec.rb b/spec/lib/terraforming/resource/subnet_spec.rb index 8c7b0665..c7ebccf3 100644 --- a/spec/lib/terraforming/resource/subnet_spec.rb +++ b/spec/lib/terraforming/resource/subnet_spec.rb @@ -51,8 +51,8 @@ module Resource availability_zone = "ap-northeast-1c" map_public_ip_on_launch = false - tags { - "Name" = "hoge" + tags = { + Name = "hoge" } } @@ -62,8 +62,8 @@ module Resource availability_zone = "ap-northeast-1c" map_public_ip_on_launch = false - tags { - "Name" = "fuga" + tags = { + Name = "fuga" } } diff --git a/spec/lib/terraforming/resource/vpc_spec.rb b/spec/lib/terraforming/resource/vpc_spec.rb index 665d9b91..50e9eff9 100644 --- a/spec/lib/terraforming/resource/vpc_spec.rb +++ b/spec/lib/terraforming/resource/vpc_spec.rb @@ -63,8 +63,8 @@ module Resource enable_dns_support = true instance_tenancy = "default" - tags { - "Name" = "hoge" + tags = { + Name = "hoge" } } @@ -74,8 +74,8 @@ module Resource enable_dns_support = true instance_tenancy = "default" - tags { - "Name" = "fuga" + 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..4a0cc44a 100644 --- a/spec/lib/terraforming/resource/vpn_gateway_spec.rb +++ b/spec/lib/terraforming/resource/vpn_gateway_spec.rb @@ -45,15 +45,15 @@ 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 { - "Name" = "test" + tags = { + Name = "test" } }