update vpn portion of vpc, versions

terraform-modules · Mar 2, 2023 · 0f7d215 · 0f7d215
1 parent c080b50
commit 0f7d215
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/examples/full-setup-tf-upgrade/versions.tf b/examples/full-setup-tf-upgrade/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.0"
+      version = ">= 4.0"
     }
     ldap = {
       source  = "trevex/ldap"
@@ -29,5 +29,5 @@ terraform {
       version = ">= 2.1.0"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 1.0.0"
 }
diff --git a/examples/full-setup-tf-upgrade/vpc.tf b/examples/full-setup-tf-upgrade/vpc.tf
@@ -20,6 +20,7 @@ module "vpc" {
   vpc_dns_servers = var.vpc_dns_servers
   vpc_ntp_servers = var.vpc_ntp_servers
   enable_aws_dns  = var.vpc_enable_awsdns
+  tgw_environment = try(var.tgw_environment, var.vpc_environment)
 
   tags = merge(
     local.tags,
@@ -71,6 +72,7 @@ module "routing" {
 }
 
 module "vpn" {
+  count  = var.vpc_enable_vpn ? 1 : 0
   source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpn?ref=tf-upgrade"
   vpc_id = local.vpc_id