Reapply "[patch] add pipeline name in config name"

This reverts commit 93397fe.

Author: anilprajapatiibm

bin/mas-devops-notify-slack

@@ -105,7 +105,7 @@ def notifyPipelineStart(channels: list[str], instanceId: str | None = None, pipe
         sys.exit(1)
 
     # Check if thread already exists
-    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId)
+    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId, pipelineName)
     if threadInfo is not None:
         print("Pipeline start notification already sent")
         return threadInfo
@@ -145,9 +145,9 @@ def notifyPipelineStart(channels: list[str], instanceId: str | None = None, pipe
             return False
 
     # Create ConfigMap with all channel/thread info
-    SlackUtil.createThreadConfigMap(namespace, "", "", instanceId)
-    SlackUtil.updateThreadConfigMap(namespace, instanceId, configMapData)
-    return SlackUtil.getThreadConfigMap(namespace, instanceId)
+    SlackUtil.createThreadConfigMap(namespace, instanceId, pipelineName)
+    SlackUtil.updateThreadConfigMap(namespace, instanceId, configMapData, pipelineName)
+    return SlackUtil.getThreadConfigMap(namespace, instanceId, pipelineName)
 
 
 def notifyAnsibleStart(channels: list[str], taskName: str, instanceId: str | None = None, pipelineName: str | None = None) -> bool:
@@ -158,7 +158,7 @@ def notifyAnsibleStart(channels: list[str], taskName: str, instanceId: str | Non
         sys.exit(1)
 
     # Get thread information, create if doesn't exist
-    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId)
+    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId, pipelineName)
     if threadInfo is None:
         print("No thread found - creating pipeline start notification")
         threadInfo = notifyPipelineStart(channels, instanceId, pipelineName)
@@ -197,7 +197,7 @@ def notifyAnsibleStart(channels: list[str], taskName: str, instanceId: str | Non
 
     # Update ConfigMap with all task message timestamps
     if taskMessageData:
-        SlackUtil.updateThreadConfigMap(namespace, instanceId, taskMessageData)
+        SlackUtil.updateThreadConfigMap(namespace, instanceId, taskMessageData, pipelineName)
 
     return allSuccess
 
@@ -210,7 +210,7 @@ def notifyAnsibleComplete(channels: list[str], rc: int, taskName: str, instanceI
         sys.exit(1)
 
     # Get thread information, create if doesn't exist
-    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId)
+    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId, pipelineName)
     if threadInfo is None:
         print("No thread found - creating pipeline start notification")
         threadInfo = notifyPipelineStart(channels, instanceId, pipelineName)
@@ -293,7 +293,7 @@ def notifyPipelineComplete(channels: list[str], rc: int, instanceId: str | None
         sys.exit(1)
 
     # Get thread information
-    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId)
+    threadInfo = SlackUtil.getThreadConfigMap(namespace, instanceId, pipelineName)
     if threadInfo is None:
         print("No thread information found - pipeline may not have started properly")
         return False
@@ -353,7 +353,7 @@ def notifyPipelineComplete(channels: list[str], rc: int, instanceId: str | None
             allSuccess = False
 
     # Clean up ConfigMap
-    SlackUtil.deleteThreadConfigMap(namespace, instanceId)
+    SlackUtil.deleteThreadConfigMap(namespace, instanceId, pipelineName)
 
     return allSuccess
 

src/mas/devops/slack.py

@@ -271,7 +271,7 @@ def buildDivider(cls) -> dict:
         Returns:
             dict: Slack block kit divider element
         """
-    def createThreadConfigMap(cls, namespace: str, channelId: str, threadId: str, instanceId: str) -> bool:
+    def createThreadConfigMap(cls, namespace: str, instanceId: str, pipelineRunName: str) -> bool:
         """
         Create a ConfigMap to store Slack thread information for a pipeline run.
 
@@ -291,15 +291,14 @@ def createThreadConfigMap(cls, namespace: str, channelId: str, threadId: str, in
             except Exception:
                 config.load_kube_config()
             v1 = client.CoreV1Api()
-            configmap_name = f"slack-thread-{instanceId}"
+            configmap_name = f"slack-thread-{instanceId}-{pipelineRunName}"
             configmap = client.V1ConfigMap(
                 metadata=client.V1ObjectMeta(
                     name=configmap_name,
                     namespace=namespace
                 ),
                 data={
-                    "threadId": threadId,
-                    "channelId": channelId,
+                    "pipelineName": pipelineRunName,
                     "instanceId": instanceId,
                     "startTime": datetime.now(timezone.utc)
                 }
@@ -311,7 +310,7 @@ def createThreadConfigMap(cls, namespace: str, channelId: str, threadId: str, in
             logger.error(f"Failed to create ConfigMap: {e}")
             return False
 
-    def getThreadConfigMap(cls, namespace: str, instanceId: str) -> dict | None:
+    def getThreadConfigMap(cls, namespace: str, instanceId: str, pipelineRunName: str) -> dict | None:
         """
         Retrieve Slack thread information from a ConfigMap.
 
@@ -329,7 +328,7 @@ def getThreadConfigMap(cls, namespace: str, instanceId: str) -> dict | None:
             except Exception:
                 config.load_kube_config()
             v1 = client.CoreV1Api()
-            configmap_name = f"slack-thread-{instanceId}"
+            configmap_name = f"slack-thread-{instanceId}-{pipelineRunName}"
             configmap = v1.read_namespaced_config_map(name=configmap_name, namespace=namespace)
             logger.debug(f"Retrieved ConfigMap {configmap_name} from namespace {namespace}")
             return configmap.data
@@ -343,7 +342,7 @@ def getThreadConfigMap(cls, namespace: str, instanceId: str) -> dict | None:
             logger.error(f"Failed to retrieve ConfigMap: {e}")
             return None
 
-    def updateThreadConfigMap(cls, namespace: str, instanceId: str, updates: dict) -> bool:
+    def updateThreadConfigMap(cls, namespace: str, instanceId: str, updates: dict, pipelineRunName: str) -> bool:
         """
         Update the ConfigMap with additional data (e.g., task message timestamps).
 
@@ -362,7 +361,7 @@ def updateThreadConfigMap(cls, namespace: str, instanceId: str, updates: dict) -
             except Exception:
                 config.load_kube_config()
             v1 = client.CoreV1Api()
-            configmap_name = f"slack-thread-{instanceId}"
+            configmap_name = f"slack-thread-{instanceId}-{pipelineRunName}"
 
             # Get existing ConfigMap
             configmap = v1.read_namespaced_config_map(name=configmap_name, namespace=namespace)
@@ -380,7 +379,7 @@ def updateThreadConfigMap(cls, namespace: str, instanceId: str, updates: dict) -
             logger.error(f"Failed to update ConfigMap: {e}")
             return False
 
-    def deleteThreadConfigMap(cls, namespace: str, instanceId: str) -> bool:
+    def deleteThreadConfigMap(cls, namespace: str, instanceId: str, pipelineRunName: str) -> bool:
         """
         Delete the ConfigMap containing Slack thread information.
 
@@ -399,7 +398,7 @@ def deleteThreadConfigMap(cls, namespace: str, instanceId: str) -> bool:
                 config.load_kube_config()
 
             v1 = client.CoreV1Api()
-            configmap_name = f"slack-thread-{instanceId}"
+            configmap_name = f"slack-thread-{instanceId}-{pipelineRunName}"
             v1.delete_namespaced_config_map(name=configmap_name, namespace=namespace)
             logger.info(f"Deleted ConfigMap {configmap_name} from namespace {namespace}")
             return True