From b99e33ce5bf559c335bc6214209de95c83a64ce0 Mon Sep 17 00:00:00 2001
From: Roberto Jung Drebes <drebes@users.noreply.github.com>
Date: Fri, 21 Jan 2022 17:13:31 +0000
Subject: [PATCH] fix recreation of resources that depend on project_id on
 pre-existing projects when data source refresh is triggered

---
 modules/project/main.tf | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/project/main.tf b/modules/project/main.tf
index 13edb181..7594c07a 100644
--- a/modules/project/main.tf
+++ b/modules/project/main.tf
@@ -47,9 +47,17 @@ locals {
   parent_id   = var.parent == null ? null : split("/", var.parent)[1]
   prefix      = var.prefix == null ? "" : "${var.prefix}-"
   project = (
-    var.project_create
-    ? try(google_project.project.0, null)
-    : try(data.google_project.project.0, null)
+    var.project_create ?
+    {
+      project_id = try(google_project.project.0.project_id, null)
+      number     = try(google_project.project.0.number, null)
+      name       = try(google_project.project.0.name, null)
+    }
+    : {
+      project_id = "${local.prefix}${var.name}"
+      number     = try(data.google_project.project.0.number, null)
+      name       = try(data.google_project.project.0.name, null)
+    }
   )
   logging_sinks = coalesce(var.logging_sinks, {})
   sink_type_destination = {