fix(webhooks): send ActionPayload as string (#657)

pkg/worker/webhook_handler.go

@@ -88,18 +88,21 @@ func (w *Worker) WebhookHttpHandler(opts WebhookHandlerOptions, workflows ...wor
 			return
 		}
 
-		var action client.Action
+		var action ActionPayload
 		if err := json.Unmarshal(data, &action); err != nil {
 			w.l.Error().Err(err).Msg("error unmarshaling action")
 			writer.WriteHeader(http.StatusInternalServerError)
 			_, _ = writer.Write([]byte(err.Error()))
 			return
 		}
 
+		actionWithPayload := action.Action
+		actionWithPayload.ActionPayload = []byte(action.ActionPayload)
+
 		timestamp := time.Now().UTC()
 		_, err = w.client.Dispatcher().SendStepActionEvent(r.Context(),
 			&client.ActionEvent{
-				Action:         &action,
+				Action:         actionWithPayload,
 				EventTimestamp: &timestamp,
 				EventType:      client.ActionEventTypeStarted,
 			},
@@ -111,7 +114,7 @@ func (w *Worker) WebhookHttpHandler(opts WebhookHandlerOptions, workflows ...wor
 			return
 		}
 
-		ctx, err := newHatchetContext(r.Context(), &action, w.client, w.l)
+		ctx, err := newHatchetContext(r.Context(), actionWithPayload, w.client, w.l)
 		if err != nil {
 			w.l.Error().Err(err).Msg("error creating context")
 			writer.WriteHeader(http.StatusInternalServerError)
@@ -130,7 +133,7 @@ func (w *Worker) WebhookHttpHandler(opts WebhookHandlerOptions, workflows ...wor
 		timestamp = time.Now().UTC()
 		_, err = w.client.Dispatcher().SendStepActionEvent(r.Context(),
 			&client.ActionEvent{
-				Action:         &action,
+				Action:         actionWithPayload,
 				EventTimestamp: &timestamp,
 				EventType:      client.ActionEventTypeCompleted,
 				EventPayload:   resp,

pkg/worker/worker_webhook.go

@@ -18,6 +18,12 @@ type RegisterWebhookWorkerOpts struct {
 	Secret *string
 }
 
+type ActionPayload struct {
+	*client.Action
+
+	ActionPayload string `json:"actionPayload"`
+}
+
 func (w *Worker) RegisterWebhook(ww RegisterWebhookWorkerOpts) error {
 	tenantId := openapi_types.UUID{}
 	if err := tenantId.Scan(w.client.TenantId()); err != nil {
@@ -107,7 +113,11 @@ func (w *Worker) StartWebhook(ww WebhookWorkerOpts) (func() error, error) {
 func (w *Worker) sendWebhook(ctx context.Context, action *client.Action, ww WebhookWorkerOpts) error {
 	w.l.Debug().Msgf("action received from step run %s, sending webhook at %s", action.StepRunId, time.Now())
 
-	_, err := whrequest.Send(ctx, ww.URL, ww.Secret, action)
+	actionWithPayload := ActionPayload{
+		Action:        action,
+		ActionPayload: string(action.ActionPayload),
+	}
+	_, err := whrequest.Send(ctx, ww.URL, ww.Secret, actionWithPayload)
 	if err != nil {
 		w.l.Warn().Msgf("step run %s could not send webhook to %s: %s", action.StepRunId, ww.URL, err)
 		if err := w.markFailed(action, fmt.Errorf("could not send webhook: %w", err)); err != nil {