Pass project id to tf examples

koenighotze · May 29, 2024 · dc6aec4 · dc6aec4
1 parent f353964
commit dc6aec4
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 20 deletions.
diff --git a/terraform-examples.tf b/terraform-examples.tf
@@ -1,7 +1,7 @@
 module "terraform_examples" {
   source = "./terraform-examples"
 
-  project_postfix = var.project_postfix
+  project_id = local.terraform_examples_project_id
 
   workload_identity_provider_name = var.workload_identity_provider_name
   workload_identity_pool_id       = var.workload_identity_pool_id

diff --git a/terraform-examples/main.tf b/terraform-examples/main.tf
diff --git a/terraform-examples/outputs.tf b/terraform-examples/outputs.tf
@@ -1,7 +1,3 @@
-output "project_id" {
-  value = data.google_project.project.project_id
-}
-
 output "service_account_email" {
   value = google_service_account.sa.email
 }
diff --git a/terraform-examples/project-data.tf b/terraform-examples/project-data.tf
diff --git a/terraform-examples/project.tf b/terraform-examples/project.tf
@@ -1,5 +1,5 @@
 resource "google_project_iam_audit_config" "audit" {
-  project = data.google_project.project.project_id
+  project = var.project_id
   service = "allServices"
 
   audit_log_config {

diff --git a/terraform-examples/repository-secrets.tf b/terraform-examples/repository-secrets.tf
@@ -2,7 +2,7 @@ resource "github_actions_secret" "secrets" {
   for_each = {
     "CICD_SA_EMAIL_ADDRESS"      = google_service_account.sa.email
     "CICD_SA_ID"                 = google_service_account.sa.id
-    "GCP_PROJECT_ID"             = data.google_project.project.project_id
+    "GCP_PROJECT_ID"             = var.project_id
     "TERRAFORM_STATE_BUCKET"     = google_storage_bucket.state_bucket.name
     "WORKLOAD_IDENTITY_POOL_ID"  = var.workload_identity_pool_id
     "WORKLOAD_IDENTITY_PROVIDER" = var.workload_identity_provider_name

diff --git a/terraform-examples/sa.tf b/terraform-examples/sa.tf
@@ -1,5 +1,5 @@
 resource "google_service_account" "sa" {
-  project      = data.google_project.project.project_id
+  project      = var.project_id
   account_id   = "terraform-examples-sa"
   display_name = "TF EXamples Service Account"
   description  = "Service account for handling the TF Examples"
@@ -15,7 +15,7 @@ resource "google_project_iam_member" "iam_member_project" {
     "roles/viewer"
   ])
 
-  project = data.google_project.project.project_id
+  project = var.project_id
   #checkov:skip=CKV_GCP_117:Allow admin for this
   #checkov:skip=CKV_GCP_49:Allow admin for this sa
   role = each.key

diff --git a/terraform-examples/terraform-state-bucket-admin-iam.tf b/terraform-examples/terraform-state-bucket-admin-iam.tf
@@ -5,7 +5,7 @@ resource "google_project_iam_binding" "project_iam_binding" {
   for_each = toset([
     "roles/storage.admin"
   ])
-  project = data.google_project.project.project_id
+  project = var.project_id
   role    = "roles/storage.admin"
 
   members = [

diff --git a/terraform-examples/terraform-state-bucket.tf b/terraform-examples/terraform-state-bucket.tf
@@ -1,17 +1,16 @@
 #trivy:ignore:avd-gcp-0066
 resource "google_storage_bucket" "state_bucket" {
   #checkov:skip=CKV_GCP_62:Logging deactivated for now
-  project                     = data.google_project.project.project_id
-  name                        = "${data.google_project.project.project_id}-state"
+  project                     = var.project_id
+  name                        = "${var.project_id}-state"
   location                    = var.location
   uniform_bucket_level_access = true
   force_destroy               = true
 
   public_access_prevention = "enforced"
 
   versioning {
-    #checkov:skip=CKV_GCP_78:We don't version states
-    enabled = false
+    enabled = true
   }
 }
 

diff --git a/terraform-examples/variables.tf b/terraform-examples/variables.tf
@@ -1,6 +1,6 @@
-variable "project_postfix" {
+variable "project_id" {
   type        = string
-  description = "The unique postfix for the projects"
+  description = "The id of the project"
 }
 
 variable "region" {