From 92261b8912ca1f9ff54b7b9756194625c59182cd Mon Sep 17 00:00:00 2001
From: Salim Afiune <afiune@lacework.net>
Date: Tue, 15 Nov 2022 08:00:21 -0800
Subject: [PATCH] fix: empty project_id in google_project data source (#77)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A validation change https://github.com/hashicorp/terraform-provider-google/pull/12846
was introduced in version `4.42.0` of the google provider. This
validation makes all our GCP modules to fail with:
```
│ Error: "" project_id must be 6 to 30 with lowercase letters, digits, hyphens and start with a letter. Trailing hyphens are prohibited.
│
│   with module.gcp_project_audit_log.data.google_project.selected,
│   on .terraform/modules/gcp_project_audit_log/main.tf line 96, in data "google_project" "selected":
│   96:   project_id = var.project_id
```

To solve this issue we are avoiding using the `google_project` data
source when we know the `project_id` that was provided by the user.

If the user does not provide a `project_id`, then we use the data
source to discover the project from the google provider.

Signed-off-by: Salim Afiune Maya <afiune@lacework.net>

Signed-off-by: Salim Afiune Maya <afiune@lacework.net>
---
 main.tf     | 6 ++----
 versions.tf | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/main.tf b/main.tf
index fdc31f6..05c6cef 100644
--- a/main.tf
+++ b/main.tf
@@ -1,7 +1,7 @@
 locals {
   resource_level = var.org_integration ? "ORGANIZATION" : "PROJECT"
   resource_id    = var.org_integration ? var.organization_id : module.lacework_at_svc_account.project_id
-  project_id     = data.google_project.selected.project_id
+  project_id     = length(var.project_id) > 0 ? var.project_id : data.google_project.selected.project_id
 
   bucket_name = length(var.existing_bucket_name) > 0 ? var.existing_bucket_name : (
     length(google_storage_bucket.lacework_bucket) > 0 ? google_storage_bucket.lacework_bucket[0].name : var.existing_bucket_name
@@ -102,9 +102,7 @@ resource "random_id" "uniq" {
   byte_length = 4
 }
 
-data "google_project" "selected" {
-  project_id = var.project_id
-}
+data "google_project" "selected" {}
 
 data "google_folders" "my-org-folders" {
   count     = (var.org_integration && local.exclude_folders) ? 1 : 0
diff --git a/versions.tf b/versions.tf
index e79e0a7..993c404 100644
--- a/versions.tf
+++ b/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_version = ">= 0.15.1"
 
   required_providers {
-    google = ">= 4.4.0, < 4.41.0"
+    google = ">= 4.4.0, < 5.0.0"
     time   = "~> 0.6"
     lacework = {
       source  = "lacework/lacework"