From 5f6aec2b857cd5b40773e1932757632f0e868b1a Mon Sep 17 00:00:00 2001 From: badra001 Date: Mon, 19 Sep 2022 15:34:10 -0400 Subject: [PATCH] fix --- vpn-transit-gateway/vpn-config.tf | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vpn-transit-gateway/vpn-config.tf b/vpn-transit-gateway/vpn-config.tf index ef51f43..24d4abc 100644 --- a/vpn-transit-gateway/vpn-config.tf +++ b/vpn-transit-gateway/vpn-config.tf @@ -21,7 +21,6 @@ locals { tunnel1_inside_cidr = aws_vpn_connection.vpn[k].tunnel1_inside_cidr tunnel1_cgw_inside_address = aws_vpn_connection.vpn[k].tunnel1_cgw_inside_address tunnel1_vgw_inside_address = aws_vpn_connection.vpn[k].tunnel1_vgw_inside_address - tunnel1_preshared_key = aws_vpn_connection.vpn[k].tunnel1_preshared_key tunnel1_interface_number = length(v.tunnel_interfaces) == 2 ? v.tunnel_interfaces[0] : "" tunnel1_loopback = v.tunnel_loopback != null ? v.tunnel_loopback : "" @@ -31,11 +30,15 @@ locals { tunnel2_inside_cidr = aws_vpn_connection.vpn[k].tunnel2_inside_cidr tunnel2_cgw_inside_address = aws_vpn_connection.vpn[k].tunnel2_cgw_inside_address tunnel2_vgw_inside_address = aws_vpn_connection.vpn[k].tunnel2_vgw_inside_address - tunnel2_preshared_key = aws_vpn_connection.vpn[k].tunnel2_preshared_key tunnel2_interface_number = length(v.tunnel_interfaces) == 2 ? v.tunnel_interfaces[1] : "" tunnel2_loopback = v.tunnel_loopback != null ? v.tunnel_loopback : "" } } + vpn_tunnel_secrets = { for k, v in local.vpn_settings : k => { + tunnel1_preshared_key = aws_vpn_connection.vpn[k].tunnel1_preshared_key + tunnel2_preshared_key = aws_vpn_connection.vpn[k].tunnel2_preshared_key + } + } } resource "null_resource" "directory_setup" { @@ -68,7 +71,7 @@ resource "null_resource" "generate_configs" { resource "local_sensitive_file" "vpn_details_json" { for_each = local.vpn_tunnel_outputs # content = templatefile("${path.module}/templates/vpn_details.tpl"), { - content = jsonencode(merge({ version = local._module_version, name = each.key }, each.value)) + content = jsonencode(merge({ version = local._module_version, name = each.key }, each.value, local.vpc_tunnel_secrets[each.key])) filename = format("${path.root}/%v/%v.%v.%v.json", null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key) file_permission = "0644" } @@ -76,7 +79,7 @@ resource "local_sensitive_file" "vpn_details_json" { resource "local_sensitive_file" "vpn_details_yaml" { for_each = local.vpn_tunnel_outputs # content = templatefile("${path.module}/templates/vpn_details.tpl"), { - content = yamlencode(merge({ version = local._module_version, name = each.key }, each.value)) + content = yamlencode(merge({ version = local._module_version, name = each.key }, each.value, local.vpc_tunnel_secrets[each.key])) filename = format("${path.root}/%v/%v.%v.%v.yml", null_resource.directory_setup.triggers.name, local.account_id, local.region, each.key) file_permission = "0644" }