Fix: Update application name in argocd-test-app.yaml and enhance payload handling in ArgoCD deployment failure workflow

Author: dcasati

.github/argocd/argocd-notifications-config.yaml

@@ -37,18 +37,14 @@ data:
             "event_type": "argocd-sync-failed",
             "client_payload": {
               "app_name": "{{.app.metadata.name}}",
-              "app_namespace": "{{.app.metadata.namespace}}",
-              "sync_status": "{{.app.status.sync.status}}",
               "health_status": "{{.app.status.health.status}}",
-              "operation_phase": "{{.app.status.operationState.phase}}",
+              "sync_status": "{{.app.status.sync.status}}",
               "message": "{{.app.status.operationState.message}}",
               "revision": "{{.app.status.sync.revision}}",
               "repo_url": "{{.app.spec.source.repoURL}}",
-              "target_revision": "{{.app.spec.source.targetRevision}}",
-              "timestamp": "{{.app.status.operationState.finishedAt}}",
-              "cluster": "{{.app.spec.destination.server}}",
-              "cluster_name": "{{.app.spec.destination.name}}",
+              "cluster": "{{if .app.metadata.labels.cluster-name}}{{.app.metadata.labels.cluster-name}}{{else}}{{.app.spec.destination.server}}{{end}}",
               "namespace": "{{.app.spec.destination.namespace}}",
+              "timestamp": "{{.app.status.operationState.finishedAt}}",
               "resources": {{toJson .app.status.resources}}
             }
           }

.github/workflows/argocd-deployment-failure.yml

@@ -19,18 +19,29 @@ jobs:
           script: |
             const payload = context.payload.client_payload || {};
             const appName = payload.app_name || 'unknown';
-            const clusterUrl = payload.cluster || 'unknown';
-            const clusterName = payload.cluster_name || clusterUrl;
+            const cluster = payload.cluster || 'unknown';
             const namespace = payload.namespace || 'default';
             const healthStatus = payload.health_status || 'unknown';
             const syncStatus = payload.sync_status || 'unknown';
             const message = payload.message || 'No error message available';
             const revision = payload.revision || 'unknown';
             const repoUrl = payload.repo_url || '';
-            const targetRevision = payload.target_revision || '';
             const timestamp = payload.timestamp || new Date().toISOString();
             const resources = payload.resources || [];
             
+            // Determine cluster display
+            let clusterName = cluster;
+            let clusterUrl = 'N/A';
+            
+            if (cluster.startsWith('http')) {
+              // It's a URL, use as cluster URL
+              clusterUrl = cluster;
+              clusterName = cluster.includes('kubernetes.default.svc') ? 'in-cluster' : cluster;
+            } else {
+              // It's a friendly name from the label
+              clusterName = cluster;
+            }
+            
             // Build degraded resources section
             let degradedDetails = '';
             const degradedResources = resources.filter(r => 
@@ -76,7 +87,6 @@ jobs:
             | Field | Value |
             |-------|-------|
             | Cluster Name | \`${clusterName}\` |
-            | Cluster URL | \`${clusterUrl}\` |
             | Namespace | \`${namespace}\` |
             
             ### Application Status
@@ -86,7 +96,6 @@ jobs:
             | Health Status | \`${healthStatus}\` |
             | Sync Status | \`${syncStatus}\` |
             | Revision | \`${revision}\` |
-            | Target Revision | \`${targetRevision}\` |
             | Repository | ${repoUrl} |
             
             ### Error Message