From ed4fc477a7f6390e9d97b150a282126f6f764fd0 Mon Sep 17 00:00:00 2001
From: Julio Castillo <jccb@google.com>
Date: Fri, 4 Feb 2022 15:50:05 +0100
Subject: [PATCH] Update resman outputs and projects

---
 fast/stages/01-resman/branch-networking.tf | 5 ++---
 fast/stages/01-resman/outputs.tf           | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fast/stages/01-resman/branch-networking.tf b/fast/stages/01-resman/branch-networking.tf
index ce4bc96d4..492030512 100644
--- a/fast/stages/01-resman/branch-networking.tf
+++ b/fast/stages/01-resman/branch-networking.tf
@@ -61,7 +61,7 @@ module "branch-network-gcs" {
 
 module "branch-network-prod-folder" {
   source = "../../../modules/folder"
-  parent = "organizations/${var.organization.id}"
+  parent = module.branch-network-folder.id
   name   = "prod"
   iam = {
     "roles/compute.xpnAdmin" = [
@@ -70,10 +70,9 @@ module "branch-network-prod-folder" {
   }
 }
 
-
 module "branch-network-dev-folder" {
   source = "../../../modules/folder"
-  parent = "organizations/${var.organization.id}"
+  parent = module.branch-network-folder.id
   name   = "dev"
   iam = {
     "roles/compute.xpnAdmin" = [
diff --git a/fast/stages/01-resman/outputs.tf b/fast/stages/01-resman/outputs.tf
index 62aed2892..d0077fa9f 100644
--- a/fast/stages/01-resman/outputs.tf
+++ b/fast/stages/01-resman/outputs.tf
@@ -53,7 +53,11 @@ locals {
   }
   tfvars = {
     "02-networking" = jsonencode({
-      folder_id          = module.branch-network-folder.id
+      folder_ids = {
+        networking      = module.branch-network-folder.id
+        networking-dev  = module.branch-network-dev-folder.id
+        networking-prod = module.branch-network-prod-folder.id
+      }
       project_factory_sa = local._project_factory_sas
     })
     "02-security" = jsonencode({