From 316c8f7b5a10dd44119dad8a3ead1a3a3219b21f Mon Sep 17 00:00:00 2001
From: Andrew Peabody <andrewpeabody@google.com>
Date: Tue, 19 Apr 2022 03:06:56 +0000
Subject: [PATCH] fix!: test/setup/outputs.folder_id returns folder_id

---
 examples/project-hierarchy/main.tf   | 4 ++--
 test/fixtures/fabric_project/main.tf | 2 +-
 test/setup/main.tf                   | 2 +-
 test/setup/outputs.tf                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/project-hierarchy/main.tf b/examples/project-hierarchy/main.tf
index 3ac9b563..439a2161 100644
--- a/examples/project-hierarchy/main.tf
+++ b/examples/project-hierarchy/main.tf
@@ -37,7 +37,7 @@ module "project-prod-gke" {
   name              = "hierarchy-sample-prod-gke"
   org_id            = var.organization_id
   billing_account   = var.billing_account
-  folder_id         = google_folder.prod.id
+  folder_id         = google_folder.prod.folder_id
 }
 
 module "project-factory" {
@@ -46,5 +46,5 @@ module "project-factory" {
   name              = "hierarchy-sample-factory"
   org_id            = var.organization_id
   billing_account   = var.billing_account
-  folder_id         = google_folder.prod.id
+  folder_id         = google_folder.prod.folder_id
 }
diff --git a/test/fixtures/fabric_project/main.tf b/test/fixtures/fabric_project/main.tf
index c03e5120..a89f7f30 100644
--- a/test/fixtures/fabric_project/main.tf
+++ b/test/fixtures/fabric_project/main.tf
@@ -18,7 +18,7 @@ module "fabric-project" {
   source = "../../../examples/fabric_project"
 
   name            = "fabric-project"
-  parent          = var.folder_id
+  parent          = "folders/${var.folder_id}"
   billing_account = var.billing_account
   activate_apis = [
     "compute.googleapis.com",
diff --git a/test/setup/main.tf b/test/setup/main.tf
index aed110c6..9c2d2edc 100644
--- a/test/setup/main.tf
+++ b/test/setup/main.tf
@@ -30,7 +30,7 @@ module "pfactory_project" {
   name              = "ci-pfactory-tests"
   random_project_id = true
   org_id            = var.org_id
-  folder_id         = google_folder.ci_pfactory_folder.id
+  folder_id         = google_folder.ci_pfactory_folder.folder_id
   billing_account   = var.billing_account
 
   activate_apis = [
diff --git a/test/setup/outputs.tf b/test/setup/outputs.tf
index 1432aaea..27a1631a 100644
--- a/test/setup/outputs.tf
+++ b/test/setup/outputs.tf
@@ -28,7 +28,7 @@ output "sa_key" {
 }
 
 output "folder_id" {
-  value = google_folder.ci_pfactory_folder.id
+  value = google_folder.ci_pfactory_folder.folder_id
 }
 
 output "org_id" {