From ee7c17d2dc216b60446c6f69ddcd531335c8aecc Mon Sep 17 00:00:00 2001
From: April Ayres <april.ayres@hashicorp.com>
Date: Fri, 15 Sep 2023 10:39:22 -0700
Subject: [PATCH] (event_observation): use consts for request/response, code
 cleanup

---
 internal/event/event_observation.go | 8 ++++----
 internal/event/eventer.go           | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/internal/event/event_observation.go b/internal/event/event_observation.go
index c346d49182..efa0daf706 100644
--- a/internal/event/event_observation.go
+++ b/internal/event/event_observation.go
@@ -112,7 +112,7 @@ func (o *observation) ComposeFrom(events []*eventlogger.Event) (eventlogger.Even
 		}
 		if g.Request != nil {
 			msgReq := &Request{}
-			if v, ok := payload["request"]; ok {
+			if v, ok := payload[RequestField]; ok {
 				msgReq, ok = v.(*Request)
 				if !ok {
 					return "", nil, fmt.Errorf("%s: request %d is not an observation request: %w", op, i, eventlogger.ErrInvalidParameter)
@@ -134,11 +134,11 @@ func (o *observation) ComposeFrom(events []*eventlogger.Event) (eventlogger.Even
 			if g.Request.DetailsUpstreamMessage != nil {
 				msgReq.DetailsUpstreamMessage = g.Request.DetailsUpstreamMessage
 			}
-			payload["request"] = msgReq
+			payload[RequestField] = msgReq
 		}
 		if g.Response != nil {
 			msgRes := &Response{}
-			if v, ok := payload["response"]; ok {
+			if v, ok := payload[ResponseField]; ok {
 				msgRes, ok = v.(*Response)
 				if !ok {
 					return "", nil, fmt.Errorf("%s: response %d is not an observation response: %w", op, i, eventlogger.ErrInvalidParameter)
@@ -157,7 +157,7 @@ func (o *observation) ComposeFrom(events []*eventlogger.Event) (eventlogger.Even
 			if g.Response.DetailsUpstreamMessage != nil {
 				msgRes.DetailsUpstreamMessage = g.Response.DetailsUpstreamMessage
 			}
-			payload["response"] = msgRes
+			payload[ResponseField] = msgRes
 		}
 	}
 	return events[0].Type, payload, nil
diff --git a/internal/event/eventer.go b/internal/event/eventer.go
index da4953da1b..55c87e073b 100644
--- a/internal/event/eventer.go
+++ b/internal/event/eventer.go
@@ -38,6 +38,8 @@ const (
 	IdField          = "id"           // IdField in an event.
 	CreatedAtField   = "created_at"   // CreatedAtField in an event.
 	TypeField        = "type"         // TypeField in an event.
+	RequestField     = "request"      // Request field in an event.
+	ResponseField    = "response"     // Response field in an event.
 
 	auditPipeline       = "audit-pipeline"       // auditPipeline is a pipeline for audit events
 	observationPipeline = "observation-pipeline" // observationPipeline is a pipeline for observation events