Repository: chanzuckerberg/fogg
Pull request #386 (2019-12-11 05:43:39)

[fix] use simplified 0.12 syntax for module invocations
This uses the simpler syntax. Example `module.foo.bar` rather than `"${module.foo.bar}"`.

### Test Plan
* unit tests
* tested on 1 internal repo

### References
* 

codecov[bot]: # [Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/386?src=pr&el=h1) Report
> Merging [#386](https://codecov.io/gh/chanzuckerberg/fogg/pull/386?src=pr&el=desc) into [master](https://codecov.io/gh/chanzuckerberg/fogg/commit/9c742c4efec709674239dd0ab7a220ed46b611ff?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/chanzuckerberg/fogg/pull/386/graphs/tree.svg?width=650&token=57DhtZ7g2A&height=150&src=pr)](https://codecov.io/gh/chanzuckerberg/fogg/pull/386?src=pr&el=tree)

```diff
@@           Coverage Diff           @@
##           master     #386   +/-   ##
=======================================
  Coverage   79.04%   79.04%           
=======================================
  Files          25       25           
  Lines        2009     2009           
=======================================
  Hits         1588     1588           
  Misses        278      278           
  Partials      143      143
```



------

[Continue to review full report at Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/386?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/386?src=pr&el=footer). Last update [9c742c4...6da310c](https://codecov.io/gh/chanzuckerberg/fogg/pull/386?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


Patch:
diff --git a/templates/module-invocation/main.tf.tmpl b/templates/module-invocation/main.tf.tmpl
index fefc29de..1da0ecf6 100644
--- a/templates/module-invocation/main.tf.tmpl
+++ b/templates/module-invocation/main.tf.tmpl
@@ -4,6 +4,6 @@
 module "{{.ModuleName}}" {
   source = "{{.ModuleSource}}"
   {{range .Variables -}}
-    {{.}} = "${local.{{.}}}"
+    {{.}} = local.{{.}}
   {{ end}}
 }
diff --git a/templates/module-invocation/outputs.tf.tmpl b/templates/module-invocation/outputs.tf.tmpl
index c875a3f2..d7262f3c 100644
--- a/templates/module-invocation/outputs.tf.tmpl
+++ b/templates/module-invocation/outputs.tf.tmpl
@@ -4,7 +4,7 @@
 {{ $outer := . -}}
 {{- range .Outputs -}}
 output "{{.}}" {
-  value = "${module.{{$outer.ModuleName}}.{{.}}}"
+  value = module.{{$outer.ModuleName}}.{{.}}
 }
 
-{{end}}
\ No newline at end of file
+{{end}}


Test patch:
diff --git a/apply/apply_test.go b/apply/apply_test.go
index 3da2937e..87493a9b 100644
--- a/apply/apply_test.go
+++ b/apply/apply_test.go
@@ -332,14 +332,14 @@ func TestApplyModuleInvocation(t *testing.T) {
 	a.Nil(e)
 	r, e := afero.ReadFile(fs, "mymodule/main.tf")
 	a.Nil(e)
-	expected := "# Auto-generated by fogg. Do not edit\n# Make improvements in fogg, so that everyone can benefit.\n\nmodule \"test-module\" {\n  source = \"../test-module\"\n  bar    = \"${local.bar}\"\n  foo    = \"${local.foo}\"\n\n}\n"
+	expected := "# Auto-generated by fogg. Do not edit\n# Make improvements in fogg, so that everyone can benefit.\n\nmodule \"test-module\" {\n  source = \"../test-module\"\n  bar    = local.bar\n  foo    = local.foo\n\n}\n"
 	a.Equal(expected, string(r))
 
 	_, e = fs.Stat("mymodule/outputs.tf")
 	a.Nil(e)
 	r, e = afero.ReadFile(fs, "mymodule/outputs.tf")
 	a.Nil(e)
-	expected = "# Auto-generated by fogg. Do not edit\n# Make improvements in fogg, so that everyone can benefit.\n\noutput \"bar\" {\n  value = \"${module.test-module.bar}\"\n}\n\noutput \"foo\" {\n  value = \"${module.test-module.foo}\"\n}\n\n"
+	expected = "# Auto-generated by fogg. Do not edit\n# Make improvements in fogg, so that everyone can benefit.\n\noutput \"bar\" {\n  value = module.test-module.bar\n}\n\noutput \"foo\" {\n  value = module.test-module.foo\n}\n\n\n"
 	a.Equal(expected, string(r))
 }
 func TestGetTargetPath(t *testing.T) {
diff --git a/testdata/v1_full/terraform/envs/stage/cloud-env/main.tf b/testdata/v1_full/terraform/envs/stage/cloud-env/main.tf
index f3ff95f3..42352424 100644
--- a/testdata/v1_full/terraform/envs/stage/cloud-env/main.tf
+++ b/testdata/v1_full/terraform/envs/stage/cloud-env/main.tf
@@ -3,7 +3,7 @@
 
 module "fogg-test-module" {
   source = "github.com/chanzuckerberg/fogg-test-module"
-  bar    = "${local.bar}"
-  foo    = "${local.foo}"
+  bar    = local.bar
+  foo    = local.foo
 
 }
diff --git a/testdata/v1_full/terraform/envs/stage/cloud-env/outputs.tf b/testdata/v1_full/terraform/envs/stage/cloud-env/outputs.tf
index e6c8a8a7..10151617 100644
--- a/testdata/v1_full/terraform/envs/stage/cloud-env/outputs.tf
+++ b/testdata/v1_full/terraform/envs/stage/cloud-env/outputs.tf
@@ -2,10 +2,11 @@
 # Make improvements in fogg, so that everyone can benefit.
 
 output "bar" {
-  value = "${module.fogg-test-module.bar}"
+  value = module.fogg-test-module.bar
 }
 
 output "foo" {
-  value = "${module.fogg-test-module.foo}"
+  value = module.fogg-test-module.foo
 }
 
+
diff --git a/testdata/v2_full/terraform/envs/staging/vpc/main.tf b/testdata/v2_full/terraform/envs/staging/vpc/main.tf
index 44fae17d..14b26e5c 100644
--- a/testdata/v2_full/terraform/envs/staging/vpc/main.tf
+++ b/testdata/v2_full/terraform/envs/staging/vpc/main.tf
@@ -3,52 +3,52 @@
 
 module "terraform-aws-vpc" {
   source                             = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v1.30.0"
-  azs                                = "${local.azs}"
-  cidr                               = "${local.cidr}"
-  create_database_subnet_group       = "${local.create_database_subnet_group}"
-  create_vpc                         = "${local.create_vpc}"
-  database_subnet_tags               = "${local.database_subnet_tags}"
-  database_subnets                   = "${local.database_subnets}"
-  default_route_table_tags           = "${local.default_route_table_tags}"
-  default_vpc_enable_classiclink     = "${local.default_vpc_enable_classiclink}"
-  default_vpc_enable_dns_hostnames   = "${local.default_vpc_enable_dns_hostnames}"
-  default_vpc_enable_dns_support     = "${local.default_vpc_enable_dns_support}"
-  default_vpc_name                   = "${local.default_vpc_name}"
-  default_vpc_tags                   = "${local.default_vpc_tags}"
-  dhcp_options_domain_name           = "${local.dhcp_options_domain_name}"
-  dhcp_options_domain_name_servers   = "${local.dhcp_options_domain_name_servers}"
-  dhcp_options_netbios_name_servers  = "${local.dhcp_options_netbios_name_servers}"
-  dhcp_options_netbios_node_type     = "${local.dhcp_options_netbios_node_type}"
-  dhcp_options_ntp_servers           = "${local.dhcp_options_ntp_servers}"
-  dhcp_options_tags                  = "${local.dhcp_options_tags}"
-  elasticache_subnet_tags            = "${local.elasticache_subnet_tags}"
-  elasticache_subnets                = "${local.elasticache_subnets}"
-  enable_dhcp_options                = "${local.enable_dhcp_options}"
-  enable_dns_hostnames               = "${local.enable_dns_hostnames}"
-  enable_dns_support                 = "${local.enable_dns_support}"
-  enable_dynamodb_endpoint           = "${local.enable_dynamodb_endpoint}"
-  enable_nat_gateway                 = "${local.enable_nat_gateway}"
-  enable_s3_endpoint                 = "${local.enable_s3_endpoint}"
-  enable_vpn_gateway                 = "${local.enable_vpn_gateway}"
-  external_nat_ip_ids                = "${local.external_nat_ip_ids}"
-  instance_tenancy                   = "${local.instance_tenancy}"
-  manage_default_vpc                 = "${local.manage_default_vpc}"
-  map_public_ip_on_launch            = "${local.map_public_ip_on_launch}"
-  name                               = "${local.name}"
-  private_route_table_tags           = "${local.private_route_table_tags}"
-  private_subnet_tags                = "${local.private_subnet_tags}"
-  private_subnets                    = "${local.private_subnets}"
-  propagate_private_route_tables_vgw = "${local.propagate_private_route_tables_vgw}"
-  propagate_public_route_tables_vgw  = "${local.propagate_public_route_tables_vgw}"
-  public_route_table_tags            = "${local.public_route_table_tags}"
-  public_subnet_tags                 = "${local.public_subnet_tags}"
-  public_subnets                     = "${local.public_subnets}"
-  redshift_subnet_tags               = "${local.redshift_subnet_tags}"
-  redshift_subnets                   = "${local.redshift_subnets}"
-  reuse_nat_ips                      = "${local.reuse_nat_ips}"
-  single_nat_gateway                 = "${local.single_nat_gateway}"
-  tags                               = "${local.tags}"
-  vpc_tags                           = "${local.vpc_tags}"
-  vpn_gateway_id                     = "${local.vpn_gateway_id}"
+  azs                                = local.azs
+  cidr                               = local.cidr
+  create_database_subnet_group       = local.create_database_subnet_group
+  create_vpc                         = local.create_vpc
+  database_subnet_tags               = local.database_subnet_tags
+  database_subnets                   = local.database_subnets
+  default_route_table_tags           = local.default_route_table_tags
+  default_vpc_enable_classiclink     = local.default_vpc_enable_classiclink
+  default_vpc_enable_dns_hostnames   = local.default_vpc_enable_dns_hostnames
+  default_vpc_enable_dns_support     = local.default_vpc_enable_dns_support
+  default_vpc_name                   = local.default_vpc_name
+  default_vpc_tags                   = local.default_vpc_tags
+  dhcp_options_domain_name           = local.dhcp_options_domain_name
+  dhcp_options_domain_name_servers   = local.dhcp_options_domain_name_servers
+  dhcp_options_netbios_name_servers  = local.dhcp_options_netbios_name_servers
+  dhcp_options_netbios_node_type     = local.dhcp_options_netbios_node_type
+  dhcp_options_ntp_servers           = local.dhcp_options_ntp_servers
+  dhcp_options_tags                  = local.dhcp_options_tags
+  elasticache_subnet_tags            = local.elasticache_subnet_tags
+  elasticache_subnets                = local.elasticache_subnets
+  enable_dhcp_options                = local.enable_dhcp_options
+  enable_dns_hostnames               = local.enable_dns_hostnames
+  enable_dns_support                 = local.enable_dns_support
+  enable_dynamodb_endpoint           = local.enable_dynamodb_endpoint
+  enable_nat_gateway                 = local.enable_nat_gateway
+  enable_s3_endpoint                 = local.enable_s3_endpoint
+  enable_vpn_gateway                 = local.enable_vpn_gateway
+  external_nat_ip_ids                = local.external_nat_ip_ids
+  instance_tenancy                   = local.instance_tenancy
+  manage_default_vpc                 = local.manage_default_vpc
+  map_public_ip_on_launch            = local.map_public_ip_on_launch
+  name                               = local.name
+  private_route_table_tags           = local.private_route_table_tags
+  private_subnet_tags                = local.private_subnet_tags
+  private_subnets                    = local.private_subnets
+  propagate_private_route_tables_vgw = local.propagate_private_route_tables_vgw
+  propagate_public_route_tables_vgw  = local.propagate_public_route_tables_vgw
+  public_route_table_tags            = local.public_route_table_tags
+  public_subnet_tags                 = local.public_subnet_tags
+  public_subnets                     = local.public_subnets
+  redshift_subnet_tags               = local.redshift_subnet_tags
+  redshift_subnets                   = local.redshift_subnets
+  reuse_nat_ips                      = local.reuse_nat_ips
+  single_nat_gateway                 = local.single_nat_gateway
+  tags                               = local.tags
+  vpc_tags                           = local.vpc_tags
+  vpn_gateway_id                     = local.vpn_gateway_id
 
 }
diff --git a/testdata/v2_full/terraform/envs/staging/vpc/outputs.tf b/testdata/v2_full/terraform/envs/staging/vpc/outputs.tf
index 2f211db0..72108011 100644
--- a/testdata/v2_full/terraform/envs/staging/vpc/outputs.tf
+++ b/testdata/v2_full/terraform/envs/staging/vpc/outputs.tf
@@ -2,174 +2,175 @@
 # Make improvements in fogg, so that everyone can benefit.
 
 output "database_subnet_group" {
-  value = "${module.terraform-aws-vpc.database_subnet_group}"
+  value = module.terraform-aws-vpc.database_subnet_group
 }
 
 output "database_subnets" {
-  value = "${module.terraform-aws-vpc.database_subnets}"
+  value = module.terraform-aws-vpc.database_subnets
 }
 
 output "database_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.database_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.database_subnets_cidr_blocks
 }
 
 output "default_network_acl_id" {
-  value = "${module.terraform-aws-vpc.default_network_acl_id}"
+  value = module.terraform-aws-vpc.default_network_acl_id
 }
 
 output "default_route_table_id" {
-  value = "${module.terraform-aws-vpc.default_route_table_id}"
+  value = module.terraform-aws-vpc.default_route_table_id
 }
 
 output "default_security_group_id" {
-  value = "${module.terraform-aws-vpc.default_security_group_id}"
+  value = module.terraform-aws-vpc.default_security_group_id
 }
 
 output "default_vpc_cidr_block" {
-  value = "${module.terraform-aws-vpc.default_vpc_cidr_block}"
+  value = module.terraform-aws-vpc.default_vpc_cidr_block
 }
 
 output "default_vpc_default_network_acl_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_default_network_acl_id}"
+  value = module.terraform-aws-vpc.default_vpc_default_network_acl_id
 }
 
 output "default_vpc_default_route_table_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_default_route_table_id}"
+  value = module.terraform-aws-vpc.default_vpc_default_route_table_id
 }
 
 output "default_vpc_default_security_group_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_default_security_group_id}"
+  value = module.terraform-aws-vpc.default_vpc_default_security_group_id
 }
 
 output "default_vpc_enable_dns_hostnames" {
-  value = "${module.terraform-aws-vpc.default_vpc_enable_dns_hostnames}"
+  value = module.terraform-aws-vpc.default_vpc_enable_dns_hostnames
 }
 
 output "default_vpc_enable_dns_support" {
-  value = "${module.terraform-aws-vpc.default_vpc_enable_dns_support}"
+  value = module.terraform-aws-vpc.default_vpc_enable_dns_support
 }
 
 output "default_vpc_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_id}"
+  value = module.terraform-aws-vpc.default_vpc_id
 }
 
 output "default_vpc_instance_tenancy" {
-  value = "${module.terraform-aws-vpc.default_vpc_instance_tenancy}"
+  value = module.terraform-aws-vpc.default_vpc_instance_tenancy
 }
 
 output "default_vpc_main_route_table_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_main_route_table_id}"
+  value = module.terraform-aws-vpc.default_vpc_main_route_table_id
 }
 
 output "elasticache_subnet_group" {
-  value = "${module.terraform-aws-vpc.elasticache_subnet_group}"
+  value = module.terraform-aws-vpc.elasticache_subnet_group
 }
 
 output "elasticache_subnet_group_name" {
-  value = "${module.terraform-aws-vpc.elasticache_subnet_group_name}"
+  value = module.terraform-aws-vpc.elasticache_subnet_group_name
 }
 
 output "elasticache_subnets" {
-  value = "${module.terraform-aws-vpc.elasticache_subnets}"
+  value = module.terraform-aws-vpc.elasticache_subnets
 }
 
 output "elasticache_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.elasticache_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.elasticache_subnets_cidr_blocks
 }
 
 output "igw_id" {
-  value = "${module.terraform-aws-vpc.igw_id}"
+  value = module.terraform-aws-vpc.igw_id
 }
 
 output "nat_ids" {
-  value = "${module.terraform-aws-vpc.nat_ids}"
+  value = module.terraform-aws-vpc.nat_ids
 }
 
 output "nat_public_ips" {
-  value = "${module.terraform-aws-vpc.nat_public_ips}"
+  value = module.terraform-aws-vpc.nat_public_ips
 }
 
 output "natgw_ids" {
-  value = "${module.terraform-aws-vpc.natgw_ids}"
+  value = module.terraform-aws-vpc.natgw_ids
 }
 
 output "private_route_table_ids" {
-  value = "${module.terraform-aws-vpc.private_route_table_ids}"
+  value = module.terraform-aws-vpc.private_route_table_ids
 }
 
 output "private_subnets" {
-  value = "${module.terraform-aws-vpc.private_subnets}"
+  value = module.terraform-aws-vpc.private_subnets
 }
 
 output "private_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.private_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.private_subnets_cidr_blocks
 }
 
 output "public_route_table_ids" {
-  value = "${module.terraform-aws-vpc.public_route_table_ids}"
+  value = module.terraform-aws-vpc.public_route_table_ids
 }
 
 output "public_subnets" {
-  value = "${module.terraform-aws-vpc.public_subnets}"
+  value = module.terraform-aws-vpc.public_subnets
 }
 
 output "public_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.public_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.public_subnets_cidr_blocks
 }
 
 output "redshift_subnet_group" {
-  value = "${module.terraform-aws-vpc.redshift_subnet_group}"
+  value = module.terraform-aws-vpc.redshift_subnet_group
 }
 
 output "redshift_subnets" {
-  value = "${module.terraform-aws-vpc.redshift_subnets}"
+  value = module.terraform-aws-vpc.redshift_subnets
 }
 
 output "redshift_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.redshift_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.redshift_subnets_cidr_blocks
 }
 
 output "vgw_id" {
-  value = "${module.terraform-aws-vpc.vgw_id}"
+  value = module.terraform-aws-vpc.vgw_id
 }
 
 output "vpc_cidr_block" {
-  value = "${module.terraform-aws-vpc.vpc_cidr_block}"
+  value = module.terraform-aws-vpc.vpc_cidr_block
 }
 
 output "vpc_enable_dns_hostnames" {
-  value = "${module.terraform-aws-vpc.vpc_enable_dns_hostnames}"
+  value = module.terraform-aws-vpc.vpc_enable_dns_hostnames
 }
 
 output "vpc_enable_dns_support" {
-  value = "${module.terraform-aws-vpc.vpc_enable_dns_support}"
+  value = module.terraform-aws-vpc.vpc_enable_dns_support
 }
 
 output "vpc_endpoint_dynamodb_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_dynamodb_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_dynamodb_id
 }
 
 output "vpc_endpoint_dynamodb_pl_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_dynamodb_pl_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_dynamodb_pl_id
 }
 
 output "vpc_endpoint_s3_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_s3_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_s3_id
 }
 
 output "vpc_endpoint_s3_pl_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_s3_pl_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_s3_pl_id
 }
 
 output "vpc_id" {
-  value = "${module.terraform-aws-vpc.vpc_id}"
+  value = module.terraform-aws-vpc.vpc_id
 }
 
 output "vpc_instance_tenancy" {
-  value = "${module.terraform-aws-vpc.vpc_instance_tenancy}"
+  value = module.terraform-aws-vpc.vpc_instance_tenancy
 }
 
 output "vpc_main_route_table_id" {
-  value = "${module.terraform-aws-vpc.vpc_main_route_table_id}"
+  value = module.terraform-aws-vpc.vpc_main_route_table_id
 }
 
+
diff --git a/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/main.tf b/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/main.tf
index 44fae17d..14b26e5c 100644
--- a/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/main.tf
+++ b/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/main.tf
@@ -3,52 +3,52 @@
 
 module "terraform-aws-vpc" {
   source                             = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v1.30.0"
-  azs                                = "${local.azs}"
-  cidr                               = "${local.cidr}"
-  create_database_subnet_group       = "${local.create_database_subnet_group}"
-  create_vpc                         = "${local.create_vpc}"
-  database_subnet_tags               = "${local.database_subnet_tags}"
-  database_subnets                   = "${local.database_subnets}"
-  default_route_table_tags           = "${local.default_route_table_tags}"
-  default_vpc_enable_classiclink     = "${local.default_vpc_enable_classiclink}"
-  default_vpc_enable_dns_hostnames   = "${local.default_vpc_enable_dns_hostnames}"
-  default_vpc_enable_dns_support     = "${local.default_vpc_enable_dns_support}"
-  default_vpc_name                   = "${local.default_vpc_name}"
-  default_vpc_tags                   = "${local.default_vpc_tags}"
-  dhcp_options_domain_name           = "${local.dhcp_options_domain_name}"
-  dhcp_options_domain_name_servers   = "${local.dhcp_options_domain_name_servers}"
-  dhcp_options_netbios_name_servers  = "${local.dhcp_options_netbios_name_servers}"
-  dhcp_options_netbios_node_type     = "${local.dhcp_options_netbios_node_type}"
-  dhcp_options_ntp_servers           = "${local.dhcp_options_ntp_servers}"
-  dhcp_options_tags                  = "${local.dhcp_options_tags}"
-  elasticache_subnet_tags            = "${local.elasticache_subnet_tags}"
-  elasticache_subnets                = "${local.elasticache_subnets}"
-  enable_dhcp_options                = "${local.enable_dhcp_options}"
-  enable_dns_hostnames               = "${local.enable_dns_hostnames}"
-  enable_dns_support                 = "${local.enable_dns_support}"
-  enable_dynamodb_endpoint           = "${local.enable_dynamodb_endpoint}"
-  enable_nat_gateway                 = "${local.enable_nat_gateway}"
-  enable_s3_endpoint                 = "${local.enable_s3_endpoint}"
-  enable_vpn_gateway                 = "${local.enable_vpn_gateway}"
-  external_nat_ip_ids                = "${local.external_nat_ip_ids}"
-  instance_tenancy                   = "${local.instance_tenancy}"
-  manage_default_vpc                 = "${local.manage_default_vpc}"
-  map_public_ip_on_launch            = "${local.map_public_ip_on_launch}"
-  name                               = "${local.name}"
-  private_route_table_tags           = "${local.private_route_table_tags}"
-  private_subnet_tags                = "${local.private_subnet_tags}"
-  private_subnets                    = "${local.private_subnets}"
-  propagate_private_route_tables_vgw = "${local.propagate_private_route_tables_vgw}"
-  propagate_public_route_tables_vgw  = "${local.propagate_public_route_tables_vgw}"
-  public_route_table_tags            = "${local.public_route_table_tags}"
-  public_subnet_tags                 = "${local.public_subnet_tags}"
-  public_subnets                     = "${local.public_subnets}"
-  redshift_subnet_tags               = "${local.redshift_subnet_tags}"
-  redshift_subnets                   = "${local.redshift_subnets}"
-  reuse_nat_ips                      = "${local.reuse_nat_ips}"
-  single_nat_gateway                 = "${local.single_nat_gateway}"
-  tags                               = "${local.tags}"
-  vpc_tags                           = "${local.vpc_tags}"
-  vpn_gateway_id                     = "${local.vpn_gateway_id}"
+  azs                                = local.azs
+  cidr                               = local.cidr
+  create_database_subnet_group       = local.create_database_subnet_group
+  create_vpc                         = local.create_vpc
+  database_subnet_tags               = local.database_subnet_tags
+  database_subnets                   = local.database_subnets
+  default_route_table_tags           = local.default_route_table_tags
+  default_vpc_enable_classiclink     = local.default_vpc_enable_classiclink
+  default_vpc_enable_dns_hostnames   = local.default_vpc_enable_dns_hostnames
+  default_vpc_enable_dns_support     = local.default_vpc_enable_dns_support
+  default_vpc_name                   = local.default_vpc_name
+  default_vpc_tags                   = local.default_vpc_tags
+  dhcp_options_domain_name           = local.dhcp_options_domain_name
+  dhcp_options_domain_name_servers   = local.dhcp_options_domain_name_servers
+  dhcp_options_netbios_name_servers  = local.dhcp_options_netbios_name_servers
+  dhcp_options_netbios_node_type     = local.dhcp_options_netbios_node_type
+  dhcp_options_ntp_servers           = local.dhcp_options_ntp_servers
+  dhcp_options_tags                  = local.dhcp_options_tags
+  elasticache_subnet_tags            = local.elasticache_subnet_tags
+  elasticache_subnets                = local.elasticache_subnets
+  enable_dhcp_options                = local.enable_dhcp_options
+  enable_dns_hostnames               = local.enable_dns_hostnames
+  enable_dns_support                 = local.enable_dns_support
+  enable_dynamodb_endpoint           = local.enable_dynamodb_endpoint
+  enable_nat_gateway                 = local.enable_nat_gateway
+  enable_s3_endpoint                 = local.enable_s3_endpoint
+  enable_vpn_gateway                 = local.enable_vpn_gateway
+  external_nat_ip_ids                = local.external_nat_ip_ids
+  instance_tenancy                   = local.instance_tenancy
+  manage_default_vpc                 = local.manage_default_vpc
+  map_public_ip_on_launch            = local.map_public_ip_on_launch
+  name                               = local.name
+  private_route_table_tags           = local.private_route_table_tags
+  private_subnet_tags                = local.private_subnet_tags
+  private_subnets                    = local.private_subnets
+  propagate_private_route_tables_vgw = local.propagate_private_route_tables_vgw
+  propagate_public_route_tables_vgw  = local.propagate_public_route_tables_vgw
+  public_route_table_tags            = local.public_route_table_tags
+  public_subnet_tags                 = local.public_subnet_tags
+  public_subnets                     = local.public_subnets
+  redshift_subnet_tags               = local.redshift_subnet_tags
+  redshift_subnets                   = local.redshift_subnets
+  reuse_nat_ips                      = local.reuse_nat_ips
+  single_nat_gateway                 = local.single_nat_gateway
+  tags                               = local.tags
+  vpc_tags                           = local.vpc_tags
+  vpn_gateway_id                     = local.vpn_gateway_id
 
 }
diff --git a/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/outputs.tf b/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/outputs.tf
index 2f211db0..72108011 100644
--- a/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/outputs.tf
+++ b/testdata/v2_no_aws_provider/terraform/envs/staging/vpc/outputs.tf
@@ -2,174 +2,175 @@
 # Make improvements in fogg, so that everyone can benefit.
 
 output "database_subnet_group" {
-  value = "${module.terraform-aws-vpc.database_subnet_group}"
+  value = module.terraform-aws-vpc.database_subnet_group
 }
 
 output "database_subnets" {
-  value = "${module.terraform-aws-vpc.database_subnets}"
+  value = module.terraform-aws-vpc.database_subnets
 }
 
 output "database_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.database_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.database_subnets_cidr_blocks
 }
 
 output "default_network_acl_id" {
-  value = "${module.terraform-aws-vpc.default_network_acl_id}"
+  value = module.terraform-aws-vpc.default_network_acl_id
 }
 
 output "default_route_table_id" {
-  value = "${module.terraform-aws-vpc.default_route_table_id}"
+  value = module.terraform-aws-vpc.default_route_table_id
 }
 
 output "default_security_group_id" {
-  value = "${module.terraform-aws-vpc.default_security_group_id}"
+  value = module.terraform-aws-vpc.default_security_group_id
 }
 
 output "default_vpc_cidr_block" {
-  value = "${module.terraform-aws-vpc.default_vpc_cidr_block}"
+  value = module.terraform-aws-vpc.default_vpc_cidr_block
 }
 
 output "default_vpc_default_network_acl_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_default_network_acl_id}"
+  value = module.terraform-aws-vpc.default_vpc_default_network_acl_id
 }
 
 output "default_vpc_default_route_table_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_default_route_table_id}"
+  value = module.terraform-aws-vpc.default_vpc_default_route_table_id
 }
 
 output "default_vpc_default_security_group_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_default_security_group_id}"
+  value = module.terraform-aws-vpc.default_vpc_default_security_group_id
 }
 
 output "default_vpc_enable_dns_hostnames" {
-  value = "${module.terraform-aws-vpc.default_vpc_enable_dns_hostnames}"
+  value = module.terraform-aws-vpc.default_vpc_enable_dns_hostnames
 }
 
 output "default_vpc_enable_dns_support" {
-  value = "${module.terraform-aws-vpc.default_vpc_enable_dns_support}"
+  value = module.terraform-aws-vpc.default_vpc_enable_dns_support
 }
 
 output "default_vpc_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_id}"
+  value = module.terraform-aws-vpc.default_vpc_id
 }
 
 output "default_vpc_instance_tenancy" {
-  value = "${module.terraform-aws-vpc.default_vpc_instance_tenancy}"
+  value = module.terraform-aws-vpc.default_vpc_instance_tenancy
 }
 
 output "default_vpc_main_route_table_id" {
-  value = "${module.terraform-aws-vpc.default_vpc_main_route_table_id}"
+  value = module.terraform-aws-vpc.default_vpc_main_route_table_id
 }
 
 output "elasticache_subnet_group" {
-  value = "${module.terraform-aws-vpc.elasticache_subnet_group}"
+  value = module.terraform-aws-vpc.elasticache_subnet_group
 }
 
 output "elasticache_subnet_group_name" {
-  value = "${module.terraform-aws-vpc.elasticache_subnet_group_name}"
+  value = module.terraform-aws-vpc.elasticache_subnet_group_name
 }
 
 output "elasticache_subnets" {
-  value = "${module.terraform-aws-vpc.elasticache_subnets}"
+  value = module.terraform-aws-vpc.elasticache_subnets
 }
 
 output "elasticache_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.elasticache_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.elasticache_subnets_cidr_blocks
 }
 
 output "igw_id" {
-  value = "${module.terraform-aws-vpc.igw_id}"
+  value = module.terraform-aws-vpc.igw_id
 }
 
 output "nat_ids" {
-  value = "${module.terraform-aws-vpc.nat_ids}"
+  value = module.terraform-aws-vpc.nat_ids
 }
 
 output "nat_public_ips" {
-  value = "${module.terraform-aws-vpc.nat_public_ips}"
+  value = module.terraform-aws-vpc.nat_public_ips
 }
 
 output "natgw_ids" {
-  value = "${module.terraform-aws-vpc.natgw_ids}"
+  value = module.terraform-aws-vpc.natgw_ids
 }
 
 output "private_route_table_ids" {
-  value = "${module.terraform-aws-vpc.private_route_table_ids}"
+  value = module.terraform-aws-vpc.private_route_table_ids
 }
 
 output "private_subnets" {
-  value = "${module.terraform-aws-vpc.private_subnets}"
+  value = module.terraform-aws-vpc.private_subnets
 }
 
 output "private_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.private_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.private_subnets_cidr_blocks
 }
 
 output "public_route_table_ids" {
-  value = "${module.terraform-aws-vpc.public_route_table_ids}"
+  value = module.terraform-aws-vpc.public_route_table_ids
 }
 
 output "public_subnets" {
-  value = "${module.terraform-aws-vpc.public_subnets}"
+  value = module.terraform-aws-vpc.public_subnets
 }
 
 output "public_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.public_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.public_subnets_cidr_blocks
 }
 
 output "redshift_subnet_group" {
-  value = "${module.terraform-aws-vpc.redshift_subnet_group}"
+  value = module.terraform-aws-vpc.redshift_subnet_group
 }
 
 output "redshift_subnets" {
-  value = "${module.terraform-aws-vpc.redshift_subnets}"
+  value = module.terraform-aws-vpc.redshift_subnets
 }
 
 output "redshift_subnets_cidr_blocks" {
-  value = "${module.terraform-aws-vpc.redshift_subnets_cidr_blocks}"
+  value = module.terraform-aws-vpc.redshift_subnets_cidr_blocks
 }
 
 output "vgw_id" {
-  value = "${module.terraform-aws-vpc.vgw_id}"
+  value = module.terraform-aws-vpc.vgw_id
 }
 
 output "vpc_cidr_block" {
-  value = "${module.terraform-aws-vpc.vpc_cidr_block}"
+  value = module.terraform-aws-vpc.vpc_cidr_block
 }
 
 output "vpc_enable_dns_hostnames" {
-  value = "${module.terraform-aws-vpc.vpc_enable_dns_hostnames}"
+  value = module.terraform-aws-vpc.vpc_enable_dns_hostnames
 }
 
 output "vpc_enable_dns_support" {
-  value = "${module.terraform-aws-vpc.vpc_enable_dns_support}"
+  value = module.terraform-aws-vpc.vpc_enable_dns_support
 }
 
 output "vpc_endpoint_dynamodb_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_dynamodb_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_dynamodb_id
 }
 
 output "vpc_endpoint_dynamodb_pl_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_dynamodb_pl_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_dynamodb_pl_id
 }
 
 output "vpc_endpoint_s3_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_s3_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_s3_id
 }
 
 output "vpc_endpoint_s3_pl_id" {
-  value = "${module.terraform-aws-vpc.vpc_endpoint_s3_pl_id}"
+  value = module.terraform-aws-vpc.vpc_endpoint_s3_pl_id
 }
 
 output "vpc_id" {
-  value = "${module.terraform-aws-vpc.vpc_id}"
+  value = module.terraform-aws-vpc.vpc_id
 }
 
 output "vpc_instance_tenancy" {
-  value = "${module.terraform-aws-vpc.vpc_instance_tenancy}"
+  value = module.terraform-aws-vpc.vpc_instance_tenancy
 }
 
 output "vpc_main_route_table_id" {
-  value = "${module.terraform-aws-vpc.vpc_main_route_table_id}"
+  value = module.terraform-aws-vpc.vpc_main_route_table_id
 }
 
+