From fec9eac5954c2e291818c9623498a8396fcba708 Mon Sep 17 00:00:00 2001 From: Samuel CHNIBER Date: Tue, 31 Aug 2021 12:46:19 +0200 Subject: [PATCH 1/6] feature-#224-Implement ingress_with_prefix_list_ids and egress_with_prefix_list_ids --- README.md | 10 ++++ main.tf | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++ variables.tf | 36 +++++++++++++ 3 files changed, 194 insertions(+) diff --git a/README.md b/README.md index 61585c32..0e19b2ee 100644 --- a/README.md +++ b/README.md @@ -181,21 +181,25 @@ No modules. | [aws_security_group_rule.computed_egress_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_egress_with_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_egress_with_ipv6_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | +| [aws_security_group_rule.computed_egress_with_prefix_list_ids](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_egress_with_self](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_egress_with_source_security_group_id](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_ingress_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_ingress_with_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_ingress_with_ipv6_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | +| [aws_security_group_rule.computed_ingress_with_prefix_list_ids](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_ingress_with_self](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.computed_ingress_with_source_security_group_id](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.egress_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.egress_with_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.egress_with_ipv6_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | +| [aws_security_group_rule.egress_with_prefix_list_ids](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.egress_with_self](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.egress_with_source_security_group_id](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.ingress_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.ingress_with_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.ingress_with_ipv6_cidr_blocks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | +| [aws_security_group_rule.ingress_with_prefix_list_ids](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.ingress_with_self](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | | [aws_security_group_rule.ingress_with_source_security_group_id](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource | @@ -207,11 +211,13 @@ No modules. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used only | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -225,6 +231,7 @@ No modules. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used only | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -233,17 +240,20 @@ No modules. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used only | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group - not required if create\_sg is false | `string` | `null` | no | | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used only | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [putin\_khuylo](#input\_putin\_khuylo) | Do you agree that Putin doesn't respect Ukrainian sovereignty and territorial integrity? More info: https://en.wikipedia.org/wiki/Putin_khuylo! | `bool` | `true` | no | diff --git a/main.tf b/main.tf index 85374990..170720b6 100644 --- a/main.tf +++ b/main.tf @@ -430,6 +430,67 @@ resource "aws_security_group_rule" "computed_ingress_with_self" { var.rules[lookup(var.computed_ingress_with_self[count.index], "rule", "_")][2], ) } +# Security group rules with "prefix_list_ids", but without "cidr_blocks", "self" or "source_security_group_id" +resource "aws_security_group_rule" "ingress_with_prefix_list_ids" { + count = var.create ? length(var.ingress_with_prefix_list_ids) : 0 + + security_group_id = local.this_sg_id + type = "ingress" + + prefix_list_ids = var.ingress_prefix_list_ids + description = lookup( + var.ingress_with_prefix_list_ids[count.index], + "description", + "Ingress Rule", + ) + + from_port = lookup( + var.ingress_with_prefix_list_ids[count.index], + "from_port", + var.rules[lookup(var.ingress_with_prefix_list_ids[count.index], "rule", "_")][0], + ) + to_port = lookup( + var.ingress_with_prefix_list_ids[count.index], + "to_port", + var.rules[lookup(var.ingress_with_prefix_list_ids[count.index], "rule", "_")][1], + ) + protocol = lookup( + var.ingress_with_prefix_list_ids[count.index], + "protocol", + var.rules[lookup(var.ingress_with_prefix_list_ids[count.index], "rule", "_")][2], + ) +} + +# Computed - Security group rules with "prefix_list_ids", but without "cidr_blocks", "self" or "source_security_group_id" +resource "aws_security_group_rule" "computed_ingress_with_prefix_list_ids" { + count = var.create ? var.number_of_computed_ingress_with_prefix_list_ids : 0 + + security_group_id = local.this_sg_id + type = "ingress" + + prefix_list_ids = var.ingress_prefix_list_ids + description = lookup( + var.ingress_with_prefix_list_ids[count.index], + "description", + "Ingress Rule", + ) + + from_port = lookup( + var.ingress_with_prefix_list_ids[count.index], + "from_port", + var.rules[lookup(var.ingress_with_prefix_list_ids[count.index], "rule", "_")][0], + ) + to_port = lookup( + var.ingress_with_prefix_list_ids[count.index], + "to_port", + var.rules[lookup(var.ingress_with_prefix_list_ids[count.index], "rule", "_")][1], + ) + protocol = lookup( + var.ingress_with_prefix_list_ids[count.index], + "protocol", + var.rules[lookup(var.ingress_with_prefix_list_ids[count.index], "rule", "_")][2], + ) +} ################# # End of ingress @@ -807,6 +868,93 @@ resource "aws_security_group_rule" "computed_egress_with_self" { ) } +# Security group rules with "egress_prefix_list_ids", but without "cidr_blocks", "self" or "source_security_group_id" +resource "aws_security_group_rule" "egress_with_prefix_list_ids" { + count = var.create ? length(var.egress_with_prefix_list_ids) : 0 + + security_group_id = local.this_sg_id + type = "egress" + + prefix_list_ids = var.egress_prefix_list_ids + description = lookup( + var.egress_with_prefix_list_ids[count.index], + "description", + "Egress Rule", + ) + + from_port = lookup( + var.egress_with_prefix_list_ids[count.index], + "from_port", + var.rules[lookup( + var.egress_with_prefix_list_ids[count.index], + "rule", + "_", + )][0], + ) + to_port = lookup( + var.egress_with_prefix_list_ids[count.index], + "to_port", + var.rules[lookup( + var.egress_with_prefix_list_ids[count.index], + "rule", + "_", + )][1], + ) + protocol = lookup( + var.egress_with_prefix_list_ids[count.index], + "protocol", + var.rules[lookup( + var.egress_with_prefix_list_ids[count.index], + "rule", + "_", + )][2], + ) +} + +# Computed - Security group rules with "source_security_group_id", but without "cidr_blocks", "self" or "source_security_group_id" +resource "aws_security_group_rule" "computed_egress_with_prefix_list_ids" { + count = var.create ? var.number_of_computed_egress_with_prefix_list_ids : 0 + + security_group_id = local.this_sg_id + type = "egress" + + source_security_group_id = var.computed_egress_with_prefix_list_ids[count.index]["source_security_group_id"] + prefix_list_ids = var.egress_prefix_list_ids + description = lookup( + var.computed_egress_with_prefix_list_ids[count.index], + "description", + "Egress Rule", + ) + + from_port = lookup( + var.computed_egress_with_prefix_list_ids[count.index], + "from_port", + var.rules[lookup( + var.computed_egress_with_prefix_list_ids[count.index], + "rule", + "_", + )][0], + ) + to_port = lookup( + var.computed_egress_with_prefix_list_ids[count.index], + "to_port", + var.rules[lookup( + var.computed_egress_with_prefix_list_ids[count.index], + "rule", + "_", + )][1], + ) + protocol = lookup( + var.computed_egress_with_prefix_list_ids[count.index], + "protocol", + var.rules[lookup( + var.computed_egress_with_prefix_list_ids[count.index], + "rule", + "_", + )][2], + ) +} + ################ # End of egress ################ diff --git a/variables.tf b/variables.tf index 960f0cbc..9fa499d4 100644 --- a/variables.tf +++ b/variables.tf @@ -118,6 +118,12 @@ variable "ingress_prefix_list_ids" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used only" + type = list(map(string)) + default = [] +} + ################### # Computed Ingress ################### @@ -151,6 +157,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + ################################### # Number of computed ingress rules ################################### @@ -184,6 +196,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + ######### # Egress ######### @@ -217,6 +235,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used only" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -268,6 +292,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used only" + type = list(map(string)) + default = [] +} + ################################## # Number of computed egress rules ################################## @@ -301,6 +331,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used only" + type = number + default = 0 +} + variable "putin_khuylo" { description = "Do you agree that Putin doesn't respect Ukrainian sovereignty and territorial integrity? More info: https://en.wikipedia.org/wiki/Putin_khuylo!" type = bool From ff9164f88f1ba0a993bef5d55ea8810fcbe6be70 Mon Sep 17 00:00:00 2001 From: Andy Shinn Date: Wed, 9 Nov 2022 14:27:10 -0600 Subject: [PATCH 2/6] using prefix list in complete example --- examples/complete/README.md | 2 ++ examples/complete/main.tf | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/examples/complete/README.md b/examples/complete/README.md index 885e1de4..296ff451 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -40,6 +40,7 @@ Note that this example may create resources which cost money. Run `terraform des | [main\_sg](#module\_main\_sg) | ../../ | n/a | | [only\_rules](#module\_only\_rules) | ../../ | n/a | | [prefix\_list](#module\_prefix\_list) | ../../ | n/a | +| [prefix\_list\_sg](#module\_prefix\_list\_sg) | ../../ | n/a | | [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 | ## Resources @@ -48,6 +49,7 @@ Note that this example may create resources which cost money. Run `terraform des |------|------| | [aws_prefix_list.dynamodb](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/prefix_list) | data source | | [aws_prefix_list.s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/prefix_list) | data source | +| [aws_ec2_managed_prefix_list.prefix_list_sg_example](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ec2_managed_prefix_list) | resource | | [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/security_group) | data source | | [aws_vpc.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source | diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 3588c51b..8989c367 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -437,3 +437,30 @@ module "prefix_list" { }, ] } + +################################# +# Security group using prefix list +################################# +resource "aws_ec2_managed_prefix_list" "prefix_list_sg_example" { + address_family = "IPv4" + max_entries = 1 + name = "prefix-list-sg-example" + + entry { + cidr = module.vpc.vpc_cidr_block + description = "VPC CIDR" + } +} + +module "prefix_list_sg" { + source = "../../" + + name = "prefix-list-sg" + description = "Security group using prefix list" + vpc_id = data.aws_vpc.default.id + + use_name_prefix = false + + ingress_prefix_list_ids = [aws_ec2_managed_prefix_list.prefix_list_sg_example.id] + ingress_rules = ["https-443-tcp"] +} From b38eaf908b25a65161028bf0f51752271522e8fa Mon Sep 17 00:00:00 2001 From: Andy Shinn Date: Thu, 1 Jun 2023 12:23:46 -0500 Subject: [PATCH 3/6] address feedback --- examples/complete/main.tf | 15 ++++++++++++-- examples/http/main.tf | 29 ++++++++++++++++++++++++++ modules/_templates/main.tf | 14 +++++++++++++ modules/_templates/variables.tf | 36 +++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index fd519e10..049f4897 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -456,11 +456,22 @@ module "prefix_list_sg" { source = "../../" name = "prefix-list-sg" - description = "Security group using prefix list" + description = "Security group using prefix list and custom ingress rules" vpc_id = data.aws_vpc.default.id use_name_prefix = false ingress_prefix_list_ids = [aws_ec2_managed_prefix_list.prefix_list_sg_example.id] - ingress_rules = ["https-443-tcp"] + ingress_with_prefix_list_ids = [ + { + from_port = 80 + to_port = 80 + protocol = "tcp" + }, + { + from_port = 443 + to_port = 443 + protocol = "tcp" + }, + ] } diff --git a/examples/http/main.tf b/examples/http/main.tf index 230a11b9..9996bc22 100644 --- a/examples/http/main.tf +++ b/examples/http/main.tf @@ -14,6 +14,21 @@ data "aws_security_group" "default" { vpc_id = data.aws_vpc.default.id } +########################################### +# Prefix list allowing VPC CIDR for example +########################################### + +resource "aws_ec2_managed_prefix_list" "example" { + name = "All VPC CIDRs" + address_family = "IPv4" + max_entries = 1 + + entry { + cidr = aws_vpc.default.cidr_block + description = "Default VPC CIDR" + } +} + ########################### # Security groups examples ########################### @@ -31,6 +46,20 @@ module "http_sg" { ingress_cidr_blocks = ["0.0.0.0/0"] } +################################### +# HTTP with ingress prefix list ids +################################### +module "http_with_ingress_prefix_list_ids_sg" { + source = "../../modules/http-80" + + name = "http-with-ingress-prefix-list-ids" + description = "Security group with HTTP ports open within current VPC, egress ports are all world open" + vpc_id = data.aws_vpc.default.id + + # Allow ingress rules to be accessed only within specifc prefix list IDs + ingress_prefix_list_ids = [aws_ec2_managed_prefix_list.example.id] +} + ##################### # HTTP with MySQL #1 ##################### diff --git a/modules/_templates/main.tf b/modules/_templates/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/_templates/main.tf +++ b/modules/_templates/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/_templates/variables.tf b/modules/_templates/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/_templates/variables.tf +++ b/modules/_templates/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number From db44ac6f3b0eb90e0c2b0547ec2f9196d7078aa5 Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Mon, 5 Jun 2023 17:02:18 -0700 Subject: [PATCH 4/6] Fixed example --- examples/complete/README.md | 2 +- examples/http/README.md | 2 ++ examples/http/main.tf | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/complete/README.md b/examples/complete/README.md index bdba7935..44a2e89b 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -47,9 +47,9 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Type | |------|------| +| [aws_ec2_managed_prefix_list.prefix_list_sg_example](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ec2_managed_prefix_list) | resource | | [aws_prefix_list.dynamodb](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/prefix_list) | data source | | [aws_prefix_list.s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/prefix_list) | data source | -| [aws_ec2_managed_prefix_list.prefix_list_sg_example](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ec2_managed_prefix_list) | resource | | [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/security_group) | data source | | [aws_vpc.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source | diff --git a/examples/http/README.md b/examples/http/README.md index 07ad920a..54281f35 100644 --- a/examples/http/README.md +++ b/examples/http/README.md @@ -39,11 +39,13 @@ Note that this example may create resources which cost money. Run `terraform des | [http\_sg](#module\_http\_sg) | ../../modules/http-80 | n/a | | [http\_with\_egress\_minimal\_sg](#module\_http\_with\_egress\_minimal\_sg) | ../../modules/http-80 | n/a | | [http\_with\_egress\_sg](#module\_http\_with\_egress\_sg) | ../../modules/http-80 | n/a | +| [http\_with\_ingress\_prefix\_list\_ids\_sg](#module\_http\_with\_ingress\_prefix\_list\_ids\_sg) | ../../modules/http-80 | n/a | ## Resources | Name | Type | |------|------| +| [aws_ec2_managed_prefix_list.example](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ec2_managed_prefix_list) | resource | | [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/security_group) | data source | | [aws_vpc.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source | diff --git a/examples/http/main.tf b/examples/http/main.tf index 9996bc22..578fd0d3 100644 --- a/examples/http/main.tf +++ b/examples/http/main.tf @@ -24,7 +24,7 @@ resource "aws_ec2_managed_prefix_list" "example" { max_entries = 1 entry { - cidr = aws_vpc.default.cidr_block + cidr = data.aws_vpc.default.cidr_block description = "Default VPC CIDR" } } @@ -56,8 +56,8 @@ module "http_with_ingress_prefix_list_ids_sg" { description = "Security group with HTTP ports open within current VPC, egress ports are all world open" vpc_id = data.aws_vpc.default.id - # Allow ingress rules to be accessed only within specifc prefix list IDs - ingress_prefix_list_ids = [aws_ec2_managed_prefix_list.example.id] + # Allow ingress rules to be accessed only within specific prefix list IDs + ingress_prefix_list_ids = [aws_ec2_managed_prefix_list.example.id] } ##################### From 637a1ceeeb5c27b28f4eef643255154428e35b34 Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Mon, 5 Jun 2023 17:05:34 -0700 Subject: [PATCH 5/6] Regenerated submodules code --- modules/README.md | 1 + modules/activemq/README.md | 6 +++++ modules/activemq/main.tf | 14 +++++++++++ modules/activemq/variables.tf | 36 ++++++++++++++++++++++++++++ modules/alertmanager/README.md | 6 +++++ modules/alertmanager/main.tf | 14 +++++++++++ modules/alertmanager/variables.tf | 36 ++++++++++++++++++++++++++++ modules/carbon-relay-ng/README.md | 6 +++++ modules/carbon-relay-ng/main.tf | 14 +++++++++++ modules/carbon-relay-ng/variables.tf | 36 ++++++++++++++++++++++++++++ modules/cassandra/README.md | 6 +++++ modules/cassandra/main.tf | 14 +++++++++++ modules/cassandra/variables.tf | 36 ++++++++++++++++++++++++++++ modules/consul/README.md | 6 +++++ modules/consul/main.tf | 14 +++++++++++ modules/consul/variables.tf | 36 ++++++++++++++++++++++++++++ modules/dax-cluster/README.md | 6 +++++ modules/dax-cluster/main.tf | 14 +++++++++++ modules/dax-cluster/variables.tf | 36 ++++++++++++++++++++++++++++ modules/docker-swarm/README.md | 6 +++++ modules/docker-swarm/main.tf | 14 +++++++++++ modules/docker-swarm/variables.tf | 36 ++++++++++++++++++++++++++++ modules/elasticsearch/README.md | 6 +++++ modules/elasticsearch/main.tf | 14 +++++++++++ modules/elasticsearch/variables.tf | 36 ++++++++++++++++++++++++++++ modules/etcd/README.md | 6 +++++ modules/etcd/main.tf | 14 +++++++++++ modules/etcd/variables.tf | 36 ++++++++++++++++++++++++++++ modules/grafana/README.md | 6 +++++ modules/grafana/main.tf | 14 +++++++++++ modules/grafana/variables.tf | 36 ++++++++++++++++++++++++++++ modules/graphite-statsd/README.md | 6 +++++ modules/graphite-statsd/main.tf | 14 +++++++++++ modules/graphite-statsd/variables.tf | 36 ++++++++++++++++++++++++++++ modules/http-80/README.md | 6 +++++ modules/http-80/main.tf | 14 +++++++++++ modules/http-80/variables.tf | 36 ++++++++++++++++++++++++++++ modules/http-8080/README.md | 6 +++++ modules/http-8080/main.tf | 14 +++++++++++ modules/http-8080/variables.tf | 36 ++++++++++++++++++++++++++++ modules/https-443/README.md | 6 +++++ modules/https-443/main.tf | 14 +++++++++++ modules/https-443/variables.tf | 36 ++++++++++++++++++++++++++++ modules/https-8443/README.md | 6 +++++ modules/https-8443/main.tf | 14 +++++++++++ modules/https-8443/variables.tf | 36 ++++++++++++++++++++++++++++ modules/ipsec-4500/README.md | 6 +++++ modules/ipsec-4500/main.tf | 14 +++++++++++ modules/ipsec-4500/variables.tf | 36 ++++++++++++++++++++++++++++ modules/ipsec-500/README.md | 6 +++++ modules/ipsec-500/main.tf | 14 +++++++++++ modules/ipsec-500/variables.tf | 36 ++++++++++++++++++++++++++++ modules/kafka/README.md | 6 +++++ modules/kafka/main.tf | 14 +++++++++++ modules/kafka/variables.tf | 36 ++++++++++++++++++++++++++++ modules/kibana/README.md | 6 +++++ modules/kibana/main.tf | 14 +++++++++++ modules/kibana/variables.tf | 36 ++++++++++++++++++++++++++++ modules/kubernetes-api/README.md | 6 +++++ modules/kubernetes-api/main.tf | 14 +++++++++++ modules/kubernetes-api/variables.tf | 36 ++++++++++++++++++++++++++++ modules/ldap/README.md | 6 +++++ modules/ldap/main.tf | 14 +++++++++++ modules/ldap/variables.tf | 36 ++++++++++++++++++++++++++++ modules/ldaps/README.md | 6 +++++ modules/ldaps/main.tf | 14 +++++++++++ modules/ldaps/variables.tf | 36 ++++++++++++++++++++++++++++ modules/logstash/README.md | 6 +++++ modules/logstash/main.tf | 14 +++++++++++ modules/logstash/variables.tf | 36 ++++++++++++++++++++++++++++ modules/loki/README.md | 6 +++++ modules/loki/main.tf | 14 +++++++++++ modules/loki/variables.tf | 36 ++++++++++++++++++++++++++++ modules/memcached/README.md | 6 +++++ modules/memcached/main.tf | 14 +++++++++++ modules/memcached/variables.tf | 36 ++++++++++++++++++++++++++++ modules/minio/README.md | 6 +++++ modules/minio/main.tf | 14 +++++++++++ modules/minio/variables.tf | 36 ++++++++++++++++++++++++++++ modules/mongodb/README.md | 6 +++++ modules/mongodb/main.tf | 14 +++++++++++ modules/mongodb/variables.tf | 36 ++++++++++++++++++++++++++++ modules/mssql/README.md | 6 +++++ modules/mssql/main.tf | 14 +++++++++++ modules/mssql/variables.tf | 36 ++++++++++++++++++++++++++++ modules/mysql/README.md | 6 +++++ modules/mysql/main.tf | 14 +++++++++++ modules/mysql/variables.tf | 36 ++++++++++++++++++++++++++++ modules/nfs/README.md | 6 +++++ modules/nfs/main.tf | 14 +++++++++++ modules/nfs/variables.tf | 36 ++++++++++++++++++++++++++++ modules/nomad/README.md | 6 +++++ modules/nomad/main.tf | 14 +++++++++++ modules/nomad/variables.tf | 36 ++++++++++++++++++++++++++++ modules/ntp/README.md | 6 +++++ modules/ntp/main.tf | 14 +++++++++++ modules/ntp/variables.tf | 36 ++++++++++++++++++++++++++++ modules/openvpn/README.md | 6 +++++ modules/openvpn/main.tf | 14 +++++++++++ modules/openvpn/variables.tf | 36 ++++++++++++++++++++++++++++ modules/oracle-db/README.md | 6 +++++ modules/oracle-db/main.tf | 14 +++++++++++ modules/oracle-db/variables.tf | 36 ++++++++++++++++++++++++++++ modules/postgresql/README.md | 6 +++++ modules/postgresql/main.tf | 14 +++++++++++ modules/postgresql/variables.tf | 36 ++++++++++++++++++++++++++++ modules/prometheus/README.md | 6 +++++ modules/prometheus/main.tf | 14 +++++++++++ modules/prometheus/variables.tf | 36 ++++++++++++++++++++++++++++ modules/promtail/README.md | 6 +++++ modules/promtail/main.tf | 14 +++++++++++ modules/promtail/variables.tf | 36 ++++++++++++++++++++++++++++ modules/puppet/README.md | 6 +++++ modules/puppet/main.tf | 14 +++++++++++ modules/puppet/variables.tf | 36 ++++++++++++++++++++++++++++ modules/rabbitmq/README.md | 6 +++++ modules/rabbitmq/main.tf | 14 +++++++++++ modules/rabbitmq/variables.tf | 36 ++++++++++++++++++++++++++++ modules/rdp/README.md | 6 +++++ modules/rdp/main.tf | 14 +++++++++++ modules/rdp/variables.tf | 36 ++++++++++++++++++++++++++++ modules/redis/README.md | 6 +++++ modules/redis/main.tf | 14 +++++++++++ modules/redis/variables.tf | 36 ++++++++++++++++++++++++++++ modules/redshift/README.md | 6 +++++ modules/redshift/main.tf | 14 +++++++++++ modules/redshift/variables.tf | 36 ++++++++++++++++++++++++++++ modules/smtp-submission/README.md | 6 +++++ modules/smtp-submission/main.tf | 14 +++++++++++ modules/smtp-submission/variables.tf | 36 ++++++++++++++++++++++++++++ modules/smtp/README.md | 6 +++++ modules/smtp/main.tf | 14 +++++++++++ modules/smtp/variables.tf | 36 ++++++++++++++++++++++++++++ modules/smtps/README.md | 6 +++++ modules/smtps/main.tf | 14 +++++++++++ modules/smtps/variables.tf | 36 ++++++++++++++++++++++++++++ modules/solr/README.md | 6 +++++ modules/solr/main.tf | 14 +++++++++++ modules/solr/variables.tf | 36 ++++++++++++++++++++++++++++ modules/splunk/README.md | 6 +++++ modules/splunk/main.tf | 14 +++++++++++ modules/splunk/variables.tf | 36 ++++++++++++++++++++++++++++ modules/squid/README.md | 6 +++++ modules/squid/main.tf | 14 +++++++++++ modules/squid/variables.tf | 36 ++++++++++++++++++++++++++++ modules/ssh/README.md | 6 +++++ modules/ssh/main.tf | 14 +++++++++++ modules/ssh/variables.tf | 36 ++++++++++++++++++++++++++++ modules/storm/README.md | 6 +++++ modules/storm/main.tf | 14 +++++++++++ modules/storm/variables.tf | 36 ++++++++++++++++++++++++++++ modules/vault/README.md | 6 +++++ modules/vault/main.tf | 14 +++++++++++ modules/vault/variables.tf | 36 ++++++++++++++++++++++++++++ modules/wazuh/README.md | 6 +++++ modules/wazuh/main.tf | 14 +++++++++++ modules/wazuh/variables.tf | 36 ++++++++++++++++++++++++++++ modules/web/README.md | 6 +++++ modules/web/main.tf | 14 +++++++++++ modules/web/variables.tf | 36 ++++++++++++++++++++++++++++ modules/winrm/README.md | 6 +++++ modules/winrm/main.tf | 14 +++++++++++ modules/winrm/variables.tf | 36 ++++++++++++++++++++++++++++ modules/zabbix/README.md | 6 +++++ modules/zabbix/main.tf | 14 +++++++++++ modules/zabbix/variables.tf | 36 ++++++++++++++++++++++++++++ modules/zipkin/README.md | 6 +++++ modules/zipkin/main.tf | 14 +++++++++++ modules/zipkin/variables.tf | 36 ++++++++++++++++++++++++++++ modules/zookeeper/README.md | 6 +++++ modules/zookeeper/main.tf | 14 +++++++++++ modules/zookeeper/variables.tf | 36 ++++++++++++++++++++++++++++ 172 files changed, 3193 insertions(+) diff --git a/modules/README.md b/modules/README.md index 2708a2e6..02eb3534 100644 --- a/modules/README.md +++ b/modules/README.md @@ -60,3 +60,4 @@ List of Security Groups implemented as Terraform modules * [zipkin](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/zipkin) * [zookeeper](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/zookeeper) * [_templates](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/_templates) - Source templates for all other modules. Change carefully, test thoughtfully! + diff --git a/modules/activemq/README.md b/modules/activemq/README.md index f8949116..f82c302d 100644 --- a/modules/activemq/README.md +++ b/modules/activemq/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/activemq/main.tf b/modules/activemq/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/activemq/main.tf +++ b/modules/activemq/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/activemq/variables.tf b/modules/activemq/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/activemq/variables.tf +++ b/modules/activemq/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/alertmanager/README.md b/modules/alertmanager/README.md index 506f65a4..4a37c34e 100644 --- a/modules/alertmanager/README.md +++ b/modules/alertmanager/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/alertmanager/main.tf b/modules/alertmanager/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/alertmanager/main.tf +++ b/modules/alertmanager/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/alertmanager/variables.tf b/modules/alertmanager/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/alertmanager/variables.tf +++ b/modules/alertmanager/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/carbon-relay-ng/README.md b/modules/carbon-relay-ng/README.md index a620b795..6e6fb9f0 100644 --- a/modules/carbon-relay-ng/README.md +++ b/modules/carbon-relay-ng/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/carbon-relay-ng/main.tf b/modules/carbon-relay-ng/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/carbon-relay-ng/main.tf +++ b/modules/carbon-relay-ng/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/carbon-relay-ng/variables.tf b/modules/carbon-relay-ng/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/carbon-relay-ng/variables.tf +++ b/modules/carbon-relay-ng/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/cassandra/README.md b/modules/cassandra/README.md index ee2df4c8..dfdd4a03 100644 --- a/modules/cassandra/README.md +++ b/modules/cassandra/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/cassandra/main.tf b/modules/cassandra/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/cassandra/main.tf +++ b/modules/cassandra/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/cassandra/variables.tf b/modules/cassandra/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/cassandra/variables.tf +++ b/modules/cassandra/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/consul/README.md b/modules/consul/README.md index e5d3ebd7..1368f764 100644 --- a/modules/consul/README.md +++ b/modules/consul/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/consul/main.tf b/modules/consul/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/consul/main.tf +++ b/modules/consul/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/consul/variables.tf b/modules/consul/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/consul/variables.tf +++ b/modules/consul/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/dax-cluster/README.md b/modules/dax-cluster/README.md index 612a6f5f..6ead1ced 100644 --- a/modules/dax-cluster/README.md +++ b/modules/dax-cluster/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/dax-cluster/main.tf b/modules/dax-cluster/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/dax-cluster/main.tf +++ b/modules/dax-cluster/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/dax-cluster/variables.tf b/modules/dax-cluster/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/dax-cluster/variables.tf +++ b/modules/dax-cluster/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/docker-swarm/README.md b/modules/docker-swarm/README.md index ff1ebd1d..9a68ac71 100644 --- a/modules/docker-swarm/README.md +++ b/modules/docker-swarm/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/docker-swarm/main.tf b/modules/docker-swarm/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/docker-swarm/main.tf +++ b/modules/docker-swarm/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/docker-swarm/variables.tf b/modules/docker-swarm/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/docker-swarm/variables.tf +++ b/modules/docker-swarm/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/elasticsearch/README.md b/modules/elasticsearch/README.md index bd8dd740..4a40cd6e 100644 --- a/modules/elasticsearch/README.md +++ b/modules/elasticsearch/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/elasticsearch/main.tf b/modules/elasticsearch/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/elasticsearch/main.tf +++ b/modules/elasticsearch/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/elasticsearch/variables.tf b/modules/elasticsearch/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/elasticsearch/variables.tf +++ b/modules/elasticsearch/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/etcd/README.md b/modules/etcd/README.md index 40bf2d3e..6a3195ad 100644 --- a/modules/etcd/README.md +++ b/modules/etcd/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/etcd/main.tf b/modules/etcd/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/etcd/main.tf +++ b/modules/etcd/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/etcd/variables.tf b/modules/etcd/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/etcd/variables.tf +++ b/modules/etcd/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/grafana/README.md b/modules/grafana/README.md index b891ebc1..80bbb70d 100644 --- a/modules/grafana/README.md +++ b/modules/grafana/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/grafana/main.tf b/modules/grafana/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/grafana/main.tf +++ b/modules/grafana/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/grafana/variables.tf b/modules/grafana/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/grafana/variables.tf +++ b/modules/grafana/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/graphite-statsd/README.md b/modules/graphite-statsd/README.md index b050b692..938693ea 100644 --- a/modules/graphite-statsd/README.md +++ b/modules/graphite-statsd/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/graphite-statsd/main.tf b/modules/graphite-statsd/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/graphite-statsd/main.tf +++ b/modules/graphite-statsd/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/graphite-statsd/variables.tf b/modules/graphite-statsd/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/graphite-statsd/variables.tf +++ b/modules/graphite-statsd/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/http-80/README.md b/modules/http-80/README.md index 0153b301..5102ff91 100644 --- a/modules/http-80/README.md +++ b/modules/http-80/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/http-80/main.tf b/modules/http-80/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/http-80/main.tf +++ b/modules/http-80/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/http-80/variables.tf b/modules/http-80/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/http-80/variables.tf +++ b/modules/http-80/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/http-8080/README.md b/modules/http-8080/README.md index 65b11d95..4f8fbb71 100644 --- a/modules/http-8080/README.md +++ b/modules/http-8080/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/http-8080/main.tf b/modules/http-8080/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/http-8080/main.tf +++ b/modules/http-8080/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/http-8080/variables.tf b/modules/http-8080/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/http-8080/variables.tf +++ b/modules/http-8080/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/https-443/README.md b/modules/https-443/README.md index fc653fcb..a1200173 100644 --- a/modules/https-443/README.md +++ b/modules/https-443/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/https-443/main.tf b/modules/https-443/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/https-443/main.tf +++ b/modules/https-443/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/https-443/variables.tf b/modules/https-443/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/https-443/variables.tf +++ b/modules/https-443/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/https-8443/README.md b/modules/https-8443/README.md index 60629790..cd5cfb8f 100644 --- a/modules/https-8443/README.md +++ b/modules/https-8443/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/https-8443/main.tf b/modules/https-8443/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/https-8443/main.tf +++ b/modules/https-8443/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/https-8443/variables.tf b/modules/https-8443/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/https-8443/variables.tf +++ b/modules/https-8443/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/ipsec-4500/README.md b/modules/ipsec-4500/README.md index 2772375d..4d5c7612 100644 --- a/modules/ipsec-4500/README.md +++ b/modules/ipsec-4500/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/ipsec-4500/main.tf b/modules/ipsec-4500/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/ipsec-4500/main.tf +++ b/modules/ipsec-4500/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/ipsec-4500/variables.tf b/modules/ipsec-4500/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/ipsec-4500/variables.tf +++ b/modules/ipsec-4500/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/ipsec-500/README.md b/modules/ipsec-500/README.md index ee30ee12..4552fd57 100644 --- a/modules/ipsec-500/README.md +++ b/modules/ipsec-500/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/ipsec-500/main.tf b/modules/ipsec-500/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/ipsec-500/main.tf +++ b/modules/ipsec-500/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/ipsec-500/variables.tf b/modules/ipsec-500/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/ipsec-500/variables.tf +++ b/modules/ipsec-500/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/kafka/README.md b/modules/kafka/README.md index 2ed1af83..ce9ccb2f 100644 --- a/modules/kafka/README.md +++ b/modules/kafka/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/kafka/main.tf b/modules/kafka/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/kafka/main.tf +++ b/modules/kafka/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/kafka/variables.tf b/modules/kafka/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/kafka/variables.tf +++ b/modules/kafka/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/kibana/README.md b/modules/kibana/README.md index 7a58288c..79c02780 100644 --- a/modules/kibana/README.md +++ b/modules/kibana/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/kibana/main.tf b/modules/kibana/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/kibana/main.tf +++ b/modules/kibana/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/kibana/variables.tf b/modules/kibana/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/kibana/variables.tf +++ b/modules/kibana/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/kubernetes-api/README.md b/modules/kubernetes-api/README.md index 3026c498..b534dc0a 100644 --- a/modules/kubernetes-api/README.md +++ b/modules/kubernetes-api/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/kubernetes-api/main.tf b/modules/kubernetes-api/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/kubernetes-api/main.tf +++ b/modules/kubernetes-api/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/kubernetes-api/variables.tf b/modules/kubernetes-api/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/kubernetes-api/variables.tf +++ b/modules/kubernetes-api/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/ldap/README.md b/modules/ldap/README.md index fe451614..4db9c17e 100644 --- a/modules/ldap/README.md +++ b/modules/ldap/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/ldap/main.tf b/modules/ldap/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/ldap/main.tf +++ b/modules/ldap/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/ldap/variables.tf b/modules/ldap/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/ldap/variables.tf +++ b/modules/ldap/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/ldaps/README.md b/modules/ldaps/README.md index 105396d4..eb1e44f2 100644 --- a/modules/ldaps/README.md +++ b/modules/ldaps/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/ldaps/main.tf b/modules/ldaps/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/ldaps/main.tf +++ b/modules/ldaps/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/ldaps/variables.tf b/modules/ldaps/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/ldaps/variables.tf +++ b/modules/ldaps/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/logstash/README.md b/modules/logstash/README.md index 0d8a5c77..3f8d9dea 100644 --- a/modules/logstash/README.md +++ b/modules/logstash/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/logstash/main.tf b/modules/logstash/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/logstash/main.tf +++ b/modules/logstash/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/logstash/variables.tf b/modules/logstash/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/logstash/variables.tf +++ b/modules/logstash/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/loki/README.md b/modules/loki/README.md index 5ef49ab6..6bc6e3b8 100644 --- a/modules/loki/README.md +++ b/modules/loki/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/loki/main.tf b/modules/loki/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/loki/main.tf +++ b/modules/loki/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/loki/variables.tf b/modules/loki/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/loki/variables.tf +++ b/modules/loki/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/memcached/README.md b/modules/memcached/README.md index 71e65329..4d8b2dec 100644 --- a/modules/memcached/README.md +++ b/modules/memcached/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/memcached/main.tf b/modules/memcached/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/memcached/main.tf +++ b/modules/memcached/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/memcached/variables.tf b/modules/memcached/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/memcached/variables.tf +++ b/modules/memcached/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/minio/README.md b/modules/minio/README.md index e992e07e..a96dde19 100644 --- a/modules/minio/README.md +++ b/modules/minio/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/minio/main.tf b/modules/minio/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/minio/main.tf +++ b/modules/minio/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/minio/variables.tf b/modules/minio/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/minio/variables.tf +++ b/modules/minio/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/mongodb/README.md b/modules/mongodb/README.md index 9e9bcb50..6f96cf27 100644 --- a/modules/mongodb/README.md +++ b/modules/mongodb/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/mongodb/main.tf b/modules/mongodb/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/mongodb/main.tf +++ b/modules/mongodb/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/mongodb/variables.tf b/modules/mongodb/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/mongodb/variables.tf +++ b/modules/mongodb/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/mssql/README.md b/modules/mssql/README.md index 5c245595..a15ee16a 100644 --- a/modules/mssql/README.md +++ b/modules/mssql/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/mssql/main.tf b/modules/mssql/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/mssql/main.tf +++ b/modules/mssql/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/mssql/variables.tf b/modules/mssql/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/mssql/variables.tf +++ b/modules/mssql/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/mysql/README.md b/modules/mysql/README.md index 9dc838ea..6b2a1e01 100644 --- a/modules/mysql/README.md +++ b/modules/mysql/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/mysql/main.tf b/modules/mysql/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/mysql/main.tf +++ b/modules/mysql/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/mysql/variables.tf b/modules/mysql/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/mysql/variables.tf +++ b/modules/mysql/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/nfs/README.md b/modules/nfs/README.md index fe3512a9..eba6272f 100644 --- a/modules/nfs/README.md +++ b/modules/nfs/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/nfs/main.tf b/modules/nfs/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/nfs/main.tf +++ b/modules/nfs/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/nfs/variables.tf b/modules/nfs/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/nfs/variables.tf +++ b/modules/nfs/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/nomad/README.md b/modules/nomad/README.md index 31a49691..a7a22160 100644 --- a/modules/nomad/README.md +++ b/modules/nomad/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/nomad/main.tf b/modules/nomad/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/nomad/main.tf +++ b/modules/nomad/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/nomad/variables.tf b/modules/nomad/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/nomad/variables.tf +++ b/modules/nomad/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/ntp/README.md b/modules/ntp/README.md index eee98c21..9eca5527 100644 --- a/modules/ntp/README.md +++ b/modules/ntp/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/ntp/main.tf b/modules/ntp/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/ntp/main.tf +++ b/modules/ntp/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/ntp/variables.tf b/modules/ntp/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/ntp/variables.tf +++ b/modules/ntp/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/openvpn/README.md b/modules/openvpn/README.md index 353621ad..51d7a584 100644 --- a/modules/openvpn/README.md +++ b/modules/openvpn/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/openvpn/main.tf b/modules/openvpn/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/openvpn/main.tf +++ b/modules/openvpn/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/openvpn/variables.tf b/modules/openvpn/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/openvpn/variables.tf +++ b/modules/openvpn/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/oracle-db/README.md b/modules/oracle-db/README.md index 76d6c962..ea463e0c 100644 --- a/modules/oracle-db/README.md +++ b/modules/oracle-db/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/oracle-db/main.tf b/modules/oracle-db/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/oracle-db/main.tf +++ b/modules/oracle-db/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/oracle-db/variables.tf b/modules/oracle-db/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/oracle-db/variables.tf +++ b/modules/oracle-db/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/postgresql/README.md b/modules/postgresql/README.md index 3245c6e9..e7410e9f 100644 --- a/modules/postgresql/README.md +++ b/modules/postgresql/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/postgresql/main.tf b/modules/postgresql/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/postgresql/main.tf +++ b/modules/postgresql/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/postgresql/variables.tf b/modules/postgresql/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/postgresql/variables.tf +++ b/modules/postgresql/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/prometheus/README.md b/modules/prometheus/README.md index e04e72ff..3eea7878 100644 --- a/modules/prometheus/README.md +++ b/modules/prometheus/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/prometheus/main.tf b/modules/prometheus/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/prometheus/main.tf +++ b/modules/prometheus/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/prometheus/variables.tf b/modules/prometheus/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/prometheus/variables.tf +++ b/modules/prometheus/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/promtail/README.md b/modules/promtail/README.md index a2990723..d88f4618 100644 --- a/modules/promtail/README.md +++ b/modules/promtail/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/promtail/main.tf b/modules/promtail/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/promtail/main.tf +++ b/modules/promtail/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/promtail/variables.tf b/modules/promtail/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/promtail/variables.tf +++ b/modules/promtail/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/puppet/README.md b/modules/puppet/README.md index 942daf08..2f9b8f85 100644 --- a/modules/puppet/README.md +++ b/modules/puppet/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/puppet/main.tf b/modules/puppet/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/puppet/main.tf +++ b/modules/puppet/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/puppet/variables.tf b/modules/puppet/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/puppet/variables.tf +++ b/modules/puppet/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/rabbitmq/README.md b/modules/rabbitmq/README.md index 4b310d66..81db819d 100644 --- a/modules/rabbitmq/README.md +++ b/modules/rabbitmq/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/rabbitmq/main.tf b/modules/rabbitmq/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/rabbitmq/main.tf +++ b/modules/rabbitmq/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/rabbitmq/variables.tf b/modules/rabbitmq/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/rabbitmq/variables.tf +++ b/modules/rabbitmq/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/rdp/README.md b/modules/rdp/README.md index ffe1e5ad..38a842ca 100644 --- a/modules/rdp/README.md +++ b/modules/rdp/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/rdp/main.tf b/modules/rdp/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/rdp/main.tf +++ b/modules/rdp/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/rdp/variables.tf b/modules/rdp/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/rdp/variables.tf +++ b/modules/rdp/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/redis/README.md b/modules/redis/README.md index 889a389d..5a9d74ad 100644 --- a/modules/redis/README.md +++ b/modules/redis/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/redis/main.tf b/modules/redis/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/redis/main.tf +++ b/modules/redis/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/redis/variables.tf b/modules/redis/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/redis/variables.tf +++ b/modules/redis/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/redshift/README.md b/modules/redshift/README.md index 3c52a751..d2f97c9c 100644 --- a/modules/redshift/README.md +++ b/modules/redshift/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/redshift/main.tf b/modules/redshift/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/redshift/main.tf +++ b/modules/redshift/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/redshift/variables.tf b/modules/redshift/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/redshift/variables.tf +++ b/modules/redshift/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/smtp-submission/README.md b/modules/smtp-submission/README.md index d93dc2c0..ea9059a7 100644 --- a/modules/smtp-submission/README.md +++ b/modules/smtp-submission/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/smtp-submission/main.tf b/modules/smtp-submission/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/smtp-submission/main.tf +++ b/modules/smtp-submission/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/smtp-submission/variables.tf b/modules/smtp-submission/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/smtp-submission/variables.tf +++ b/modules/smtp-submission/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/smtp/README.md b/modules/smtp/README.md index c3bae858..9aaf9c7f 100644 --- a/modules/smtp/README.md +++ b/modules/smtp/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/smtp/main.tf b/modules/smtp/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/smtp/main.tf +++ b/modules/smtp/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/smtp/variables.tf b/modules/smtp/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/smtp/variables.tf +++ b/modules/smtp/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/smtps/README.md b/modules/smtps/README.md index bb9d6cd0..899da7c5 100644 --- a/modules/smtps/README.md +++ b/modules/smtps/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/smtps/main.tf b/modules/smtps/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/smtps/main.tf +++ b/modules/smtps/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/smtps/variables.tf b/modules/smtps/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/smtps/variables.tf +++ b/modules/smtps/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/solr/README.md b/modules/solr/README.md index 8682ce22..5c4a5b36 100644 --- a/modules/solr/README.md +++ b/modules/solr/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/solr/main.tf b/modules/solr/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/solr/main.tf +++ b/modules/solr/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/solr/variables.tf b/modules/solr/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/solr/variables.tf +++ b/modules/solr/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/splunk/README.md b/modules/splunk/README.md index 55c5d7b4..37cb6109 100644 --- a/modules/splunk/README.md +++ b/modules/splunk/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/splunk/main.tf b/modules/splunk/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/splunk/main.tf +++ b/modules/splunk/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/splunk/variables.tf b/modules/splunk/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/splunk/variables.tf +++ b/modules/splunk/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/squid/README.md b/modules/squid/README.md index 9dd224ee..14f32d60 100644 --- a/modules/squid/README.md +++ b/modules/squid/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/squid/main.tf b/modules/squid/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/squid/main.tf +++ b/modules/squid/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/squid/variables.tf b/modules/squid/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/squid/variables.tf +++ b/modules/squid/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/ssh/README.md b/modules/ssh/README.md index e248da86..6a365b2f 100644 --- a/modules/ssh/README.md +++ b/modules/ssh/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/ssh/main.tf b/modules/ssh/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/ssh/main.tf +++ b/modules/ssh/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/ssh/variables.tf b/modules/ssh/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/ssh/variables.tf +++ b/modules/ssh/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/storm/README.md b/modules/storm/README.md index 3e44a09a..8b414784 100644 --- a/modules/storm/README.md +++ b/modules/storm/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/storm/main.tf b/modules/storm/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/storm/main.tf +++ b/modules/storm/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/storm/variables.tf b/modules/storm/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/storm/variables.tf +++ b/modules/storm/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/vault/README.md b/modules/vault/README.md index 8bd55d4b..4982bb9a 100644 --- a/modules/vault/README.md +++ b/modules/vault/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/vault/main.tf b/modules/vault/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/vault/main.tf +++ b/modules/vault/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/vault/variables.tf b/modules/vault/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/vault/variables.tf +++ b/modules/vault/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/wazuh/README.md b/modules/wazuh/README.md index 9345a6a6..8c7f0168 100644 --- a/modules/wazuh/README.md +++ b/modules/wazuh/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/wazuh/main.tf b/modules/wazuh/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/wazuh/main.tf +++ b/modules/wazuh/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/wazuh/variables.tf b/modules/wazuh/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/wazuh/variables.tf +++ b/modules/wazuh/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/web/README.md b/modules/web/README.md index eb36c612..92561686 100644 --- a/modules/web/README.md +++ b/modules/web/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/web/main.tf b/modules/web/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/web/main.tf +++ b/modules/web/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/web/variables.tf b/modules/web/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/web/variables.tf +++ b/modules/web/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/winrm/README.md b/modules/winrm/README.md index 30f8f2a1..abd62a3b 100644 --- a/modules/winrm/README.md +++ b/modules/winrm/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/winrm/main.tf b/modules/winrm/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/winrm/main.tf +++ b/modules/winrm/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/winrm/variables.tf b/modules/winrm/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/winrm/variables.tf +++ b/modules/winrm/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/zabbix/README.md b/modules/zabbix/README.md index e635d2ff..8901a60d 100644 --- a/modules/zabbix/README.md +++ b/modules/zabbix/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/zabbix/main.tf b/modules/zabbix/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/zabbix/main.tf +++ b/modules/zabbix/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/zabbix/variables.tf b/modules/zabbix/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/zabbix/variables.tf +++ b/modules/zabbix/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/zipkin/README.md b/modules/zipkin/README.md index d0af405d..b87222c8 100644 --- a/modules/zipkin/README.md +++ b/modules/zipkin/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/zipkin/main.tf b/modules/zipkin/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/zipkin/main.tf +++ b/modules/zipkin/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/zipkin/variables.tf b/modules/zipkin/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/zipkin/variables.tf +++ b/modules/zipkin/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number diff --git a/modules/zookeeper/README.md b/modules/zookeeper/README.md index 1cd97201..ea290b41 100644 --- a/modules/zookeeper/README.md +++ b/modules/zookeeper/README.md @@ -57,6 +57,7 @@ No resources. | [computed\_egress\_rules](#input\_computed\_egress\_rules) | List of computed egress rules to create by name | `list(string)` | `[]` | no | | [computed\_egress\_with\_cidr\_blocks](#input\_computed\_egress\_with\_cidr\_blocks) | List of computed egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_computed\_egress\_with\_ipv6\_cidr\_blocks) | List of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_egress\_with\_prefix\_list\_ids](#input\_computed\_egress\_with\_prefix\_list\_ids) | List of computed egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_self](#input\_computed\_egress\_with\_self) | List of computed egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_egress\_with\_source\_security\_group\_id](#input\_computed\_egress\_with\_source\_security\_group\_id) | List of computed egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_cidr\_blocks](#input\_computed\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all computed ingress rules | `list(string)` | `[]` | no | @@ -65,6 +66,7 @@ No resources. | [computed\_ingress\_rules](#input\_computed\_ingress\_rules) | List of computed ingress rules to create by name | `list(string)` | `[]` | no | | [computed\_ingress\_with\_cidr\_blocks](#input\_computed\_ingress\_with\_cidr\_blocks) | List of computed ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | List of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [computed\_ingress\_with\_prefix\_list\_ids](#input\_computed\_ingress\_with\_prefix\_list\_ids) | List of computed ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_self](#input\_computed\_ingress\_with\_self) | List of computed ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [computed\_ingress\_with\_source\_security\_group\_id](#input\_computed\_ingress\_with\_source\_security\_group\_id) | List of computed ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [create](#input\_create) | Whether to create security group and all rules | `bool` | `true` | no | @@ -75,6 +77,7 @@ No resources. | [egress\_rules](#input\_egress\_rules) | List of egress rules to create by name | `list(string)` | `[]` | no | | [egress\_with\_cidr\_blocks](#input\_egress\_with\_cidr\_blocks) | List of egress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [egress\_with\_ipv6\_cidr\_blocks](#input\_egress\_with\_ipv6\_cidr\_blocks) | List of egress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [egress\_with\_prefix\_list\_ids](#input\_egress\_with\_prefix\_list\_ids) | List of egress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [egress\_with\_self](#input\_egress\_with\_self) | List of egress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [egress\_with\_source\_security\_group\_id](#input\_egress\_with\_source\_security\_group\_id) | List of egress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | List of IPv4 CIDR ranges to use on all ingress rules | `list(string)` | `[]` | no | @@ -83,6 +86,7 @@ No resources. | [ingress\_rules](#input\_ingress\_rules) | List of ingress rules to create by name | `list(string)` | `[]` | no | | [ingress\_with\_cidr\_blocks](#input\_ingress\_with\_cidr\_blocks) | List of ingress rules to create where 'cidr\_blocks' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_ipv6\_cidr\_blocks](#input\_ingress\_with\_ipv6\_cidr\_blocks) | List of ingress rules to create where 'ipv6\_cidr\_blocks' is used | `list(map(string))` | `[]` | no | +| [ingress\_with\_prefix\_list\_ids](#input\_ingress\_with\_prefix\_list\_ids) | List of ingress rules to create where 'prefix\_list\_ids' is used | `list(map(string))` | `[]` | no | | [ingress\_with\_self](#input\_ingress\_with\_self) | List of ingress rules to create where 'self' is defined | `list(map(string))` | `[]` | no | | [ingress\_with\_source\_security\_group\_id](#input\_ingress\_with\_source\_security\_group\_id) | List of ingress rules to create where 'source\_security\_group\_id' is used | `list(map(string))` | `[]` | no | | [name](#input\_name) | Name of security group | `string` | n/a | yes | @@ -92,6 +96,7 @@ No resources. | [number\_of\_computed\_egress\_rules](#input\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_cidr\_blocks) | Number of computed egress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_egress\_with\_ipv6\_cidr\_blocks) | Number of computed egress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_egress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_egress\_with\_prefix\_list\_ids) | Number of computed egress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_self](#input\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_egress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_egress\_with\_source\_security\_group\_id) | Number of computed egress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_cidr\_blocks) | Number of IPv4 CIDR ranges to use on all computed ingress rules | `number` | `0` | no | @@ -100,6 +105,7 @@ No resources. | [number\_of\_computed\_ingress\_rules](#input\_number\_of\_computed\_ingress\_rules) | Number of computed ingress rules to create by name | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_cidr\_blocks) | Number of computed ingress rules to create where 'cidr\_blocks' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks](#input\_number\_of\_computed\_ingress\_with\_ipv6\_cidr\_blocks) | Number of computed ingress rules to create where 'ipv6\_cidr\_blocks' is used | `number` | `0` | no | +| [number\_of\_computed\_ingress\_with\_prefix\_list\_ids](#input\_number\_of\_computed\_ingress\_with\_prefix\_list\_ids) | Number of computed ingress rules to create where 'prefix\_list\_ids' is used | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_self](#input\_number\_of\_computed\_ingress\_with\_self) | Number of computed ingress rules to create where 'self' is defined | `number` | `0` | no | | [number\_of\_computed\_ingress\_with\_source\_security\_group\_id](#input\_number\_of\_computed\_ingress\_with\_source\_security\_group\_id) | Number of computed ingress rules to create where 'source\_security\_group\_id' is used | `number` | `0` | no | | [revoke\_rules\_on\_delete](#input\_revoke\_rules\_on\_delete) | Instruct Terraform to revoke all of the Security Groups attached ingress and egress rules before deleting the rule itself. Enable for EMR. | `bool` | `false` | no | diff --git a/modules/zookeeper/main.tf b/modules/zookeeper/main.tf index 758bb7bc..80ea0adb 100644 --- a/modules/zookeeper/main.tf +++ b/modules/zookeeper/main.tf @@ -27,6 +27,9 @@ module "sg" { # Open for security group id ingress_with_source_security_group_id = var.ingress_with_source_security_group_id + # Open for prefix list id + ingress_with_prefix_list_ids = var.ingress_with_prefix_list_ids + # Default ingress CIDR blocks ingress_cidr_blocks = var.ingress_cidr_blocks ingress_ipv6_cidr_blocks = var.ingress_ipv6_cidr_blocks @@ -52,6 +55,9 @@ module "sg" { # Open for security group id computed_ingress_with_source_security_group_id = var.computed_ingress_with_source_security_group_id + # Open for prefix list id + computed_ingress_with_prefix_list_ids = var.computed_ingress_with_prefix_list_ids + ############################# # Number of computed ingress ############################# @@ -60,6 +66,7 @@ module "sg" { number_of_computed_ingress_with_cidr_blocks = var.number_of_computed_ingress_with_cidr_blocks number_of_computed_ingress_with_ipv6_cidr_blocks = var.number_of_computed_ingress_with_ipv6_cidr_blocks number_of_computed_ingress_with_source_security_group_id = var.number_of_computed_ingress_with_source_security_group_id + number_of_computed_ingress_with_prefix_list_ids = var.number_of_computed_ingress_with_prefix_list_ids ######### # Egress @@ -79,6 +86,9 @@ module "sg" { # Open for security group id egress_with_source_security_group_id = var.egress_with_source_security_group_id + # Open for prefix list id + egress_with_prefix_list_ids = var.egress_with_prefix_list_ids + # Default egress CIDR blocks egress_cidr_blocks = var.egress_cidr_blocks egress_ipv6_cidr_blocks = var.egress_ipv6_cidr_blocks @@ -104,6 +114,9 @@ module "sg" { # Open for security group id computed_egress_with_source_security_group_id = var.computed_egress_with_source_security_group_id + # Open for prefix list id + computed_egress_with_prefix_list_ids = var.computed_egress_with_prefix_list_ids + ############################# # Number of computed egress ############################# @@ -112,4 +125,5 @@ module "sg" { number_of_computed_egress_with_cidr_blocks = var.number_of_computed_egress_with_cidr_blocks number_of_computed_egress_with_ipv6_cidr_blocks = var.number_of_computed_egress_with_ipv6_cidr_blocks number_of_computed_egress_with_source_security_group_id = var.number_of_computed_egress_with_source_security_group_id + number_of_computed_egress_with_prefix_list_ids = var.number_of_computed_egress_with_prefix_list_ids } diff --git a/modules/zookeeper/variables.tf b/modules/zookeeper/variables.tf index 4d331561..60c8c27b 100644 --- a/modules/zookeeper/variables.tf +++ b/modules/zookeeper/variables.tf @@ -74,6 +74,12 @@ variable "ingress_with_source_security_group_id" { default = [] } +variable "ingress_with_prefix_list_ids" { + description = "List of ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all ingress rules" type = list(string) @@ -125,6 +131,12 @@ variable "computed_ingress_with_source_security_group_id" { default = [] } +variable "computed_ingress_with_prefix_list_ids" { + description = "List of computed ingress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_ingress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed ingress rules" type = list(string) @@ -176,6 +188,12 @@ variable "number_of_computed_ingress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_ingress_with_prefix_list_ids" { + description = "Number of computed ingress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_ingress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed ingress rules" type = number @@ -227,6 +245,12 @@ variable "egress_with_source_security_group_id" { default = [] } +variable "egress_with_prefix_list_ids" { + description = "List of egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all egress rules" type = list(string) @@ -278,6 +302,12 @@ variable "computed_egress_with_source_security_group_id" { default = [] } +variable "computed_egress_with_prefix_list_ids" { + description = "List of computed egress rules to create where 'prefix_list_ids' is used" + type = list(map(string)) + default = [] +} + variable "computed_egress_cidr_blocks" { description = "List of IPv4 CIDR ranges to use on all computed egress rules" type = list(string) @@ -329,6 +359,12 @@ variable "number_of_computed_egress_with_source_security_group_id" { default = 0 } +variable "number_of_computed_egress_with_prefix_list_ids" { + description = "Number of computed egress rules to create where 'prefix_list_ids' is used" + type = number + default = 0 +} + variable "number_of_computed_egress_cidr_blocks" { description = "Number of IPv4 CIDR ranges to use on all computed egress rules" type = number From 5f17f4d0faaa9b6ce17afe886d60a44eecb2d7fc Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Mon, 5 Jun 2023 17:20:56 -0700 Subject: [PATCH 6/6] Fixed EOF --- modules/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/README.md b/modules/README.md index 02eb3534..2708a2e6 100644 --- a/modules/README.md +++ b/modules/README.md @@ -60,4 +60,3 @@ List of Security Groups implemented as Terraform modules * [zipkin](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/zipkin) * [zookeeper](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/zookeeper) * [_templates](https://github.com/terraform-aws-modules/terraform-aws-security-group/tree/master/modules/_templates) - Source templates for all other modules. Change carefully, test thoughtfully! -