Merge pull request #154 from oracle-quickstart/DR_MR_Feature

Modifed the Network Module
oci-landing-zones · Jan 19, 2024 · 996c6a9 · 996c6a9
2 parents f3450c2 + 07911c2
commit 996c6a9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/templates/elz-backup/elz-backup-environment/network.tf b/templates/elz-backup/elz-backup-environment/network.tf
@@ -40,8 +40,7 @@ module "network" {
   nfw_instance_name                       = var.nfw_instance_name
   nfw_instance_policy                     = var.nfw_instance_policy
   nfw_use_existing_network                = var.nfw_use_existing_network
-  //TO DO
-  #log_group_id                            = var.log_group_id
+  log_group_id                            = module.logging.log_group_id
 
   enable_nat_gateway_spoke                = var.enable_nat_gateway_spoke
   enable_service_gateway_spoke            = var.enable_service_gateway_spoke

diff --git a/templates/elz-backup/elz-backup-hub/main.tf b/templates/elz-backup/elz-backup-hub/main.tf
@@ -729,16 +729,15 @@ resource "oci_network_firewall_network_firewall_policy" "network_firewall_policy
 ###########     Create Firewall Firewall Threat and Traffic Log     ##########
 ##############################################################################
 // TO DO ONCE BACKUP LOGGING MODULE IS DONE
-/*
+
 module "firewall_threat_log_backup" {
   count  = var.enable_network_firewall && var.enable_traffic_threat_log ? 1 : 0
   source = "../../../modules/service-log-nfw"
 
   #service_log_map     = local.network_firewall_threat
   log_display_name    = local.firewall_threat_log.log_display_name
   log_type            = local.firewall_threat_log.log_type
-  //TO DO
-  #log_group_id        = var.log_group_id
+  log_group_id        = var.log_group_id
   log_source_category = local.firewall_threat_log.log_source_category
   log_source_resource = oci_network_firewall_network_firewall.network_firewall_backup[0].id
   log_source_service  = local.firewall_threat_log.log_source_service
@@ -755,8 +754,7 @@ module "firewall_traffic_log_backup" {
   #service_log_map      = local.network_firewall_traffic
   log_display_name     = local.firewall_traffic_log.log_display_name
   log_type             = local.firewall_traffic_log.log_type
-  //TO DO
-  #log_group_id         = var.log_group_id
+  log_group_id         = var.log_group_id
   log_source_category  = local.firewall_traffic_log.log_source_category
   log_source_resource  = oci_network_firewall_network_firewall.network_firewall_backup[0].id
   log_source_service   = local.firewall_traffic_log.log_source_service
@@ -765,4 +763,3 @@ module "firewall_traffic_log_backup" {
     oci = oci.backup_region
   }
 }
-*/
diff --git a/templates/elz-backup/elz-backup-hub/variables.tf b/templates/elz-backup/elz-backup-hub/variables.tf
@@ -205,10 +205,10 @@ variable "nfw_instance_policy" {
   type        = string
   description = "Network Firewall Policy Name."
 }
-#variable "log_group_id" {
-#  type        = string
-#  description = "Log Group OCID."
-#}
+variable "log_group_id" {
+  type        = string
+  description = "Log Group OCID."
+}
 variable "nfw_subnet_type" {
   type        = string
   description = "Network Firewall Subnet Type : Public or Private Subnet."

diff --git a/templates/elz-backup/elz-backup-network/main.tf b/templates/elz-backup/elz-backup-network/main.tf
@@ -72,7 +72,7 @@ module "hub_backup" {
   nfw_instance_name                       = var.nfw_instance_name
   nfw_instance_policy                     = var.nfw_instance_policy
   nfw_use_existing_network                = var.nfw_use_existing_network
-  #log_group_id                           = var.log_group_id
+  log_group_id                           = var.log_group_id
 
   providers = {
     oci               = oci

diff --git a/templates/elz-backup/elz-backup-network/variables.tf b/templates/elz-backup/elz-backup-network/variables.tf
@@ -182,10 +182,10 @@ variable "nfw_instance_policy" {
   type        = string
   description = "Network Firewall Policy Name."
 }
-#variable "log_group_id" {
-#  type        = string
-#  description = "Log Group OCID."
-#}
+variable "log_group_id" {
+  type        = string
+  description = "Log Group OCID."
+}
 variable "nfw_subnet_type"{
   type        = string
   description = "Network Firewall Subnet Type : Public or Private Subnet."