Merge branch 'main' into aman/tshirt-size

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)
 
 

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}]"
 }