setup for tf-upgrade

terraform-modules · Jun 3, 2022 · 4be6a11 · 4be6a11
1 parent 77ae75d
commit 4be6a11
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 40 deletions.
diff --git a/examples/full-setup/flowlogs.tf b/examples/full-setup/flowlogs.tf
@@ -1,5 +1,5 @@
 module "flowlogs" {
-  source        = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//flowlogs"
+  source        = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//flowlogs?ref=tf-upgrade"
   vpc_id        = local.vpc_id
   vpc_full_name = var.vpc_full_name
   account_alias = var.account_alias

diff --git a/examples/full-setup/nacls.tf b/examples/full-setup/nacls.tf
@@ -1,5 +1,5 @@
 module "nacls" {
-  source              = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacls"
+  source              = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacls?ref=tf-upgrade"
   vpc_id              = module.vpc.vpc_id
   public_subnets_ids  = module.subnets.public_subnets_ids
   private_subnets_ids = module.subnets.private_subnets_ids
@@ -10,7 +10,7 @@ module "nacls" {
 }
 
 module "nacls_enterprise" {
-  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules"
+  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules?ref=tf-upgrade"
   network_acl_id = module.nacls.private_network_acl_id
 
   rule_description  = "Enterprise plus VPC"
@@ -31,7 +31,7 @@ module "nacls_enterprise" {
 # endpoints
 #---
 module "nacls_endpoints" {
-  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules"
+  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules?ref=tf-upgrade"
   network_acl_id = module.nacls.private_network_acl_id
 
   rule_description  = "VPC Gateway Endpoints"
@@ -51,7 +51,7 @@ module "nacls_endpoints" {
 # public
 #---
 module "nacls_public_vpc" {
-  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules"
+  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules?ref=tf-upgrade"
   network_acl_id = module.nacls.public_network_acl_id
 
   rule_description  = "Public subnet VPC Rules"
@@ -72,7 +72,7 @@ module "nacls_public_vpc" {
 ## }
 
 module "nacls_public_nat" {
-  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules"
+  source         = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//nacl-rules?ref=tf-upgrade"
   network_acl_id = module.nacls.public_network_acl_id
 
   rule_description  = "Public subnet NAT Rules"

diff --git a/examples/full-setup/peers.tf b/examples/full-setup/peers.tf
@@ -11,7 +11,7 @@ data "aws_vpc" "service_main_west" {
 }
 
 module "peer_services_main_west" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//peer"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//peer?ref=tf-upgrade"
   providers = {
     aws.self = aws
     aws.peer = aws.peer_main_west
@@ -49,7 +49,7 @@ data "aws_vpc" "service_main_east" {
 }
 
 module "peer_services_main_east" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//peer"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//peer?ref=tf-upgrade"
   providers = {
     aws.self = aws
     aws.peer = aws.peer_main_east

diff --git a/examples/full-setup/vpc-endpoints.tf b/examples/full-setup/vpc-endpoints.tf
@@ -16,6 +16,7 @@ locals {
   vpc_endpoints = [
     "autoscaling",
     "ec2",
+    "ec2messages",
     "ecr.api",
     "ecr.dkr",
     "ecs",
@@ -25,24 +26,27 @@ locals {
     "logs",
     "secretsmanager",
     "ssm",
+    "ssmmessages",
     "sts",
   ]
 }
 
-data "aws_subnet_ids" "endpoint_subnets" {
-  vpc_id = local.vpc_id
+data "aws_subnets" "endpoint_subnets" {
+  filter {
+    name   = "vpc-id"
+    values = [local.vpc_id]
+  }
   filter {
     name   = "tag:Name"
     values = ["*-endpoints-*"]
   }
 }
 
-
 module "vpce_autoscaling" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "autoscaling"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -56,10 +60,27 @@ module "vpce_autoscaling" {
 }
 
 module "vpce_ec2" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "ec2"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
+  security_group_ids = local.security_group_ids
+
+  vpc_id          = local.vpc_id
+  vpc_full_name   = var.vpc_full_name
+  vpc_environment = var.vpc_environment
+
+  tags = merge(
+    local.common_tags,
+    local.tags,
+  )
+}
+
+module "vpce_ec2messages" {
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
+
+  service            = "ec2messages"
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -73,10 +94,10 @@ module "vpce_ec2" {
 }
 
 module "vpce_ecr_api" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "ecr.api"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -90,10 +111,10 @@ module "vpce_ecr_api" {
 }
 
 module "vpce_ecr_dkr" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "ecr.dkr"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -107,10 +128,10 @@ module "vpce_ecr_dkr" {
 }
 
 module "vpce_ecs" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "ecs"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -124,10 +145,10 @@ module "vpce_ecs" {
 }
 
 module "vpce_elasticfilesystem" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "elasticfilesystem"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -141,10 +162,10 @@ module "vpce_elasticfilesystem" {
 }
 
 module "vpce_elasticloadbalancing" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "elasticloadbalancing"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -158,10 +179,10 @@ module "vpce_elasticloadbalancing" {
 }
 
 module "vpce_kms" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "kms"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -175,10 +196,10 @@ module "vpce_kms" {
 }
 
 module "vpce_logs" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "logs"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -192,10 +213,10 @@ module "vpce_logs" {
 }
 
 module "vpce_secretsmanager" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "secretsmanager"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -209,10 +230,27 @@ module "vpce_secretsmanager" {
 }
 
 module "vpce_ssm" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "ssm"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
+  security_group_ids = local.security_group_ids
+
+  vpc_id          = local.vpc_id
+  vpc_full_name   = var.vpc_full_name
+  vpc_environment = var.vpc_environment
+
+  tags = merge(
+    local.common_tags,
+    local.tags,
+  )
+}
+
+module "vpce_ssmmessages" {
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
+
+  service            = "ssmmessages"
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id
@@ -226,10 +264,10 @@ module "vpce_ssm" {
 }
 
 module "vpce_sts" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade"
 
   service            = "sts"
-  subnet_ids         = tolist(data.aws_subnet_ids.endpoint_subnets.ids)
+  subnet_ids         = tolist(data.aws_subnets.endpoint_subnets.ids)
   security_group_ids = local.security_group_ids
 
   vpc_id          = local.vpc_id

diff --git a/examples/full-setup/vpc.tf b/examples/full-setup/vpc.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 module "vpc" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc?ref=tf-upgrade"
 
   vpc_name        = var.vpc_name
   vpc_cidr_block  = var.vpc_cidr_block
@@ -36,7 +36,7 @@ module "vpc" {
 }
 
 module "subnets" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//subnets"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//subnets?ref=tf-upgrade"
 
   vpc_id             = local.vpc_id
   vpc_full_name      = var.vpc_full_name
@@ -47,7 +47,7 @@ module "subnets" {
 }
 
 module "routing" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//routing"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//routing?ref=tf-upgrade"
   vpc_id = local.vpc_id
 
   vpc_full_name       = var.vpc_full_name
@@ -67,7 +67,7 @@ module "routing" {
 }
 
 module "vpn" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpn"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpn?ref=tf-upgrade"
   vpc_id = local.vpc_id
 
   create          = var.vpc_enable_vpn
@@ -80,7 +80,7 @@ module "vpn" {
 }
 
 module "base-security-groups" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//security-groups"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//security-groups?ref=tf-upgrade"
   vpc_id = local.vpc_id
 
   vpc_full_name   = var.vpc_full_name