From e282eb197e7edf2671d6b74ef15ecf0616c8b725 Mon Sep 17 00:00:00 2001
From: Mateusz Szostok <szostok.mateusz@gmail.com>
Date: Wed, 15 May 2024 22:03:07 +0900
Subject: [PATCH] Fix argo event defintion

---
 go.mod                      |  2 +-
 pkg/sink/pager_duty.go      |  2 +-
 pkg/sink/pager_duty_meta.go | 10 ++++++++--
 test/go.sum                 |  3 +--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 62f4614fa..76fee5b75 100644
--- a/go.mod
+++ b/go.mod
@@ -44,6 +44,7 @@ require (
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
+	github.com/prometheus/common v0.44.0
 	github.com/r3labs/diff/v3 v3.0.1
 	github.com/sanity-io/litter v1.5.5
 	github.com/segmentio/analytics-go v3.1.0+incompatible
@@ -215,7 +216,6 @@ require (
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
diff --git a/pkg/sink/pager_duty.go b/pkg/sink/pager_duty.go
index c26509678..b76080c50 100644
--- a/pkg/sink/pager_duty.go
+++ b/pkg/sink/pager_duty.go
@@ -138,7 +138,7 @@ func (w *PagerDuty) resolveEventMeta(in *incomingEvent) eventMetadata {
 		return enrichWithK8sEventMetadata(out, ev.k8sEventPayload)
 	}
 
-	if !ev.argoPayload.Message.IsEmpty() {
+	if len(ev.argoPayload.Message.Sections) > 0 {
 		return enrichWithArgoCDEventMetadata(out, ev.argoPayload)
 	}
 
diff --git a/pkg/sink/pager_duty_meta.go b/pkg/sink/pager_duty_meta.go
index ca46fa7b2..31ffe0f39 100644
--- a/pkg/sink/pager_duty_meta.go
+++ b/pkg/sink/pager_duty_meta.go
@@ -10,7 +10,6 @@ import (
 	"github.com/prometheus/common/model"
 
 	k8sconfig "github.com/kubeshop/botkube/internal/source/kubernetes/config"
-	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/config"
 )
 
@@ -33,7 +32,14 @@ type (
 	}
 
 	argoPayload struct {
-		Message                api.Message
+		// using the api.Message, causes decoding problems:
+		//   - 'Message.Timestamp' expected a map, got 'string'"
+		//   - nested fields like Header are not resolved.
+		Message struct {
+			Sections []struct {
+				Header string
+			}
+		}
 		IncomingRequestContext struct {
 			App           *config.K8sResourceRef
 			DetailsUIPath *string
diff --git a/test/go.sum b/test/go.sum
index c372275e4..fb7e0a569 100644
--- a/test/go.sum
+++ b/test/go.sum
@@ -411,8 +411,7 @@ github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=