From 640a5fe39c324423ae2b4ec1b0183a3e95754ece Mon Sep 17 00:00:00 2001
From: Simone Ruffilli <sruffilli@google.com>
Date: Fri, 31 Dec 2021 12:20:42 +0100
Subject: [PATCH] Org/Folder: Allow for policy association when using rule
 factory (#405)

* Org/Folder: Allow for policy association when using rule factory

* Fix linting issue
---
 modules/folder/README.md        | 9 +++++++--
 modules/folder/outputs.tf       | 2 +-
 modules/organization/README.md  | 9 +++++++--
 modules/organization/outputs.tf | 2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/folder/README.md b/modules/folder/README.md
index 2f9d09345..10a1e990c 100644
--- a/modules/folder/README.md
+++ b/modules/folder/README.md
@@ -57,10 +57,13 @@ module "folder" {
   parent = "organizations/1234567890"
   name  = "Folder name"
   firewall_policy_factory = {
-    cidr_file   = "data/cidrs.yaml
+    cidr_file   = "data/cidrs.yaml"
     policy_name = null
     rules_file  = "data/rules.yaml"
   }
+  firewall_policy_attachments = {
+    factory-policy = module.folder.firewall_policy_id["factory"]
+  }
 }
 # tftest:skip
 ```
@@ -70,7 +73,7 @@ module "folder" {
 
 rfc1918:
   - 10.0.0.0/8
-  - 172.168.0.0/12
+  - 172.16.0.0/12
   - 192.168.0.0/16
 ```
 
@@ -220,6 +223,7 @@ module "folder2" {
 ```
 
 
+
 <!-- BEGIN TFDOC -->
 
 ## Variables
@@ -254,3 +258,4 @@ module "folder2" {
 
 <!-- END TFDOC -->
 
+
diff --git a/modules/folder/outputs.tf b/modules/folder/outputs.tf
index f095a3679..8e1a9f0b5 100644
--- a/modules/folder/outputs.tf
+++ b/modules/folder/outputs.tf
@@ -24,7 +24,7 @@ output "firewall_policies" {
 output "firewall_policy_id" {
   description = "Map of firewall policy ids created in this folder."
   value = {
-    for name, _ in var.firewall_policies :
+    for name, _ in local.firewall_policies :
     name => google_compute_organization_security_policy.policy[name].id
   }
 }
diff --git a/modules/organization/README.md b/modules/organization/README.md
index e3182b565..d0956d47d 100644
--- a/modules/organization/README.md
+++ b/modules/organization/README.md
@@ -93,10 +93,13 @@ module "org" {
   source          = "./modules/organization"
   organization_id = var.organization_id
   firewall_policy_factory = {
-    cidr_file   = "data/cidrs.yaml
+    cidr_file   = "data/cidrs.yaml"
     policy_name = null
     rules_file  = "data/rules.yaml"
   }
+  firewall_policy_attachments = {
+    factory-policy = module.org.firewall_policy_id["factory"]
+  }
 }
 # tftest:skip
 ```
@@ -106,7 +109,7 @@ module "org" {
 
 rfc1918:
   - 10.0.0.0/8
-  - 172.168.0.0/12
+  - 172.16.0.0/12
   - 192.168.0.0/16
 ```
 
@@ -236,6 +239,7 @@ module "org" {
 ```
 
 
+
 <!-- BEGIN TFDOC -->
 
 ## Variables
@@ -273,3 +277,4 @@ module "org" {
 
 <!-- END TFDOC -->
 
+
diff --git a/modules/organization/outputs.tf b/modules/organization/outputs.tf
index 5b685b571..3435242f9 100644
--- a/modules/organization/outputs.tf
+++ b/modules/organization/outputs.tf
@@ -44,7 +44,7 @@ output "firewall_policies" {
 output "firewall_policy_id" {
   description = "Map of firewall policy ids created in the organization."
   value = {
-    for name, _ in var.firewall_policies :
+    for name, _ in local.firewall_policies :
     name => google_compute_organization_security_policy.policy[name].id
   }
 }