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"