add module_name

CHANGELOG.md

@@ -126,3 +126,7 @@
   - flowlogs-role
     - source aws-iam-role?ref=tf-upgrade
      -remove module call, incorporate necessary role code
+
+* 2.0.1 -- 2022-05-24
+  - update map() and list() to tf 1.x compatible things
+  - add tf_module_name tag

README.md

@@ -0,0 +1,26 @@
+# This submodule creates the following resources, using a typical deployment configuration that we follow:
+# * VPC
+# * Route tables (one per availability zone)
+# * Subnets, public and private (one of each label per availability zone)
+# * Network ACLs
+# * Base security groups
+# * VPN components (optional)
+# * Internet Gateway and NAT gateway (optional)
+#
+# This module also includes a submodule to setup VPC peering.
+
+#---
+# security groups
+#---
+module "security-groups"
+#  source          = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//security-groups"
+  source          = "${path.module}/../security-groups"
+  vpc_id          = aws_vpc.vpc.id
+  vpc_full_name   = var.vpc_full_name
+  vpc_environment = var.vpc_environment
+  tags            = {}
+}
+
+#---
+# VPNs on per site
+#---

common/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "aws-vpc-setup"
+}

common/version.tf

@@ -1,3 +1,19 @@
 locals {
-  _module_version = "2.0.0"
+  _module_version = "2.0.1"
+  _module_names = {
+    "_main_" = "aws-vpc-setup"
+
+    "flowlogs"               = "aws-vpc-setup//flowlogs"
+    "flowlogs-role"          = "aws-vpc-setup//flowlogs-role"
+    "nacl-rules"             = "aws-vpc-setup//nacl-rules"
+    "nacls"                  = "aws-vpc-setup//nacls"
+    "peer"                   = "aws-vpc-setup//peer"
+    "routing"                = "aws-vpc-setup//routing"
+    "security-groups"        = "aws-vpc-setup//security-groups"
+    "subnets"                = "aws-vpc-setup//subnets"
+    "vpc"                    = "aws-vpc-setup//vpc"
+    "vpc-interface-endpoint" = "aws-vpc-setup//vpc-interface-endpoint"
+    "vpn"                    = "aws-vpc-setup//vpn"
+    "vpn-transit-gateway"    = "aws-vpc-setup//vpn-transit-gateway"
+  }
 }

examples/quotas/quotas.tf

@@ -0,0 +1,27 @@
+# % aws --profile $(get-profile) --region $(get-region) service-quotas list-services
+# % aws --profile $(get-profile) --region $(get-region) service-quotas list-service-quotas --service-code s3
+# % aws --profile $(get-profile) --region $(get-region) service-quotas list-aws-default-service-quotas --service-code s3
+#
+#         {
+#             "ServiceCode": "s3",
+#             "ServiceName": "Amazon Simple Storage Service (Amazon S3)",
+#             "QuotaArn": "arn:aws-us-gov:servicequotas:us-gov-west-1::s3/L-DC2B2D3D",
+#             "QuotaCode": "L-DC2B2D3D",
+#             "QuotaName": "Buckets",
+#             "Value": 100.0,
+#             "Unit": "None",
+#             "Adjustable": true,
+#             "GlobalQuota": false
+#         },
+
+locals {
+  quotas    = yamldecode(file("quotas.yml"))
+  quota_map = { for v in local.quotas.quotas : format("%v:%v", v.service_code, v.quota_code) => v }
+}
+
+resource "aws_servicequotas_service_quota" "quotas" {
+  for_each     = local.quota_map
+  quota_code   = each.value.quota_code
+  service_code = each.value.service_code
+  value        = each.value.value
+}

examples/quotas/quotas.yml

@@ -0,0 +1,31 @@
+quotas:
+  - description: "EBS SSD gp2 size increase"
+    service_code: ebs
+    quota_code: "L-D18FCD1D"
+    default_value: 300
+    value: 1500
+
+
+# structure of each item
+#   description: string, like a comment describing what this is doing, maybe why.  It is currently only for documenting the request
+#   service_code: string, required, the specific service for which the quota will be submitted.  comes from
+#     aws --profile PROFILE --region REGION service-quotas list-services
+#   quota_code: string, required, the specific quota code for the service.  Comes from:
+#     aws --profile PROFILE --region REGION service-quotas list-service-quotas --service-code SERVICE_CODE
+#   default_value: string, optional, used for indicating the default value (maybe ned to change to previous?). Comes from:
+#     aws --profile PROFILE -region REGION service-quotas list-aws-default-service-quotas --service-code SERVICE_CODE
+#   value: number, required, used to indicate the new value requestd
+#
+# example from list from default_value
+#
+#         {
+#             "ServiceCode": "s3",
+#             "ServiceName": "Amazon Simple Storage Service (Amazon S3)",
+#             "QuotaArn": "arn:aws-us-gov:servicequotas:us-gov-west-1::s3/L-DC2B2D3D",
+#             "QuotaCode": "L-DC2B2D3D",
+#             "QuotaName": "Buckets",
+#             "Value": 100.0,
+#             "Unit": "None",
+#             "Adjustable": true,
+#             "GlobalQuota": false
+#         },

flowlogs-role/main.tf

@@ -21,6 +21,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }

flowlogs-role/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "flowlogs-role"
+}

flowlogs/README.md

@@ -41,15 +41,22 @@ module "flowlogs" {
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_ldap"></a> [ldap](#requirement\_ldap) | >= 0.5.4 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
+| <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
-| <a name="provider_null"></a> [null](#provider\_null) | n/a |
-| <a name="provider_template"></a> [template](#provider\_template) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
+| <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
+| <a name="provider_template"></a> [template](#provider\_template) | >= 2.0 |
 
 ## Modules
 

flowlogs/main.tf

@@ -46,6 +46,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 

flowlogs/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "flowlogs"
+}

nacl-rules/README.md

@@ -29,7 +29,9 @@ module "nacls_enterprise" {
 
 | Name | Version |
 |------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_ldap"></a> [ldap](#requirement\_ldap) | >= 0.5.4 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
 | <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |

nacl-rules/main.tf

@@ -33,6 +33,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }

nacl-rules/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "nacl-rules"
+}

nacls/main.tf

@@ -30,6 +30,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 

nacls/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "nacls"
+}

peer/README.md

@@ -80,7 +80,9 @@ module "peer_services" {
 
 | Name | Version |
 |------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_ldap"></a> [ldap](#requirement\_ldap) | >= 0.5.4 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
 | <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |

peer/main.tf

@@ -89,6 +89,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }

peer/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "peer"
+}

routing/main.tf

@@ -29,6 +29,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 

routing/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "routing"
+}

security-groups/main.tf

@@ -26,6 +26,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }

security-groups/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "security-groups"
+}

subnets/main.tf

@@ -56,6 +56,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 

subnets/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "subnets"
+}

vpc-interface-endpoint/README.md

@@ -54,7 +54,9 @@ These are not included in the module because they don't exist until the resource
 
 | Name | Version |
 |------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_ldap"></a> [ldap](#requirement\_ldap) | >= 0.5.4 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
 | <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |

vpc-interface-endpoint/main.tf

@@ -67,6 +67,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }

vpc-interface-endpoint/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpc-interface-endpoint"
+}

vpc/main.tf

@@ -34,6 +34,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 

vpc/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpc"
+}

vpn-transit-gateway/README.md

@@ -44,7 +44,9 @@ module "vpn_transit-gateway" {
 
 | Name | Version |
 |------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_ldap"></a> [ldap](#requirement\_ldap) | >= 0.5.4 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
 | <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |

vpn-transit-gateway/main.tf

@@ -62,6 +62,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 

vpn-transit-gateway/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpn-transit-gateway"
+}

vpn/main.tf

@@ -53,6 +53,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 

vpn/module_name.tf

@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpn"
+}