From b5b8d83fba14d85df3d9efbe3489fdef68815505 Mon Sep 17 00:00:00 2001 From: Brett Curtis Date: Fri, 20 Sep 2024 17:08:33 -0400 Subject: [PATCH 1/2] Update project ID and number references --- main.tf | 6 +++--- outputs.tf | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.tf b/main.tf index 7059ba9..0a4f018 100644 --- a/main.tf +++ b/main.tf @@ -37,7 +37,7 @@ module "datadog" { is_cspm_enabled = true is_security_command_center_enabled = true labels = local.labels - project = module.project.project_id + project = module.project.id } # Google Project Module (osinfra.io) @@ -78,7 +78,7 @@ resource "google_iam_workload_identity_pool" "this" { description = "Workload Identity Pool for ${each.value.display_name}" disabled = lookup(each.value, "disabled", false) display_name = each.value.display_name - project = module.project.project_id + project = module.project.id workload_identity_pool_id = each.key } @@ -93,7 +93,7 @@ resource "google_iam_workload_identity_pool_provider" "this" { description = "Workload Identity Pool Provider for ${each.value.display_name}" disabled = lookup(each.value, "disabled", false) display_name = "${each.value.display_name} OIDC" - project = module.project.project_id + project = module.project.id workload_identity_pool_id = google_iam_workload_identity_pool.this[each.key].workload_identity_pool_id workload_identity_pool_provider_id = "${each.key}-oidc" diff --git a/outputs.tf b/outputs.tf index 818b94b..a653294 100644 --- a/outputs.tf +++ b/outputs.tf @@ -3,12 +3,12 @@ output "project_number" { description = "The project number" - value = module.project.project_number + value = module.project.number } output "project_id" { description = "The project ID" - value = module.project.project_id + value = module.project.id } output "workload_identity_pool_names" { From 17c734272db8fc5c995aade148d647c7771f0d47 Mon Sep 17 00:00:00 2001 From: Brett Curtis Date: Fri, 20 Sep 2024 17:09:50 -0400 Subject: [PATCH 2/2] Update project ID and number references --- .terraform.lock.hcl | 26 +++++++++++++------------- README.md | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index c666de8..3f4473b 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -42,20 +42,20 @@ provider "registry.terraform.io/hashicorp/google" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.2" + version = "3.6.3" hashes = [ - "h1:wmG0QFjQ2OfyPy6BB7mQ57WtoZZGGV07uAPQeDmIrAE=", - "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", - "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", - "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", - "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", - "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", - "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", - "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=", + "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", + "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", + "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", + "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", + "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", + "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", - "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", - "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", - "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", + "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", + "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", + "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", + "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", ] } diff --git a/README.md b/README.md index d51aedc..4f1dc8b 100644 --- a/README.md +++ b/README.md @@ -52,14 +52,14 @@ Links to documentation and other resources required to develop and iterate in th | Name | Version | |------|---------| -| google | 5.39.1 | +| google | 6.3.0 | #### Modules | Name | Source | Version | |------|--------|---------| -| datadog | github.com/osinfra-io/terraform-datadog-google-integration | v0.2.1 | -| project | github.com/osinfra-io/terraform-google-project | v0.3.0 | +| datadog | github.com/osinfra-io/terraform-datadog-google-integration | v0.3.0 | +| project | github.com/osinfra-io/terraform-google-project | v0.4.0 | #### Resources