diff --git a/examples/dns-vpc-region-vpcN/apps/README.md b/examples/ATTIC/dns-vpc-region-vpcN/apps/README.md similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/README.md rename to examples/ATTIC/dns-vpc-region-vpcN/apps/README.md diff --git a/examples/dns-vpc-region-vpcN/apps/dns/.terraform-docs.yml b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/.terraform-docs.yml similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/.terraform-docs.yml rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/.terraform-docs.yml diff --git a/examples/dns-vpc-region-vpcN/apps/dns/README.md b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/README.md similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/README.md rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/README.md diff --git a/examples/dns-vpc-region-vpcN/apps/dns/associate-shared.tf b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/associate-shared.tf similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/associate-shared.tf rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/associate-shared.tf diff --git a/examples/dns-vpc-region-vpcN/apps/dns/locals.tf b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/locals.tf similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/locals.tf rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/locals.tf diff --git a/examples/dns-vpc-region-vpcN/apps/dns/provider.main_dns.tf b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/provider.main_dns.tf similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/provider.main_dns.tf rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/provider.main_dns.tf diff --git a/examples/dns-vpc-region-vpcN/apps/dns/region.tf b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/region.tf similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/region.tf rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/region.tf diff --git a/examples/dns-vpc-region-vpcN/apps/dns/sort-ip.py b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/sort-ip.py similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/sort-ip.py rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/sort-ip.py diff --git a/examples/dns-vpc-region-vpcN/apps/dns/tf-run.data b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/tf-run.data similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/tf-run.data rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/tf-run.data diff --git a/examples/dns-vpc-region-vpcN/apps/dns/variables.dns.auto.tfvars b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/variables.dns.auto.tfvars similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/variables.dns.auto.tfvars rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/variables.dns.auto.tfvars diff --git a/examples/dns-vpc-region-vpcN/apps/dns/variables.dns.tf b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/variables.dns.tf similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/variables.dns.tf rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/variables.dns.tf diff --git a/examples/dns-vpc-region-vpcN/apps/dns/zones.tf b/examples/ATTIC/dns-vpc-region-vpcN/apps/dns/zones.tf similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/dns/zones.tf rename to examples/ATTIC/dns-vpc-region-vpcN/apps/dns/zones.tf diff --git a/examples/dns-vpc-region-vpcN/apps/region.tf b/examples/ATTIC/dns-vpc-region-vpcN/apps/region.tf similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/region.tf rename to examples/ATTIC/dns-vpc-region-vpcN/apps/region.tf diff --git a/examples/dns-vpc-region-vpcN/apps/tf-run.data b/examples/ATTIC/dns-vpc-region-vpcN/apps/tf-run.data similarity index 100% rename from examples/dns-vpc-region-vpcN/apps/tf-run.data rename to examples/ATTIC/dns-vpc-region-vpcN/apps/tf-run.data diff --git a/examples/dns-vpc-region/apps/README.md b/examples/ATTIC/dns-vpc-region/apps/README.md similarity index 100% rename from examples/dns-vpc-region/apps/README.md rename to examples/ATTIC/dns-vpc-region/apps/README.md diff --git a/examples/dns-vpc-region/apps/dns/README.md b/examples/ATTIC/dns-vpc-region/apps/dns/README.md similarity index 100% rename from examples/dns-vpc-region/apps/dns/README.md rename to examples/ATTIC/dns-vpc-region/apps/dns/README.md diff --git a/examples/dns-vpc-region/apps/dns/data.tf b/examples/ATTIC/dns-vpc-region/apps/dns/data.tf similarity index 100% rename from examples/dns-vpc-region/apps/dns/data.tf rename to examples/ATTIC/dns-vpc-region/apps/dns/data.tf diff --git a/examples/dns-vpc-region/apps/dns/locals.tf b/examples/ATTIC/dns-vpc-region/apps/dns/locals.tf similarity index 100% rename from examples/dns-vpc-region/apps/dns/locals.tf rename to examples/ATTIC/dns-vpc-region/apps/dns/locals.tf diff --git a/examples/dns-vpc-region/apps/dns/logging.tf b/examples/ATTIC/dns-vpc-region/apps/dns/logging.tf similarity index 100% rename from examples/dns-vpc-region/apps/dns/logging.tf rename to examples/ATTIC/dns-vpc-region/apps/dns/logging.tf diff --git a/examples/dns-vpc-region/apps/dns/region.tf b/examples/ATTIC/dns-vpc-region/apps/dns/region.tf similarity index 100% rename from examples/dns-vpc-region/apps/dns/region.tf rename to examples/ATTIC/dns-vpc-region/apps/dns/region.tf diff --git a/examples/dns-vpc-region/apps/dns/tf-run.data b/examples/ATTIC/dns-vpc-region/apps/dns/tf-run.data similarity index 100% rename from examples/dns-vpc-region/apps/dns/tf-run.data rename to examples/ATTIC/dns-vpc-region/apps/dns/tf-run.data diff --git a/examples/dns-vpc-region/apps/region.tf b/examples/ATTIC/dns-vpc-region/apps/region.tf similarity index 100% rename from examples/dns-vpc-region/apps/region.tf rename to examples/ATTIC/dns-vpc-region/apps/region.tf diff --git a/examples/dns-vpc-region/apps/tf-run.data b/examples/ATTIC/dns-vpc-region/apps/tf-run.data similarity index 100% rename from examples/dns-vpc-region/apps/tf-run.data rename to examples/ATTIC/dns-vpc-region/apps/tf-run.data diff --git a/examples/shared-vpc/.gitignore b/examples/shared-vpc/.gitignore deleted file mode 100644 index efb4e2a..0000000 --- a/examples/shared-vpc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vpn-configs diff --git a/examples/shared-vpc/.tf-control b/examples/shared-vpc/.tf-control deleted file mode 100644 index b304010..0000000 --- a/examples/shared-vpc/.tf-control +++ /dev/null @@ -1,4 +0,0 @@ -#TFCOMMAND="terraform_0.13.7" -#TFCOMMAND="terraform_0.14.11" -TFCOMMAND="terraform_latest" -## TF_CLI_CONFIG_FILE=$HOME/.tf-control.tfrc diff --git a/examples/shared-vpc/.tf-control.tfrc b/examples/shared-vpc/.tf-control.tfrc deleted file mode 100644 index d4b0b15..0000000 --- a/examples/shared-vpc/.tf-control.tfrc +++ /dev/null @@ -1,23 +0,0 @@ -# https://www.terraform.io/docs/cli/config/config-file.html - -plugin_cache_dir = "/data/terraform/terraform.d/plugin-cache" -#disable_checkpoint = true - -provider_installation { -# filesystem_mirror { -# path = "/apps/terraform/terraform.d/providers" -# include = [ "*/*/*" ] -# } - filesystem_mirror { - path = "/data/terraform/terraform.d/providers" - include = [ "*/*/*" ] - } -# filesystem_mirror { -# path = "/apps/terraform/terraform.d/providers" -# include = [ "external.terraform.census.gov/*/*" ] -# } - direct { - include = [ "*/*/*" ] - } -} - diff --git a/examples/shared-vpc/OFF/sg-rds-mariadb.tf b/examples/shared-vpc/OFF/sg-rds-mariadb.tf deleted file mode 100644 index 533da01..0000000 --- a/examples/shared-vpc/OFF/sg-rds-mariadb.tf +++ /dev/null @@ -1,9 +0,0 @@ -module "maria" { - source = "git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//rds-maria?ref=tf-upgrade" - vpc_id = module.vpc.vpc_id -} - -output "sg_maria_id" { - description = "Common MariaDB security group" - value = module.maria.this_security_group_id -} diff --git a/examples/shared-vpc/OFF/sg-rds-mssql.tf b/examples/shared-vpc/OFF/sg-rds-mssql.tf deleted file mode 100644 index 0997439..0000000 --- a/examples/shared-vpc/OFF/sg-rds-mssql.tf +++ /dev/null @@ -1,11 +0,0 @@ -module "rds-mssql" { - source = "git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//rds-mssql?ref=tf-upgrade" - vpc_id = module.vpc.vpc_id - #vpc_full_name = var.vpc_full_name -} - -output "sg_rds-mssql_id" { - description = "RDS MSSQL security group id" - value = module.rds-mssql.this_security_group_id -} - diff --git a/examples/shared-vpc/OFF/sg-rds-mysql.tf b/examples/shared-vpc/OFF/sg-rds-mysql.tf deleted file mode 100644 index 32fd4fe..0000000 --- a/examples/shared-vpc/OFF/sg-rds-mysql.tf +++ /dev/null @@ -1,9 +0,0 @@ -module "sg_mysql" { - source = "git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//rds-mysql?ref=tf-upgrade" - vpc_id = module.vpc.vpc_id -} - -output "sg_mysql_id" { - description = "Common MySQL security group" - value = module.sg_mysql.this_security_group_id -} diff --git a/examples/shared-vpc/OFF/sg-rds-postgres.tf b/examples/shared-vpc/OFF/sg-rds-postgres.tf deleted file mode 100644 index c628822..0000000 --- a/examples/shared-vpc/OFF/sg-rds-postgres.tf +++ /dev/null @@ -1,9 +0,0 @@ -module "sg_postgres" { - source = "git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//rds-postgres?ref=tf-upgrade" - vpc_id = module.vpc.vpc_id -} - -output "sg_postgres_id" { - description = "Common Postgres security group" - value = module.sg_postgres.this_security_group_id -} diff --git a/examples/shared-vpc/README.md b/examples/shared-vpc/README.md deleted file mode 100644 index 14ecadb..0000000 --- a/examples/shared-vpc/README.md +++ /dev/null @@ -1,78 +0,0 @@ - -# About - -This directory constructs the appropriate resources for the vpc2-dice-dev VPC, including: - -* VPC -* Subnets -* Route Tables -* Network ACLs -* VPN (CGW, VPG, VPN Connectiosn) -* Flow Logs -* Securtity Groups (base, others) - - - -# Application Information - -* Application: DICE -* Environment: development -* Organization: ADSD, CTO -* Project: DICE -* Point of Contact(s): -* Creation Date: 2021-05-10 -* References: - * Requirements: https://github.e.it.census.gov/terraform/cloud-information/blob/master/aws/projects/dice/ - * Remedy Ticket: {number} - * Other: {other} -* Related Configurations: - * {directory-path} - -# Application Requirements - -# Terraform Directions - -## Update files to reflect proper configuration - -1. get this module in a temporary location - * cd /tmp - * git clone git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git - * cd aws-vpc-setup - * git checkout tf-upgrade - * cd examples/full-setup-tf-upgrade -1. rsync this code to your ACCOUNTREPO/vpc/region/vpcN directory -1. Go to your repo ACCOUNTREPO/vpc/region/vpcN -1. remove the /tmp/aws-vpc-setup directory -1. start branch like 'configure-vpcN' (use N as the number) -1. flowlogs.tf - * set correct region (east, west) in `flowlog_bucket_arn` -1. variables.vpc.auto.tfvars - * put proper values for - * vpc_name - * vpc_cidr_block - * vpc_index (this is the number from vpc{number}-{name} - * vpc_short_name (vpc{number}) - * vpc_full_name (vpc_short_name "-" vpc_name) - * vpc_environment - * vpc_domain_name (usually {vpc_environment}.PROGRAM.census.gov) - * proper `ip_address` for the VPN settings (replace NNN with the value from TCO) -1. variables.subnets.auto.tfvars - * comment out public subnet objects (leaving public_subets = [], in essence; we are no longer using this) - * fill in the correct values for the base cidrs, starting with the blocks as shown. These will be validated in a PR -1. commit, push, and do a PR. This must be merged before any apply. Keep your branch, as you'll have more to add to it. - -Once you have a merged PR you can run through the setup - -```script -tf-run apply -``` - -Follow the diections from `tf-run`. You'll add all the files to git, do another commit, push and PR, before things are complete. - - - - -# Details - - - diff --git a/examples/shared-vpc/apps/.terraform-docs.yml b/examples/shared-vpc/apps/.terraform-docs.yml deleted file mode 100644 index 8391b9d..0000000 --- a/examples/shared-vpc/apps/.terraform-docs.yml +++ /dev/null @@ -1,44 +0,0 @@ -formatter: markdown table - -header-from: main.tf -footer-from: "" - -sections: -## hide: [] - show: - - data-sources - - header - - footer - - inputs - - modules - - outputs - - providers - - requirements - - resources - -output: - file: README.md - mode: inject - template: |- - - {{ .Content }} - - -## output-values: -## enabled: false -## from: "" -## -## sort: -## enabled: true -## by: name -## -## settings: -## anchor: true -## color: true -## default: true -## description: false -## escape: true -## indent: 2 -## required: true -## sensitive: true -## type: true diff --git a/examples/shared-vpc/apps/.tf-control b/examples/shared-vpc/apps/.tf-control deleted file mode 100644 index b304010..0000000 --- a/examples/shared-vpc/apps/.tf-control +++ /dev/null @@ -1,4 +0,0 @@ -#TFCOMMAND="terraform_0.13.7" -#TFCOMMAND="terraform_0.14.11" -TFCOMMAND="terraform_latest" -## TF_CLI_CONFIG_FILE=$HOME/.tf-control.tfrc diff --git a/examples/shared-vpc/apps/.tf-control.tfrc b/examples/shared-vpc/apps/.tf-control.tfrc deleted file mode 100644 index d4b0b15..0000000 --- a/examples/shared-vpc/apps/.tf-control.tfrc +++ /dev/null @@ -1,23 +0,0 @@ -# https://www.terraform.io/docs/cli/config/config-file.html - -plugin_cache_dir = "/data/terraform/terraform.d/plugin-cache" -#disable_checkpoint = true - -provider_installation { -# filesystem_mirror { -# path = "/apps/terraform/terraform.d/providers" -# include = [ "*/*/*" ] -# } - filesystem_mirror { - path = "/data/terraform/terraform.d/providers" - include = [ "*/*/*" ] - } -# filesystem_mirror { -# path = "/apps/terraform/terraform.d/providers" -# include = [ "external.terraform.census.gov/*/*" ] -# } - direct { - include = [ "*/*/*" ] - } -} - diff --git a/examples/shared-vpc/apps/dns/.terraform-docs.yml b/examples/shared-vpc/apps/dns/.terraform-docs.yml deleted file mode 100644 index 8391b9d..0000000 --- a/examples/shared-vpc/apps/dns/.terraform-docs.yml +++ /dev/null @@ -1,44 +0,0 @@ -formatter: markdown table - -header-from: main.tf -footer-from: "" - -sections: -## hide: [] - show: - - data-sources - - header - - footer - - inputs - - modules - - outputs - - providers - - requirements - - resources - -output: - file: README.md - mode: inject - template: |- - - {{ .Content }} - - -## output-values: -## enabled: false -## from: "" -## -## sort: -## enabled: true -## by: name -## -## settings: -## anchor: true -## color: true -## default: true -## description: false -## escape: true -## indent: 2 -## required: true -## sensitive: true -## type: true diff --git a/examples/shared-vpc/apps/region.tf b/examples/shared-vpc/apps/region.tf deleted file mode 100644 index f617506..0000000 --- a/examples/shared-vpc/apps/region.tf +++ /dev/null @@ -1,3 +0,0 @@ -locals { - region = var.region -} diff --git a/examples/shared-vpc/apps/tf-run.data b/examples/shared-vpc/apps/tf-run.data deleted file mode 100644 index f8cad8e..0000000 --- a/examples/shared-vpc/apps/tf-run.data +++ /dev/null @@ -1,7 +0,0 @@ -VERSION 1.0.0 -REMOTE-STATE -COMMAND tf-directory-setup.py -l none -f -COMMAND setup-new-directory.sh -COMMAND tf-init -upgrade -ALL -COMMAND tf-directory-setup.py -l s3 diff --git a/examples/shared-vpc/apps/versions.tf b/examples/shared-vpc/apps/versions.tf deleted file mode 100644 index ec1ce3c..0000000 --- a/examples/shared-vpc/apps/versions.tf +++ /dev/null @@ -1,12 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = ">= 3.0" - } - infoblox = { - source = "infobloxopen/infoblox" - version = ">= 2.1.0" - } - } -} diff --git a/examples/shared-vpc/data.tf b/examples/shared-vpc/data.tf deleted file mode 100644 index cb626c2..0000000 --- a/examples/shared-vpc/data.tf +++ /dev/null @@ -1,9 +0,0 @@ -data "aws_availability_zones" "zones" { - state = "available" -} - -data "aws_availability_zone" "zone" { - for_each = toset(data.aws_availability_zones.zones.names) - state = "available" - name = each.key -} diff --git a/examples/shared-vpc/data.vpc.tf b/examples/shared-vpc/data.vpc.tf deleted file mode 100644 index 84b4be5..0000000 --- a/examples/shared-vpc/data.vpc.tf +++ /dev/null @@ -1,30 +0,0 @@ -data "aws_vpcs" "vpcs" { - filter { - name = "tag:Name" - values = [var.vpc_full_name] - } -} - -data "aws_vpc" "vpc" { - id = coalesce(data.aws_vpcs.vpcs.ids[0], null) -} - -data "aws_subnets" "subnets" { - filter { - name = "vpc-id" - values = [data.aws_vpc.vpc.id] - } -} - -data "aws_subnet" "subnet" { - for_each = toset(data.aws_subnets.subnets.ids) - id = each.key -} - -data "aws_vpc_dhcp_options" "dhcp_options" { - dhcp_options_id = data.aws_vpc.vpc.dhcp_options_id -} - -locals { - vpc_id = data.aws_vpc.vpc.id -} diff --git a/examples/shared-vpc/outputs.tf b/examples/shared-vpc/outputs.tf deleted file mode 100644 index 01d91e1..0000000 --- a/examples/shared-vpc/outputs.tf +++ /dev/null @@ -1,53 +0,0 @@ -output "vpc_id" { - description = "VPC ID" - value = data.aws_vpc.vpc.id -} - -output "vpc_arn" { - description = "VPC ARN" - value = data.aws_vpc.vpc.arn -} - -output "vpc_info" { - description = "VPC info" - value = { - vpc_id = data.aws_vpc.vpc.id - vpc_cidr_block = data.aws_vpc.vpc.cidr_block - vpc_arn = data.aws_vpc.vpc.arn - vpc_name = var.vpc_name - vpc_short_name = var.vpc_short_name - # vpc_short_name = split("-", var.vpc_full_name)[0] - vpc_full_name = var.vpc_full_name - "vpc_environment" = var.vpc_environment - # vpc_environment = data.aws_vpc.vpc.tags["Environment"] - owner_id = data.aws_vpc.vpc.owner_id - # vpc_domain_name = var.vpc_domain_name - vpc_domain_name = data.aws_vpc_dhcp_options.dhcp_options.domain_name - # _raw = data.aws_vpc.vpc - "vpc_dns_servers" = [] - "s3_endpoint_id" = null - "dynamodb_endpoint_id" = null - "s3_endpoint_cidr_blocks" = null - "dynamodb_endpoint_cidr_blocks" = null - } -} - -## locals { -## shared_private_subnet_info = [for k, v in data.aws_subnet.subnet : { -## id = v.id -## arn = v.arn -## availability_zone = v.availability_zone -## owner_id = v.owner_id -## cidr_block = v.cidr_block -## subnet = v.cidr_block -## label = replace(v.tags["Name"], format("%v-", var.vpc_full_name), "") -## tags = v.tags -## # _raw = v -## }] -## } -## -## -## output "shared_private_subnet_info" { -## description = "Details from shared VPC subnets" -## value = local.shared_private_subnet_info -## } diff --git a/examples/shared-vpc/region.tf b/examples/shared-vpc/region.tf deleted file mode 100644 index b7b1696..0000000 --- a/examples/shared-vpc/region.tf +++ /dev/null @@ -1,4 +0,0 @@ -locals { - region = var.region -} - diff --git a/examples/shared-vpc/sg-web.tf b/examples/shared-vpc/sg-web.tf deleted file mode 100644 index 497efd7..0000000 --- a/examples/shared-vpc/sg-web.tf +++ /dev/null @@ -1,16 +0,0 @@ -module "sg_web" { - source = "git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//web?ref=tf-upgrade" - vpc_id = local.vpc_id - - tags = merge( - local.tags, - local.common_tags, - var.account_tags, - var.application_tags, - ) -} - -output "sg_web_id" { - description = "Common Web security group" - value = module.sg_web.this_security_group_id -} diff --git a/examples/shared-vpc/tf-run.data b/examples/shared-vpc/tf-run.data deleted file mode 100644 index 35fcfda..0000000 --- a/examples/shared-vpc/tf-run.data +++ /dev/null @@ -1,38 +0,0 @@ -VERSION 1.3.0 -REMOTE-STATE -COMMAND tf-directory-setup.py -l none -f -COMMAND setup-new-directory.sh -COMMAND tf-init -upgrade - -LINKTOP includes.d/variables.account_tags.tf -LINKTOP includes.d/variables.account_tags.auto.tfvars -LINKTOP includes.d/variables.infrastructure_tags.tf -LINKTOP includes.d/variables.infrastructure_tags.auto.tfvars -LINKTOP includes.d/variables.application_tags.tf -## LINKTOP includes.d/variables.application_tags.auto.tfvars - -## LINKTOP provider_configs.d/provider.infoblox.auto.tfvars -## LINKTOP provider_configs.d/provider.infoblox.tf -## LINKTOP provider_configs.d/provider.infoblox.variables.tf -LINKTOP common/remote_state.common.tf -LINKTOP infrastructure/%%SHORT_REGION%%/remote_state.infrastructure_%%SHORT_REGION%%.tf - -## module.vpc module.subnets -COMMAND tf-directory-setup.py -l s3 - -## TAG stop-plan -## COMMENT Until you reach this point with a tf-run apply, a plan action will fail as there are resources which need to be created -## PAUSE - -## module.routing -## module.vpn -## module.flowlogs -module.base-security-groups -module.sg_web -## module.nacls module.nacls_enterprise module.nacls_endpoints module.nacls_public_vpc module.nacls_public_nat -## module.peer_services_main_west module.peer_services_main_east -## ALL -ALL - -## COMMENT continue setup for apps: cd apps; tf-run apply -## COMMENT continue setup for apps/dns: cd apps/dns; tf-run apply diff --git a/examples/shared-vpc/variables.availability_zones.tf b/examples/shared-vpc/variables.availability_zones.tf deleted file mode 100644 index 3e906b9..0000000 --- a/examples/shared-vpc/variables.availability_zones.tf +++ /dev/null @@ -1,5 +0,0 @@ -variable "availability_zones" { - description = "AWS Availability zones for subnet (default: all)" - type = list(string) - default = [] -} diff --git a/examples/shared-vpc/variables.subnets.auto.tfvars b/examples/shared-vpc/variables.subnets.auto.tfvars deleted file mode 100644 index 0255455..0000000 --- a/examples/shared-vpc/variables.subnets.auto.tfvars +++ /dev/null @@ -1,19 +0,0 @@ -public_subnets = [ - ## { base_cidr = "10.188.64.0/24", label = "public", bits = 2, private = false, enabled=false, tags = {} }, -] -private_subnets = [ - { base_cidr = "10.188.65.0/24", label = "endpoints", bits = 2, private = true, enabled = true, tags = {} }, - { base_cidr = "10.188.65.192/26", label = "attachment", bits = 2, private = true, enabled = true, tags = { "boc:vpc:route-table" = "attachment" } }, - { base_cidr = "10.188.66.0/23", label = "private-lb", bits = 2, private = true, enabled = true, - tags = { "kubernetes.io/role/internal-elb" = 1 } - }, - { base_cidr = "10.188.68.0/23", label = "db", bits = 2, private = true, enabled = true, tags = {} }, - # { base_cidr = "10.188.70.0/23", label = "(free)", bits = 2, private = true, enabled=false, tags = {} }, - { base_cidr = "10.188.72.0/22", label = "apps", bits = 2, private = true, enabled = true, tags = {} }, - # { base_cidr = "10.188.76.0/22", label = "(free)", bits = 2, private = true, enabled=false, tags = {} }, - { base_cidr = "10.188.80.0/21", label = "container", bits = 2, private = true, enabled = true, - tags = { - # "kubernetes.io/cluster/dice-ite" = "shared" - }, - } -] diff --git a/examples/shared-vpc/variables.subnets.tf b/examples/shared-vpc/variables.subnets.tf deleted file mode 100644 index 75f328b..0000000 --- a/examples/shared-vpc/variables.subnets.tf +++ /dev/null @@ -1,37 +0,0 @@ -# from aws-vpc-setup/subnets/variables.common.subnets.tf -variable "public_subnets" { - description = "List of objects with public subnet information to be created" - type = list(object({ - base_cidr = string - label = string - bits = number - offset = optional(number, 0) - private = bool - tags = map(string) - enabled = optional(bool, true) - availability_zone = optional(string) - # subnets = list(string) - # labels = list(string) - # availability_zones = list(string) - })) - default = [] -} - -# availability_zone does nothign at this point -variable "private_subnets" { - description = "List of objects with private subnet information to be created" - type = list(object({ - base_cidr = string - label = string - bits = number - offset = optional(number, 0) - private = bool - tags = map(string) - enabled = optional(bool, true) - availability_zone = optional(string) - # subnets = list(string) - # labels = list(string) - # availability_zones = list(string) - })) - default = [] -} diff --git a/examples/shared-vpc/variables.vpc.auto.tfvars b/examples/shared-vpc/variables.vpc.auto.tfvars deleted file mode 100644 index bdb5648..0000000 --- a/examples/shared-vpc/variables.vpc.auto.tfvars +++ /dev/null @@ -1,11 +0,0 @@ -shared_vpc_label = "general" -vpc_name = "gen-dev" -vpc_cidr_block = "10.182.32.0/19" -vpc_index = 2 -vpc_short_name = "vpc2" -vpc_full_name = "vpc2-gen-dev" -vpc_environment = "dev" -vpc_domain_name = "dev.csp1.census.gov" -vpc_dns_servers = [] -vpc_ntp_servers = [] -tgw_environment = "dev" diff --git a/examples/shared-vpc/variables.vpc.tf b/examples/shared-vpc/variables.vpc.tf deleted file mode 100644 index da3cd9c..0000000 --- a/examples/shared-vpc/variables.vpc.tf +++ /dev/null @@ -1,50 +0,0 @@ -variable "vpc_name" { - description = "VPC Name including environment (if necessary), excluding vpc{N}. From shared VPC definition." - type = string -} - -variable "vpc_index" { - description = "VPC index number. This was used for NACL rule number caculations, and it is no longer needed. It is ignored in this configuration." - type = number - default = null -} - -variable "vpc_cidr_block" { - description = "VPC CIDR Block. From shared VPC definition." - type = string -} - -variable "vpc_short_name" { - description = "VPC short name component, vpc{index}. From shared VPC definition." - type = string -} - -variable "vpc_environment" { - description = "VPC environment purpose (common, shared, dev, stage, ite, prod). From shared VPC defintion." - type = string - default = "" -} - -variable "shared_vpc_label" { - description = "Label to use for shared VPC for flowlogs and other things. From shared VPC definition." - type = string - default = null -} - - -variable "tgw_environment" { - description = "Transit Gateway environment route table (services, dev, test, stage, prod, cre). Not used for any network setup. From shared VPC definition." - type = string - default = null - - validation { - condition = var.tgw_environment == null || contains(["services", "dev", "test", "stage", "prod", "cre"], var.tgw_environment) - error_message = "The tgw_environment must contain one of the legal values: services, dev, test, stage, prod, cre." - } -} - -# in variables.d/variable.scommon.tf -# - vpc_full_name -# - vpc_domain_name -# - vpc_dns_servers -# - vpc_ntp_servers diff --git a/examples/shared-vpc/versions.tf b/examples/shared-vpc/versions.tf deleted file mode 100644 index bf73497..0000000 --- a/examples/shared-vpc/versions.tf +++ /dev/null @@ -1,33 +0,0 @@ -terraform { - required_version = ">= 1.0.0" - required_providers { - aws = { - source = "hashicorp/aws" - version = ">= 4.0" - } - ## ldap = { - ## source = "trevex/ldap" - ## version = ">= 0.5.4" - ## } - ## external = { - ## source = "hashicorp/external" - ## version = ">= 1.0" - ## } - ## null = { - ## source = "hashicorp/null" - ## version = ">= 1.0" - ## } - ## random = { - ## source = "hashicorp/random" - ## version = ">= 1.0" - ## } - ## template = { - ## source = "hashicorp/template" - ## version = ">= 1.0" - ## } - ## infoblox = { - ## source = "infobloxopen/infoblox" - ## version = ">= 2.1.0" - ## } - } -} diff --git a/examples/shared-vpc/vpc-endpoints.tf b/examples/shared-vpc/vpc-endpoints.tf deleted file mode 100644 index a473c6e..0000000 --- a/examples/shared-vpc/vpc-endpoints.tf +++ /dev/null @@ -1,65 +0,0 @@ -# dynamodb and s3 gateway endpoints defined in vpc module - -# select here where label starts with app- -# private_subnets_ids = data.terraform_remote_state.vpc_east_vpc3.outputs.private_subnets_ids -# or use data - -# some help from here: https://dev.to/danquack/private-fargate-deployment-with-vpc-endpoints-1h0p - -locals { - security_group_ids = [module.sg_web.this_security_group_id] - - # currently this list doesn't do anything, but it's mostly to track what is in place here. A future - # revision of the vpc endpoints module will allow this as a for_each (tf 0.13+) - # keep in alphabetical order in the list and the file - - # disable by setting to null - # enable by setting to "", or if it require a different service name, set that - vpc_endpoints = { - ## "autoscaling" = "" - ## "ec2" = "" - ## "ec2messages" = "" - ## "ecr.api" = "" - ## "ecr.dkr" = "" - ## "ecs" = "" - ## "elasticfilesystem" = "" - ## "elasticloadbalancing" = "" - ## "kms" = "" - ## "logs" = "" - ## "secretsmanager" = "" - ## "ssm" = "" - ## "ssmmessages" = "" - ## "sts" = "" - } -} - -data "aws_subnets" "endpoint_subnets" { - filter { - name = "vpc-id" - values = [local.vpc_id] - } - filter { - name = "tag:Name" - values = ["*-endpoints-*"] - } -} - -module "vpce" { - for_each = { for k, v in local.vpc_endpoints : k => v if v != null } - source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpc-interface-endpoint?ref=tf-upgrade" - - service = each.value == "" ? each.key : each.value - 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.tags, - local.common_tags, - var.account_tags, - var.application_tags, - ) -} diff --git a/examples/shared-vpc/vpc.tf b/examples/shared-vpc/vpc.tf deleted file mode 100644 index 0246116..0000000 --- a/examples/shared-vpc/vpc.tf +++ /dev/null @@ -1,27 +0,0 @@ -locals { - tags = { - CostAllocation = "csvd:infrastructure" - Environment = var.vpc_environment - } -} - -module "base-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 - vpc_environment = var.vpc_environment - enable_manage_default_sg = false - - tags = merge( - local.tags, - local.common_tags, - var.account_tags, - var.application_tags, - ) -} - -## locals { -## vpc_info = local.shared_vpc_info -## subnet_info = local.shared_private_subnet_info -## }