From 08abe848938ba80d48c2e747b5e9f229dd01eda4 Mon Sep 17 00:00:00 2001 From: Aman Pruthi Date: Fri, 7 Jun 2024 23:40:54 +0530 Subject: [PATCH 1/2] feat: Track the otel and stackdriver sa issue (#134) * feat: added support for stackdriver and otel metrics * fixed checks * fixed tmp service account issue * fixed lint * fixed sa issue --------- Co-authored-by: amanpruthi --- modules/service_accounts/main.tf | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/service_accounts/main.tf b/modules/service_accounts/main.tf index ca85630..3dc0337 100644 --- a/modules/service_accounts/main.tf +++ b/modules/service_accounts/main.tf @@ -67,20 +67,25 @@ resource "google_service_account" "workload-identity-user-sa" { count = var.enable_stackdriver == true ? 1 : 0 account_id = "stackdriver" display_name = "Service Account For Workload Identity" - } resource "google_project_iam_member" "monitoring-role" { count = var.enable_stackdriver == true ? 1 : 0 project = local.project_id role = "roles/monitoring.viewer" - member = "serviceAccount:${google_service_account.workload-identity-user-sa[count.index].email}" + member = "serviceAccount:${google_service_account.workload-identity-user-sa[count.index].email}" } +resource "google_service_account_iam_member" "monitoring-role" { + count = var.enable_stackdriver == true ? 1 : 0 + service_account_id = google_service_account.workload-identity-user-sa[count.index].id + role = "roles/iam.serviceAccountTokenCreator" + member = "serviceAccount:${google_service_account.workload-identity-user-sa[count.index].email}" +} -resource "google_project_iam_member" "workload_identity-role" { +resource "google_service_account_iam_member" "workload_identity-role" { count = var.enable_stackdriver == true ? 1 : 0 - project = local.project_id + service_account_id = google_service_account.workload-identity-user-sa[count.index].id role = "roles/iam.workloadIdentityUser" member = "serviceAccount:${local.project_id}.svc.id.goog[default/${var.service_account_name}]" } \ No newline at end of file From 9c6a7750d488ed2e8dcf92bacc997b62b0bbde73 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 7 Jun 2024 18:11:36 +0000 Subject: [PATCH 2/2] chore(release): version 3.2.0 [skip ci] ## [3.2.0](https://github.com/wandb/terraform-google-wandb/compare/v3.1.1...v3.2.0) (2024-06-07) ### Features * Track the otel and stackdriver sa issue ([#134](https://github.com/wandb/terraform-google-wandb/issues/134)) ([08abe84](https://github.com/wandb/terraform-google-wandb/commit/08abe848938ba80d48c2e747b5e9f229dd01eda4)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65bb069..f35a7f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +## [3.2.0](https://github.com/wandb/terraform-google-wandb/compare/v3.1.1...v3.2.0) (2024-06-07) + + +### Features + +* Track the otel and stackdriver sa issue ([#134](https://github.com/wandb/terraform-google-wandb/issues/134)) ([08abe84](https://github.com/wandb/terraform-google-wandb/commit/08abe848938ba80d48c2e747b5e9f229dd01eda4)) + ### [3.1.1](https://github.com/wandb/terraform-google-wandb/compare/v3.1.0...v3.1.1) (2024-06-05)