From a6db28c255d3a4bbced41b78652391750e289370 Mon Sep 17 00:00:00 2001
From: Tushar <141230066+neoandmatrix@users.noreply.github.com>
Date: Tue, 4 Feb 2025 12:27:01 +0530
Subject: [PATCH] fix: slack ID made optional. (#1677)

Co-authored-by: V Thulisile Sibanda <66913810+thulieblack@users.noreply.github.com>
---
 .github/workflows/slack/channels/channels.tf | 2 +-
 .github/workflows/slack/groups/groups.tf     | 2 +-
 .github/workflows/slack/users/users.tf       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/slack/channels/channels.tf b/.github/workflows/slack/channels/channels.tf
index 2f6f9d9ae0..d93f8eb863 100644
--- a/.github/workflows/slack/channels/channels.tf
+++ b/.github/workflows/slack/channels/channels.tf
@@ -57,7 +57,7 @@ locals {
       purpose = lookup(lookup(lookup(wg_data, "slack", {}), "channel", {}), "description", lookup(wg_data, "description", ""))
       topic = lookup(lookup(lookup(wg_data, "slack", {}), "channel", {}), "topic", "")
 
-      permanent_members = concat([for member in wg_data.chairpersons : member.slack], [for member in wg_data.members : member.slack])
+      permanent_members = concat([for member in wg_data.chairpersons : lookup(member, "slack", null)], [for member in wg_data.members : lookup(member, "slack", null)])
       is_private = false
 
       action_on_destroy = "archive"
diff --git a/.github/workflows/slack/groups/groups.tf b/.github/workflows/slack/groups/groups.tf
index 9438fa7ec4..813b962bfe 100644
--- a/.github/workflows/slack/groups/groups.tf
+++ b/.github/workflows/slack/groups/groups.tf
@@ -59,7 +59,7 @@ locals {
 
       # Handle will be the name of the group in lowercase and with spaces replaced by hyphens succeded by "wg-"
       handle = lookup(lookup(lookup(wg_data, "slack", {}), "group", {}), "handle", "${replace(lower(wg_data.name), " ", "-")}-wg")
-      users = concat([for member in wg_data.chairpersons : member.slack], [for member in wg_data.members : member.slack])
+      users = concat([for member in wg_data.chairpersons : lookup(member, "slack", null)], [for member in wg_data.members : lookup(member, "slack", null)])
     }
   }
 }
diff --git a/.github/workflows/slack/users/users.tf b/.github/workflows/slack/users/users.tf
index 4fa16dc9e6..baf5d2d173 100644
--- a/.github/workflows/slack/users/users.tf
+++ b/.github/workflows/slack/users/users.tf
@@ -17,14 +17,14 @@ locals {
   repos = setunion(flatten([for maintainer in local.maintainers_data : maintainer.repos]))
   repo_maintainers = {
     for repo in local.repos : repo => 
-      [for maintainer in local.maintainers_data : maintainer.slack if contains(maintainer.repos, repo)]
+      [for maintainer in local.maintainers_data : lookup(maintainer, "slack", null) if contains(maintainer.repos, repo)]
   }
 }
 
 output "data_sources" {
   value = {
-    maintainers_user_ids = [for maintainer in local.maintainers_data : maintainer.slack]
-    tsc_members_user_ids = [for tsc_member in local.tsc_members_data : tsc_member.slack]
+    maintainers_user_ids = [for maintainer in local.maintainers_data : lookup(maintainer, "slack", null)]
+    tsc_members_user_ids = [for tsc_member in local.tsc_members_data : lookup(tsc_member, "slack", null)]
     repo_maintainers = local.repo_maintainers
   }
 }
\ No newline at end of file