diff --git a/nacls/README.md b/nacls/README.md index abf8000..620629b 100644 --- a/nacls/README.md +++ b/nacls/README.md @@ -25,13 +25,20 @@ module "nacls" { ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | +| [aws](#requirement\_aws) | >= 3.66.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | +| [null](#requirement\_null) | >= 3.0 | +| [random](#requirement\_random) | >= 3.0 | +| [template](#requirement\_template) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | n/a | +| [aws](#provider\_aws) | >= 3.66.0 | ## Modules diff --git a/nacls/main.tf b/nacls/main.tf index d95d27a..b6c2e26 100644 --- a/nacls/main.tf +++ b/nacls/main.tf @@ -47,7 +47,7 @@ resource "aws_network_acl" "private" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "private")), + { "Name" = format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "private") }, ) } @@ -61,6 +61,6 @@ resource "aws_network_acl" "public" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "public")), + { "Name" = format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "public") }, ) } diff --git a/routing/README.md b/routing/README.md index 5b41902..1c60637 100644 --- a/routing/README.md +++ b/routing/README.md @@ -26,7 +26,9 @@ module "routing" { | Name | Version | |------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | | [aws](#requirement\_aws) | >= 3.66.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | | [null](#requirement\_null) | >= 3.0 | | [random](#requirement\_random) | >= 3.0 | | [template](#requirement\_template) | >= 2.0 | diff --git a/routing/main.tf b/routing/main.tf index 3d9eb1d..544d66c 100644 --- a/routing/main.tf +++ b/routing/main.tf @@ -50,7 +50,7 @@ resource "aws_route_table" "public" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.public_route_table_label, each.key)) + { "Name" = format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.public_route_table_label, each.key) }, ) } @@ -70,7 +70,7 @@ resource "aws_route_table" "private" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.private_route_table_label, each.key)) + { "Name" = format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.private_route_table_label, each.key) }, ) } @@ -93,7 +93,7 @@ resource "aws_eip" "nat" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["elastic-ip"], var.vpc_full_name, each.key)), + { "Name" = format("%v%v-%v", local._prefixes["elastic-ip"], var.vpc_full_name, each.key) }, ) } @@ -107,7 +107,7 @@ resource "aws_internet_gateway" "gateway" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v", local._prefixes["internet-gateway"], var.vpc_full_name)), + { "Name" = format("%v%v", local._prefixes["internet-gateway"], var.vpc_full_name) }, ) } @@ -126,7 +126,7 @@ resource "aws_nat_gateway" "nat" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["nat-gateway"], var.vpc_full_name, each.key)), + { "Name" = format("%v%v-%v", local._prefixes["nat-gateway"], var.vpc_full_name, each.key) }, ) } diff --git a/routing/vpc-endpoints.tf b/routing/vpc-endpoints.tf index c41066c..e271a66 100644 --- a/routing/vpc-endpoints.tf +++ b/routing/vpc-endpoints.tf @@ -26,7 +26,7 @@ resource "aws_vpc_endpoint" "s3" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["vpc-endpoint"], "s3", var.vpc_full_name)), + { "Name" = format("%v%v-%v", local._prefixes["vpc-endpoint"], "s3", var.vpc_full_name) }, ) } @@ -54,7 +54,7 @@ resource "aws_vpc_endpoint" "dynamodb" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["vpc-endpoint"], "dynamodb", var.vpc_full_name)), + { "Name" = format("%v%v-%v", local._prefixes["vpc-endpoint"], "dynamodb", var.vpc_full_name) }, ) } diff --git a/security-groups/README.md b/security-groups/README.md index 333f6a5..3191a91 100644 --- a/security-groups/README.md +++ b/security-groups/README.md @@ -20,21 +20,28 @@ module "base-security-groups" { ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | +| [aws](#requirement\_aws) | >= 3.66.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | +| [null](#requirement\_null) | >= 3.0 | +| [random](#requirement\_random) | >= 3.0 | +| [template](#requirement\_template) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | n/a | +| [aws](#provider\_aws) | >= 3.66.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [sg-linux-base](#module\_sg-linux-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-linux-base | | -| [sg-ois-scanner](#module\_sg-ois-scanner) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//ois-scanner | | -| [sg-windows-base](#module\_sg-windows-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-windows-base | | +| [sg-linux-base](#module\_sg-linux-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-linux-base | n/a | +| [sg-ois-scanner](#module\_sg-ois-scanner) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//ois-scanner | n/a | +| [sg-windows-base](#module\_sg-windows-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-windows-base | n/a | ## Resources diff --git a/security-groups/main.tf b/security-groups/main.tf index f56c143..9658044 100644 --- a/security-groups/main.tf +++ b/security-groups/main.tf @@ -39,8 +39,10 @@ resource "aws_default_security_group" "default" { tags = merge( local.base_tags, var.tags, - map("Environment", var.vpc_environment), - map("Name", format("default-sg-%v", var.vpc_full_name)) + { + "Environment" = var.vpc_environment + "Name" = format("default-sg-%v", var.vpc_full_name) + } ) } @@ -56,7 +58,7 @@ module "sg-linux-base" { tags = merge( local.base_tags, var.tags, - map("Environment", var.vpc_environment), + { "Environment" = var.vpc_environment }, ) } @@ -69,7 +71,7 @@ module "sg-windows-base" { tags = merge( local.base_tags, var.tags, - map("Environment", var.vpc_environment), + { "Environment" = var.vpc_environment }, ) } @@ -82,6 +84,6 @@ module "sg-ois-scanner" { tags = merge( local.base_tags, var.tags, - map("Environment", var.vpc_environment), + { "Environment" = var.vpc_environment }, ) } diff --git a/subnets/README.md b/subnets/README.md index 59ffcdc..679bd0a 100644 --- a/subnets/README.md +++ b/subnets/README.md @@ -50,13 +50,20 @@ be private. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | +| [aws](#requirement\_aws) | >= 3.66.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | +| [null](#requirement\_null) | >= 3.0 | +| [random](#requirement\_random) | >= 3.0 | +| [template](#requirement\_template) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | n/a | +| [aws](#provider\_aws) | >= 3.66.0 | ## Modules diff --git a/subnets/main.tf b/subnets/main.tf index 9209aaa..308713b 100644 --- a/subnets/main.tf +++ b/subnets/main.tf @@ -98,7 +98,7 @@ resource "aws_subnet" "public" { local.base_tags, var.tags, each.value.tags, - map("Name", format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label)) + { "Name" = format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label) }, ) } @@ -136,6 +136,6 @@ resource "aws_subnet" "private" { local.base_tags, var.tags, each.value.tags, - map("Name", format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label)) + { "Name" = format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label) }, ) } diff --git a/vpc/README.md b/vpc/README.md index b90e2ec..bd86305 100644 --- a/vpc/README.md +++ b/vpc/README.md @@ -29,13 +29,20 @@ module "vpc" { ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | +| [aws](#requirement\_aws) | >= 3.66.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | +| [null](#requirement\_null) | >= 3.0 | +| [random](#requirement\_random) | >= 3.0 | +| [template](#requirement\_template) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | n/a | +| [aws](#provider\_aws) | >= 3.66.0 | ## Modules diff --git a/vpc/main.tf b/vpc/main.tf index 61c8bd3..dc1db82 100644 --- a/vpc/main.tf +++ b/vpc/main.tf @@ -54,7 +54,7 @@ resource "aws_vpc_dhcp_options" "vpc" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v-dhcp-options", var.vpc_full_name)), + { "Name" = format("%v-dhcp-options", var.vpc_full_name) }, ) } @@ -74,7 +74,7 @@ resource "aws_vpc" "vpc" { tags = merge( local.base_tags, var.tags, - map("Name", var.vpc_full_name), + { "Name" = var.vpc_full_name }, ) } @@ -87,6 +87,6 @@ resource "aws_default_route_table" "vpc" { tags = merge( local.base_tags, var.tags, - map("Name", format("default-%v%v", local._prefixes["route-table"], var.vpc_full_name)) + { "Name" = format("default-%v%v", local._prefixes["route-table"], var.vpc_full_name) }, ) } diff --git a/vpn/README.md b/vpn/README.md index bc6857e..d377ec8 100644 --- a/vpn/README.md +++ b/vpn/README.md @@ -41,7 +41,9 @@ module "vpn" { | Name | Version | |------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | | [aws](#requirement\_aws) | >= 3.66.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | | [null](#requirement\_null) | >= 3.0 | | [random](#requirement\_random) | >= 3.0 | | [template](#requirement\_template) | >= 2.0 | diff --git a/vpn/main.tf b/vpn/main.tf index 0fca4bf..2d05977 100644 --- a/vpn/main.tf +++ b/vpn/main.tf @@ -56,7 +56,7 @@ locals { "boc:created_by" = "terraform" } - vpn_gateway = element(concat(aws_vpn_gateway.vpn[*].id, list("")), 0) + vpn_gateway = element(concat(aws_vpn_gateway.vpn[*].id, []), 0) } @@ -70,7 +70,7 @@ resource "aws_vpn_gateway" "vpn" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v", local._prefixes["vpn-gateway"], var.vpc_full_name)) + { "Name" = format("%v%v", local._prefixes["vpn-gateway"], var.vpc_full_name) }, ) } @@ -92,7 +92,7 @@ resource "aws_customer_gateway" "vpn" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["customer-gateway"], each.key, var.vpc_full_name)), + { "Name" = format("%v%v-%v", local._prefixes["customer-gateway"], each.key, var.vpc_full_name) }, ) } @@ -124,7 +124,7 @@ resource "aws_vpn_connection" "vpn" { tags = merge( local.base_tags, var.tags, - map("Name", format("%v%v-%v", local._prefixes["vpn-connection"], each.key, var.vpc_full_name)) + { "Name" = format("%v%v-%v", local._prefixes["vpn-connection"], each.key, var.vpc_full_name) }, ) }