ready for release

SPHTech-Platform · Oct 10, 2023 · db85f52 · db85f52
1 parent 1e8915c
commit db85f52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/locals.tf b/locals.tf
@@ -1,6 +1,6 @@
 locals {
   flattened_workspaces = merge(flatten([for org, project in var.workspaces :
-    [for proj, workspace in project : { for ws in workspace : "${org}-${ws}" => {
+    [for proj, workspace in project : { for ws in workspace : "${org}-${proj}-${ws}" => {
       org  = org
       proj = proj
       ws   = ws
@@ -10,7 +10,7 @@ locals {
 
   workspaces = { for k, ws in local.flattened_workspaces : length(k) > 32 ? join("-", [substr(k, 0, 23), substr(sha512(k), 0, 8)]) : k => ws }
 
-  display_name_raw        = { for k, ws in local.workspaces : k => join("/", [ws.org, ws.ws]) }
+  display_name_raw        = { for k, ws in local.workspaces : k => join("/", [ws.org, ws.proj, ws.ws]) }
   display_name_raw_sha512 = { for k, name in local.display_name_raw : k => sha512(name) }
   display_name            = { for k, name in local.display_name_raw : k => length(name) > 32 ? join("-", [substr(name, 0, 23), substr(local.display_name_raw_sha512[k], 0, 8)]) : name }
 

diff --git a/main.tf b/main.tf
@@ -26,7 +26,7 @@ resource "google_iam_workload_identity_pool_provider" "workspaces" {
   for_each = local.workspaces
 
   workload_identity_pool_id          = google_iam_workload_identity_pool.tfc.workload_identity_pool_id
-  workload_identity_pool_provider_id = each.key
+  workload_identity_pool_provider_id = lower(replace(each.key, "/\\W|_|\\s/", "-"))
 
   display_name = local.display_name[each.key]
   description  = "Organisation: ${each.value.org} Project: ${each.value.proj} Workspace: ${each.value.ws}"