From 5f19930317922be26140e74e2b40584a2facf5f0 Mon Sep 17 00:00:00 2001 From: piravinth Date: Wed, 3 Jun 2026 18:53:10 +0100 Subject: [PATCH 1/2] intro nwfw module --- .../modules/network-firewall/context.tf | 374 ++++++++++++++++++ .../modules/network-firewall/locals.tf | 40 ++ .../modules/network-firewall/main.tf | 77 ++++ .../modules/network-firewall/outputs.tf | 61 +++ .../modules/network-firewall/readme.md | 43 ++ .../modules/network-firewall/variables.tf | 196 +++++++++ .../modules/network-firewall/versions.tf | 10 + 7 files changed, 801 insertions(+) create mode 100644 infrastructure/modules/network-firewall/context.tf create mode 100644 infrastructure/modules/network-firewall/locals.tf create mode 100644 infrastructure/modules/network-firewall/main.tf create mode 100644 infrastructure/modules/network-firewall/outputs.tf create mode 100644 infrastructure/modules/network-firewall/readme.md create mode 100644 infrastructure/modules/network-firewall/variables.tf create mode 100644 infrastructure/modules/network-firewall/versions.tf diff --git a/infrastructure/modules/network-firewall/context.tf b/infrastructure/modules/network-firewall/context.tf new file mode 100644 index 0000000..4702770 --- /dev/null +++ b/infrastructure/modules/network-firewall/context.tf @@ -0,0 +1,374 @@ +# +# ONLY EDIT THIS FILE IN github.com/NHSDigital/screening-terraform-modules-aws/infrastructure/modules/tags +# All other instances of this file should be a copy of that one +# +# +# Copy this file from https://github.com/NHSDigital/screening-terraform-modules-aws/blob/master/infrastructure/modules/tags/exports/context.tf +# and then place it in your Terraform module to automatically get +# tag module standard configuration inputs suitable for passing +# to other modules. +# +# curl -sL https://raw.githubusercontent.com/NHSDigital/screening-terraform-modules-aws/master/infrastructure/modules/tags/exports/context.tf -o context.tf +# +# Modules should access the whole context as `module.this.context` +# to get the input variables with nulls for defaults, +# for example `context = module.this.context`, +# and access individual variables as `module.this.`, +# with final values filled in. +# +# For example, when using defaults, `module.this.context.delimiter` +# will be null, and `module.this.delimiter` will be `-` (hyphen). +# + +module "this" { + source = "git::https://github.com/NHSDigital/screening-terraform-modules-aws.git//infrastructure/modules/tags?ref=v2.6.0" + + service = var.service + project = var.project + region = var.region + environment = var.environment + stack = var.stack + workspace = var.workspace + name = var.name + delimiter = var.delimiter + attributes = var.attributes + tags = var.tags + additional_tag_map = var.additional_tag_map + label_order = var.label_order + regex_replace_chars = var.regex_replace_chars + id_length_limit = var.id_length_limit + label_key_case = var.label_key_case + label_value_case = var.label_value_case + terraform_source = coalesce(var.terraform_source, path.module) + descriptor_formats = var.descriptor_formats + labels_as_tags = var.labels_as_tags + + context = var.context +} + +# Copy contents of screening-terraform-modules-aws/tags/variables.tf here +# tflint-ignore: terraform_unused_declarations +variable "aws_region" { + type = string + description = "The AWS region" + default = "eu-west-2" + validation { + condition = contains(["eu-west-1", "eu-west-2", "us-east-1"], var.aws_region) + error_message = "AWS Region must be one of eu-west-1, eu-west-2, us-east-1" + } +} + +variable "context" { + type = any + default = { + enabled = true + service = null + project = null + region = null + environment = null + stack = null + workspace = null + name = null + delimiter = null + attributes = [] + tags = {} + additional_tag_map = {} + regex_replace_chars = null + label_order = [] + id_length_limit = null + label_key_case = null + label_value_case = null + terraform_source = null + descriptor_formats = {} + # Note: we have to use [] instead of null for unset lists due to + # https://github.com/hashicorp/terraform/issues/28137 + # which was not fixed until Terraform 1.0.0, + # but we want the default to be all the labels in `label_order` + # and we want users to be able to prevent all tag generation + # by setting `labels_as_tags` to `[]`, so we need + # a different sentinel to indicate "default" + labels_as_tags = ["unset"] + } + description = <<-EOT + Single object for setting entire context at once. + See description of individual variables for details. + Leave string and numeric variables as `null` to use default value. + Individual variable settings (non-null) override settings in context object, + except for attributes, tags, and additional_tag_map, which are merged. + EOT + + validation { + condition = lookup(var.context, "label_key_case", null) == null ? true : contains(["lower", "title", "upper"], var.context["label_key_case"]) + error_message = "Allowed values: `lower`, `title`, `upper`." + } + + validation { + condition = lookup(var.context, "label_value_case", null) == null ? true : contains(["lower", "title", "upper", "none"], var.context["label_value_case"]) + error_message = "Allowed values: `lower`, `title`, `upper`, `none`." + } +} + +variable "terraform_source" { + type = string + default = null + description = "Source location to record in the Terraform_source tag. Defaults to the caller module path when not set." +} + +variable "enabled" { + type = bool + default = null + description = "Set to false to prevent the module from creating any resources" +} + +variable "service" { + type = string + default = null + description = "ID element. Usually an abbreviation of your service directorate name, e.g. 'bcss' or 'csms', to help ensure generated IDs are globally unique" +} + +variable "region" { + type = string + default = null + description = "ID element _(Rarely used, not included by default)_. Usually an abbreviation of the selected AWS region e.g. 'uw2', 'ew2' or 'gbl' for resources like IAM roles that have no region" +} + +variable "project" { + type = string + default = null + description = "ID element. A project identifier, indicating the name or role of the project the resource is for, such as `website` or `api`" +} +variable "stack" { + type = string + default = null + description = "ID element. The name of the stack/component, e.g. `database`, `web`, `waf`, `eks`" +} +variable "workspace" { + type = string + default = null + description = "ID element. The Terraform workspace, to help ensure generated IDs are unique across workspaces" +} +variable "environment" { + type = string + default = null + description = "ID element. Usually used to indicate role, e.g. 'prd', 'dev', 'test', 'preprod', 'prod', 'uat'" +} + +variable "name" { + type = string + default = null + description = <<-EOT + ID element. Usually the component or solution name, e.g. 'app' or 'jenkins'. + This is the only ID element not also included as a `tag`. + The "name" tag is set to the full `id` string. There is no tag with the value of the `name` input. + EOT +} + +variable "delimiter" { + type = string + default = null + description = <<-EOT + Delimiter to be used between ID elements. + Defaults to `-` (hyphen). Set to `""` to use no delimiter at all. + EOT +} + +variable "attributes" { + type = list(string) + default = [] + description = <<-EOT + ID element. Additional attributes (e.g. `workers` or `cluster`) to add to `id`, + in the order they appear in the list. New attributes are appended to the + end of the list. The elements of the list are joined by the `delimiter` + and treated as a single ID element. + EOT +} + +variable "labels_as_tags" { + type = set(string) + default = ["default"] + description = <<-EOT + Set of labels (ID elements) to include as tags in the `tags` output. + Default is to include all labels. + Tags with empty values will not be included in the `tags` output. + Set to `[]` to suppress all generated tags. + **Notes:** + The value of the `name` tag, if included, will be the `id`, not the `name`. + Unlike other `null-label` inputs, the initial setting of `labels_as_tags` cannot be + changed in later chained modules. Attempts to change it will be silently ignored. + EOT +} + +variable "tags" { + type = map(string) + default = {} + description = <<-EOT + Additional tags (e.g. `{'BusinessUnit': 'XYZ'}`). + Neither the tag keys nor the tag values will be modified by this module. + EOT +} + +variable "additional_tag_map" { + type = map(string) + default = {} + description = <<-EOT + Additional key-value pairs to add to each map in `tags_as_list_of_maps`. Not added to `tags` or `id`. + This is for some rare cases where resources want additional configuration of tags + and therefore take a list of maps with tag key, value, and additional configuration. + EOT +} + +variable "label_order" { + type = list(string) + default = null + description = <<-EOT + The order in which the labels (ID elements) appear in the `id`. + Defaults to ["namespace", "environment", "stage", "name", "attributes"]. + You can omit any of the 6 labels ("tenant" is the 6th), but at least one must be present. + EOT +} + +variable "regex_replace_chars" { + type = string + default = null + description = <<-EOT + Terraform regular expression (regex) string. + Characters matching the regex will be removed from the ID elements. + If not set, `"/[^a-zA-Z0-9-]/"` is used to remove all characters other than hyphens, letters and digits. + EOT +} + +variable "id_length_limit" { + type = number + default = null + description = <<-EOT + Limit `id` to this many characters (minimum 6). + Set to `0` for unlimited length. + Set to `null` for keep the existing setting, which defaults to `0`. + Does not affect `id_full`. + EOT + validation { + condition = var.id_length_limit == null ? true : var.id_length_limit >= 6 || var.id_length_limit == 0 + error_message = "The id_length_limit must be >= 6 if supplied (not null), or 0 for unlimited length." + } +} + +variable "label_key_case" { + type = string + default = null + description = <<-EOT + Controls the letter case of the `tags` keys (label names) for tags generated by this module. + Does not affect keys of tags passed in via the `tags` input. + Possible values: `lower`, `title`, `upper`. + Default value: `title`. + EOT + + validation { + condition = var.label_key_case == null ? true : contains(["lower", "title", "upper"], var.label_key_case) + error_message = "Allowed values: `lower`, `title`, `upper`." + } +} + +variable "label_value_case" { + type = string + default = null + description = <<-EOT + Controls the letter case of ID elements (labels) as included in `id`, + set as tag values, and output by this module individually. + Does not affect values of tags passed in via the `tags` input. + Possible values: `lower`, `title`, `upper` and `none` (no transformation). + Set this to `title` and set `delimiter` to `""` to yield Pascal Case IDs. + Default value: `lower`. + EOT + + validation { + condition = var.label_value_case == null ? true : contains(["lower", "title", "upper", "none"], var.label_value_case) + error_message = "Allowed values: `lower`, `title`, `upper`, `none`." + } +} + +variable "descriptor_formats" { + type = any + default = {} + description = <<-EOT + Describe additional descriptors to be output in the `descriptors` output map. + Map of maps. Keys are names of descriptors. Values are maps of the form + `{ + format = string + labels = list(string) + }` + (Type is `any` so the map values can later be enhanced to provide additional options.) + `format` is a Terraform format string to be passed to the `format()` function. + `labels` is a list of labels, in order, to pass to `format()` function. + Label values will be normalized before being passed to `format()` so they will be + identical to how they appear in `id`. + Default is `{}` (`descriptors` output will be empty). + EOT +} + +variable "owner" { + type = string + description = "The name and or NHS.net email address of the service owner" + default = "None" +} + +variable "tag_version" { + type = string + description = "Used to identify the tagging version in use" + default = "1.0" +} + +variable "data_classification" { + type = string + description = "Used to identify the data classification of the resource, e.g 1-5" + default = "n/a" + validation { + condition = contains(["n/a", "1", "2", "3", "4", "5"], var.data_classification) + error_message = "Data Classification must be \"n/a\" or between 1-5" + } +} + +variable "data_type" { + type = string + description = "The tag data_type" + default = "None" + validation { + condition = contains(["None", "PCD", "PID", "Anonymised", "UserAccount", "Audit"], var.data_type) + error_message = "Data Type must be one of None, PCD, PID, Anonymised, UserAccount, Audit" + } +} + + +variable "public_facing" { + type = bool + description = "Whether this resource is public facing" + default = false +} + +variable "service_category" { + type = string + description = "The tag service_category" + default = "n/a" + validation { + condition = contains(["n/a", "Bronze", "Silver", "Gold", "Platinum"], var.service_category) + error_message = "The Service Category must be one of n/a, Bronze, Silver, Gold, Platinum" + } +} +variable "on_off_pattern" { + type = string + description = "Used to turn resources on and off based on a time pattern" + default = "n/a" +} + +variable "application_role" { + type = string + description = "The role the application is performing" + default = "General" +} + +variable "tool" { + type = string + description = "The tool used to deploy the resource" + default = "Terraform" +} + +#### End of copy of screening-terraform-modules-aws/tags/variables.tf diff --git a/infrastructure/modules/network-firewall/locals.tf b/infrastructure/modules/network-firewall/locals.tf new file mode 100644 index 0000000..de66154 --- /dev/null +++ b/infrastructure/modules/network-firewall/locals.tf @@ -0,0 +1,40 @@ +locals { + # Build the subnet_mapping from the firewall subnet IDs provided + # by the VPC module. + subnet_mapping = { for idx, subnet_id in var.firewall_subnet_ids : + "subnet-${idx}" => { + subnet_id = subnet_id + ip_address_type = "IPV4" + } + } + + # KMS encryption configuration for the firewall and policy. + + encryption_configuration = var.kms_key_arn != null ? { + key_id = var.kms_key_arn + type = "CUSTOMER_KMS" + } : null + + # ---------------------------------------------------------------- + # Logging configuration + # ---------------------------------------------------------------- + alert_log_config = var.create_alert_log ? [{ + log_destination = { + logGroup = aws_cloudwatch_log_group.alert[0].name + } + log_destination_type = "CloudWatchLogs" + log_type = "ALERT" + }] : [] + + flow_log_config = var.flow_log_s3_bucket_name != null ? [{ + log_destination = { + bucketName = var.flow_log_s3_bucket_name + prefix = coalesce(var.flow_log_s3_prefix, module.this.id) + } + log_destination_type = "S3" + log_type = "FLOW" + }] : [] + + logging_config = concat(local.alert_log_config, local.flow_log_config) + create_logging = length(local.logging_config) > 0 +} diff --git a/infrastructure/modules/network-firewall/main.tf b/infrastructure/modules/network-firewall/main.tf new file mode 100644 index 0000000..be6b9c1 --- /dev/null +++ b/infrastructure/modules/network-firewall/main.tf @@ -0,0 +1,77 @@ +################################################################ +# Network Firewall Module +# +# Screening wrapper around the +# `terraform-aws-modules/network-firewall/aws` upstream module +# +# Deploys an AWS Network Firewall into the dedicated firewall +# subnets created by the VPC module + +# Naming and tagging are derived from context.tf via module.this. +################################################################ + +module "network_firewall" { + source = "terraform-aws-modules/network-firewall/aws" + version = "2.1.0" + + create = module.this.enabled + + # ------------------------------------------------------------------ + # Firewall + # ------------------------------------------------------------------ + name = module.this.id + description = var.description + + vpc_id = var.vpc_id + subnet_mapping = local.subnet_mapping + + delete_protection = var.delete_protection + subnet_change_protection = var.subnet_change_protection + firewall_policy_change_protection = var.firewall_policy_change_protection + enabled_analysis_types = var.enabled_analysis_types + encryption_configuration = local.encryption_configuration + + # ------------------------------------------------------------------ + # Logging + # ------------------------------------------------------------------ + create_logging_configuration = local.create_logging + logging_configuration_destination_config = local.create_logging ? local.logging_config : null + + # ------------------------------------------------------------------ + # Policy + # ------------------------------------------------------------------ + create_policy = var.create_policy + firewall_policy_arn = var.firewall_policy_arn + + policy_name = module.this.id + policy_description = coalesce(var.description, "Firewall policy for ${module.this.id}") + policy_encryption_configuration = local.encryption_configuration + policy_variables = var.policy_variables + policy_stateful_default_actions = var.policy_stateful_default_actions + policy_stateful_engine_options = var.policy_stateful_engine_options + policy_stateful_rule_group_reference = var.policy_stateful_rule_group_reference + policy_stateless_default_actions = var.policy_stateless_default_actions + policy_stateless_fragment_default_actions = var.policy_stateless_fragment_default_actions + policy_stateless_rule_group_reference = var.policy_stateless_rule_group_reference + policy_stateless_custom_action = var.policy_stateless_custom_action + + tags = module.this.tags +} + +################################################################ +# CloudWatch Log Group for ALERT logs +# +# Created as a standalone resource so that the log group +# lifecycle (retention, encryption) is managed by this module +# rather than being implicit within the firewall. +################################################################ + +resource "aws_cloudwatch_log_group" "alert" { + count = module.this.enabled && var.create_alert_log ? 1 : 0 + + name = "/aws/network-firewall/${module.this.id}" + retention_in_days = var.alert_log_retention_in_days + kms_key_id = var.alert_log_kms_key_id + + tags = module.this.tags +} diff --git a/infrastructure/modules/network-firewall/outputs.tf b/infrastructure/modules/network-firewall/outputs.tf new file mode 100644 index 0000000..d84cf66 --- /dev/null +++ b/infrastructure/modules/network-firewall/outputs.tf @@ -0,0 +1,61 @@ +################################################################ +# Firewall +################################################################ + +output "firewall_arn" { + description = "The ARN of the Network Firewall." + value = try(module.network_firewall.arn, null) +} + +output "firewall_id" { + description = "The ARN that identifies the firewall (same as arn)." + value = try(module.network_firewall.id, null) +} + +output "firewall_status" { + description = "Nested list of information about the current status of the firewall." + value = try(module.network_firewall.status, null) +} + +output "firewall_update_token" { + description = "A string token used when updating the firewall." + value = try(module.network_firewall.update_token, null) +} + +################################################################ +# Logging +################################################################ + +output "logging_configuration_id" { + description = "The ARN of the associated firewall logging configuration." + value = try(module.network_firewall.logging_configuration_id, null) +} + +output "alert_log_group_arn" { + description = "The ARN of the CloudWatch Log Group for ALERT logs." + value = try(aws_cloudwatch_log_group.alert[0].arn, null) +} + +output "alert_log_group_name" { + description = "The name of the CloudWatch Log Group for ALERT logs." + value = try(aws_cloudwatch_log_group.alert[0].name, null) +} + +################################################################ +# Policy +################################################################ + +output "policy_arn" { + description = "The ARN of the firewall policy." + value = try(module.network_firewall.policy_arn, null) +} + +output "policy_id" { + description = "The ARN that identifies the firewall policy." + value = try(module.network_firewall.policy_id, null) +} + +output "policy_update_token" { + description = "A string token used when updating the firewall policy." + value = try(module.network_firewall.policy_update_token, null) +} diff --git a/infrastructure/modules/network-firewall/readme.md b/infrastructure/modules/network-firewall/readme.md new file mode 100644 index 0000000..b78a606 --- /dev/null +++ b/infrastructure/modules/network-firewall/readme.md @@ -0,0 +1,43 @@ +# AWS Network Firewall Terraform module + +Terraform module to provision an [AWS Network Firewall](https://aws.amazon.com/network-firewall/) integrated with the VPC module's dedicated firewall subnets. + +## Usage + +```hcl + module "network_firewall" { + source = "git::https://github.com/NHSDigital/screening-terraform-modules-aws.git//infrastructure/modules/network-firewall" + + service = "bcss" + project = "bcss" + environment = "dev" + stack = "shared-resources" + workspace = terraform.workspace + name = "nwfw" + + vpc_id = module.vpc.vpc_id + firewall_subnet_ids = module.vpc.firewall_subnet_ids + + # Encryption (optional — from the kms module) + kms_key_arn = module.nwfw_kms.key_arn + alert_log_kms_key_id = module.nwfw_kms.key_arn + + # FLOW logs to S3 (optional — from the s3-bucket module) + flow_log_s3_bucket_name = module.logs_bucket.s3_bucket_id + + # Policy — rule groups are passed by arn + policy_stateful_rule_group_reference = { + deny_domains = { + priority = 1 + resource_arn = aws_networkfirewall_rule_group.deny_domains.arn + } + } + } +``` + + + + + + + diff --git a/infrastructure/modules/network-firewall/variables.tf b/infrastructure/modules/network-firewall/variables.tf new file mode 100644 index 0000000..214fbde --- /dev/null +++ b/infrastructure/modules/network-firewall/variables.tf @@ -0,0 +1,196 @@ +################################################################ +# Network Firewall-specific inputs. +# +# Naming, tagging and the master `enabled` switch come from +# `context.tf` via `module.this`. +################################################################ + +################################################################ +# VPC / subnets +################################################################ + +variable "vpc_id" { + description = "The ID of the VPC where the Network Firewall will be deployed." + type = string +} + +variable "firewall_subnet_ids" { + description = "List of firewall subnet IDs (one per AZ) from the VPC module." + type = list(string) +} + +################################################################ +# Firewall settings +################################################################ + +variable "description" { + description = "A friendly description of the firewall." + type = string + default = "" +} + +variable "delete_protection" { + description = "Prevent accidental deletion of the firewall." + type = bool + default = true +} + +variable "subnet_change_protection" { + description = "Prevent changes to the associated subnets." + type = bool + default = true +} + +variable "firewall_policy_change_protection" { + description = "Prevent changes to the associated firewall policy." + type = bool + default = false +} + +variable "enabled_analysis_types" { + description = "Types for which to collect analysis metrics. Valid values: TLS_SNI, HTTP_HOST." + type = list(string) + default = null +} + +################################################################ +# Encryption (KMS) +################################################################ + +variable "kms_key_arn" { + description = "ARN of a KMS key to encrypt the firewall and its policy. Leave null for AWS-managed encryption." + type = string + default = null +} + +################################################################ +# Logging — ALERT (CloudWatch) +################################################################ + +variable "create_alert_log" { + description = "Create a CloudWatch Log Group for ALERT logs." + type = bool + default = true +} + +variable "alert_log_retention_in_days" { + description = "Number of days to retain alert logs in CloudWatch." + type = number + default = 365 +} + +variable "alert_log_kms_key_id" { + description = "ARN of a KMS key to encrypt the CloudWatch alert log group. Leave null for no encryption." + type = string + default = null +} + +################################################################ +# Logging — FLOW (S3) +################################################################ + +variable "flow_log_s3_bucket_name" { + description = "Name of the S3 bucket for FLOW logs. Leave null to disable S3 flow logging." + type = string + default = null +} + +variable "flow_log_s3_prefix" { + description = "S3 key prefix for flow logs. Defaults to the module ID." + type = string + default = null +} + +################################################################ +# Firewall policy +################################################################ + +variable "create_policy" { + description = "Create the firewall policy. Set to false and supply firewall_policy_arn to use an externally managed policy." + type = bool + default = true +} + +variable "firewall_policy_arn" { + description = "ARN of an externally managed firewall policy. Only used when create_policy is false." + type = string + default = "" +} + +variable "policy_stateless_default_actions" { + description = "Actions for packets that match no stateless rules. Default forwards all traffic to the stateful engine." + type = list(string) + default = ["aws:forward_to_sfe"] +} + +variable "policy_stateless_fragment_default_actions" { + description = "Actions for fragmented packets that match no stateless rules." + type = list(string) + default = ["aws:forward_to_sfe"] +} + +variable "policy_stateful_default_actions" { + description = "Actions for packets that match no stateful rules. Only valid with STRICT_ORDER rule order." + type = list(string) + default = null +} + +variable "policy_stateful_engine_options" { + description = "Stateful engine options (rule_order, stream_exception_policy, flow_timeouts)." + type = object({ + flow_timeouts = optional(object({ + tcp_idle_timeout_seconds = optional(number) + })) + rule_order = optional(string) + stream_exception_policy = optional(string) + }) + default = null +} + +variable "policy_stateful_rule_group_reference" { + description = "Map of stateful rule group references for the policy." + type = map(object({ + deep_threat_inspection = optional(bool) + override = optional(object({ + action = optional(string) + })) + priority = optional(number) + resource_arn = string + })) + default = null +} + +variable "policy_stateless_rule_group_reference" { + description = "Map of stateless rule group references for the policy." + type = map(object({ + priority = number + resource_arn = string + })) + default = null +} + +variable "policy_stateless_custom_action" { + description = "Custom action definitions for the firewall policy's stateless default actions." + type = map(object({ + action_definition = object({ + publish_metric_action = optional(object({ + dimension = optional(string) + })) + }) + action_name = string + })) + default = null +} + +variable "policy_variables" { + description = "Variables to override default Suricata settings in the firewall policy." + type = object({ + rule_variables = list(object({ + ip_set = optional(object({ + definition = list(string) + })) + key = string + })) + }) + default = null +} diff --git a/infrastructure/modules/network-firewall/versions.tf b/infrastructure/modules/network-firewall/versions.tf new file mode 100644 index 0000000..ad55bb5 --- /dev/null +++ b/infrastructure/modules/network-firewall/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 1.5.7" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 6.28, < 7.0" + } + } +} From 8918fb1fb4462789078341c17a4fd315e5cdf28d Mon Sep 17 00:00:00 2001 From: piravinth Date: Wed, 3 Jun 2026 18:55:13 +0100 Subject: [PATCH 2/2] fmt terraform --- .../modules/network-firewall/locals.tf | 4 ++-- .../modules/network-firewall/main.tf | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/infrastructure/modules/network-firewall/locals.tf b/infrastructure/modules/network-firewall/locals.tf index de66154..18292b4 100644 --- a/infrastructure/modules/network-firewall/locals.tf +++ b/infrastructure/modules/network-firewall/locals.tf @@ -35,6 +35,6 @@ locals { log_type = "FLOW" }] : [] - logging_config = concat(local.alert_log_config, local.flow_log_config) - create_logging = length(local.logging_config) > 0 + logging_config = concat(local.alert_log_config, local.flow_log_config) + create_logging = length(local.logging_config) > 0 } diff --git a/infrastructure/modules/network-firewall/main.tf b/infrastructure/modules/network-firewall/main.tf index be6b9c1..09e92ce 100644 --- a/infrastructure/modules/network-firewall/main.tf +++ b/infrastructure/modules/network-firewall/main.tf @@ -40,20 +40,20 @@ module "network_firewall" { # ------------------------------------------------------------------ # Policy # ------------------------------------------------------------------ - create_policy = var.create_policy + create_policy = var.create_policy firewall_policy_arn = var.firewall_policy_arn - policy_name = module.this.id - policy_description = coalesce(var.description, "Firewall policy for ${module.this.id}") - policy_encryption_configuration = local.encryption_configuration - policy_variables = var.policy_variables - policy_stateful_default_actions = var.policy_stateful_default_actions - policy_stateful_engine_options = var.policy_stateful_engine_options - policy_stateful_rule_group_reference = var.policy_stateful_rule_group_reference - policy_stateless_default_actions = var.policy_stateless_default_actions + policy_name = module.this.id + policy_description = coalesce(var.description, "Firewall policy for ${module.this.id}") + policy_encryption_configuration = local.encryption_configuration + policy_variables = var.policy_variables + policy_stateful_default_actions = var.policy_stateful_default_actions + policy_stateful_engine_options = var.policy_stateful_engine_options + policy_stateful_rule_group_reference = var.policy_stateful_rule_group_reference + policy_stateless_default_actions = var.policy_stateless_default_actions policy_stateless_fragment_default_actions = var.policy_stateless_fragment_default_actions - policy_stateless_rule_group_reference = var.policy_stateless_rule_group_reference - policy_stateless_custom_action = var.policy_stateless_custom_action + policy_stateless_rule_group_reference = var.policy_stateless_rule_group_reference + policy_stateless_custom_action = var.policy_stateless_custom_action tags = module.this.tags }