Merge branch 'main' into aman/issue-96

wandb · Jul 18, 2024 · edc846a · edc846a
2 parents 7541388 + b52e566
commit edc846a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+### [4.0.2](https://github.com/wandb/terraform-google-wandb/compare/v4.0.1...v4.0.2) (2024-07-17)
+
+
+### Bug Fixes
+
+* Stackdriver SA name ([#148](https://github.com/wandb/terraform-google-wandb/issues/148)) ([e67c9fc](https://github.com/wandb/terraform-google-wandb/commit/e67c9fc5a09459893ebc7960e9c40a315cc9e6f3))
+
 ### [4.0.1](https://github.com/wandb/terraform-google-wandb/compare/v4.0.0...v4.0.1) (2024-07-16)
 
 

diff --git a/modules/service_accounts/main.tf b/modules/service_accounts/main.tf
@@ -130,7 +130,7 @@ resource "google_service_account_iam_member" "workload_binding" {
 ### service account for stackdriver
 resource "google_service_account" "stackdriver" {
   count        = var.enable_stackdriver == true ? 1 : 0
-  account_id   = substr("${random_id.main.dec}-stackdriver", 0, 30)
+  account_id   = format("%s-stackdriver", substr(random_id.main.dec, 0, 18))
   display_name = "Service Account For Workload Identity"
 }