Skip to content

Commit

Permalink
change map() to {}, list() to [] or tolist()
Browse files Browse the repository at this point in the history
  • Loading branch information
@badra001
badra001 committed May 24, 2022
1 parent 0236038 commit d27f0a2
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 34 deletions.
11 changes: 9 additions & 2 deletions nacls/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,20 @@ module "nacls" {

## 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_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |

## Modules

Expand Down
4 changes: 2 additions & 2 deletions nacls/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") },
)
}

Expand All @@ -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") },
)
}
2 changes: 2 additions & 0 deletions routing/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ module "routing" {

| 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 |
Expand Down
10 changes: 5 additions & 5 deletions routing/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
)
}

Expand All @@ -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) },
)
}

Expand All @@ -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) },
)
}

Expand All @@ -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) },
)
}

Expand All @@ -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) },
)
}

Expand Down
4 changes: 2 additions & 2 deletions routing/vpc-endpoints.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
)
}

Expand Down Expand Up @@ -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) },
)
}

Expand Down
17 changes: 12 additions & 5 deletions security-groups/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,28 @@ module "base-security-groups" {

## 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_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_sg-linux-base"></a> [sg-linux-base](#module\_sg-linux-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-linux-base | |
| <a name="module_sg-ois-scanner"></a> [sg-ois-scanner](#module\_sg-ois-scanner) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//ois-scanner | |
| <a name="module_sg-windows-base"></a> [sg-windows-base](#module\_sg-windows-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-windows-base | |
| <a name="module_sg-linux-base"></a> [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 |
| <a name="module_sg-ois-scanner"></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 |
| <a name="module_sg-windows-base"></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

Expand Down
12 changes: 7 additions & 5 deletions security-groups/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
)
}

Expand All @@ -56,7 +58,7 @@ module "sg-linux-base" {
tags = merge(
local.base_tags,
var.tags,
map("Environment", var.vpc_environment),
{ "Environment" = var.vpc_environment },
)
}

Expand All @@ -69,7 +71,7 @@ module "sg-windows-base" {
tags = merge(
local.base_tags,
var.tags,
map("Environment", var.vpc_environment),
{ "Environment" = var.vpc_environment },
)
}

Expand All @@ -82,6 +84,6 @@ module "sg-ois-scanner" {
tags = merge(
local.base_tags,
var.tags,
map("Environment", var.vpc_environment),
{ "Environment" = var.vpc_environment },
)
}
11 changes: 9 additions & 2 deletions subnets/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,20 @@ be private.
## 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_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
## Modules
Expand Down
4 changes: 2 additions & 2 deletions subnets/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
)
}

Expand Down Expand Up @@ -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) },
)
}
11 changes: 9 additions & 2 deletions vpc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,20 @@ module "vpc" {

## 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_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |

## Modules

Expand Down
6 changes: 3 additions & 3 deletions vpc/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
)
}

Expand All @@ -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 },
)
}

Expand All @@ -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) },
)
}
2 changes: 2 additions & 0 deletions vpn/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ module "vpn" {

| 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 |
Expand Down
8 changes: 4 additions & 4 deletions vpn/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


Expand All @@ -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) },
)
}

Expand All @@ -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) },
)
}

Expand Down Expand Up @@ -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) },
)
}

Expand Down

0 comments on commit d27f0a2

Please sign in to comment.