Merge pull request #414 from hookdeck/alert-destination-credentials

fix: Remove destination credentials from alert payload

Author: leggetter

internal/alert/monitor.go

@@ -77,7 +77,7 @@ func WithLogger(logger *logging.Logger) AlertOption {
 type DeliveryAttempt struct {
 	Success       bool
 	DeliveryEvent *models.DeliveryEvent
-	Destination   *models.Destination
+	Destination   *AlertDestination
 	Timestamp     time.Time
 	Data          map[string]interface{}
 }

internal/alert/monitor_test.go

@@ -51,7 +51,7 @@ func TestAlertMonitor_ConsecutiveFailures_MaxFailures(t *testing.T) {
 		alert.WithAlertThresholds([]int{50, 66, 90, 100}), // use 66% to test rounding logic
 	)
 
-	dest := &models.Destination{ID: "dest_1", TenantID: "tenant_1"}
+	dest := &alert.AlertDestination{ID: "dest_1", TenantID: "tenant_1"}
 	event := &models.Event{Topic: "test.event"}
 	deliveryEvent := &models.DeliveryEvent{Event: *event}
 	attempt := alert.DeliveryAttempt{
@@ -118,7 +118,7 @@ func TestAlertMonitor_ConsecutiveFailures_Reset(t *testing.T) {
 		alert.WithAlertThresholds([]int{50, 66, 90, 100}),
 	)
 
-	dest := &models.Destination{ID: "dest_1", TenantID: "tenant_1"}
+	dest := &alert.AlertDestination{ID: "dest_1", TenantID: "tenant_1"}
 	event := &models.Event{Topic: "test.event"}
 	deliveryEvent := &models.DeliveryEvent{Event: *event}
 	failedAttempt := alert.DeliveryAttempt{

internal/alert/notifier.go

@@ -42,12 +42,22 @@ func NotifierWithBearerToken(token string) NotifierOption {
 	}
 }
 
+type AlertDestination struct {
+	ID         string        `json:"id" redis:"id"`
+	TenantID   string        `json:"tenant_id" redis:"-"`
+	Type       string        `json:"type" redis:"type"`
+	Topics     models.Topics `json:"topics" redis:"-"`
+	Config     models.Config `json:"config" redis:"-"`
+	CreatedAt  time.Time     `json:"created_at" redis:"created_at"`
+	DisabledAt *time.Time    `json:"disabled_at" redis:"disabled_at"`
+}
+
 // ConsecutiveFailureData represents the data needed for a consecutive failure alert
 type ConsecutiveFailureData struct {
 	MaxConsecutiveFailures int                    `json:"max_consecutive_failures"`
 	ConsecutiveFailures    int                    `json:"consecutive_failures"`
 	WillDisable            bool                   `json:"will_disable"`
-	Destination            *models.Destination    `json:"destination"`
+	Destination            *AlertDestination      `json:"destination"`
 	Data                   map[string]interface{} `json:"data"`
 }
 

internal/alert/notifier_test.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/hookdeck/outpost/internal/alert"
-	"github.com/hookdeck/outpost/internal/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -97,7 +96,7 @@ func TestAlertNotifier_Notify(t *testing.T) {
 			notifier := alert.NewHTTPAlertNotifier(ts.URL, tt.notifierOpts...)
 
 			// Create test alert
-			dest := &models.Destination{ID: "dest_123", TenantID: "tenant_123"}
+			dest := &alert.AlertDestination{ID: "dest_123", TenantID: "tenant_123"}
 			testAlert := alert.NewConsecutiveFailureAlert(alert.ConsecutiveFailureData{
 				MaxConsecutiveFailures: 10,
 				ConsecutiveFailures:    5,

internal/deliverymq/messagehandler.go

@@ -284,8 +284,16 @@ func (h *messageHandler) handleAlertAttempt(ctx context.Context, deliveryEvent *
 	attempt := alert.DeliveryAttempt{
 		Success:       deliveryEvent.Delivery.Status == models.DeliveryStatusSuccess,
 		DeliveryEvent: deliveryEvent,
-		Destination:   destination,
-		Timestamp:     deliveryEvent.Delivery.Time,
+		Destination: &alert.AlertDestination{
+			ID:         destination.ID,
+			TenantID:   destination.TenantID,
+			Type:       destination.Type,
+			Topics:     destination.Topics,
+			Config:     destination.Config,
+			CreatedAt:  destination.CreatedAt,
+			DisabledAt: destination.DisabledAt,
+		},
+		Timestamp: deliveryEvent.Delivery.Time,
 	}
 
 	if !attempt.Success && err != nil {

internal/deliverymq/messagehandler_test.go

@@ -1123,7 +1123,7 @@ func TestMessageHandler_PublishSuccess(t *testing.T) {
 	// Setup alert monitor expectations
 	alertMonitor.On("HandleAttempt", mock.Anything, mock.MatchedBy(func(attempt alert.DeliveryAttempt) bool {
 		return attempt.Success && // Should be a successful attempt
-			attempt.Destination == &destination && // Should have correct destination
+			attempt.Destination.ID == destination.ID && // Should have correct destination
 			attempt.DeliveryEvent != nil && // Should have delivery event
 			attempt.Data == nil // No error data for success
 	})).Return(nil)
@@ -1251,7 +1251,7 @@ func assertAlertMonitor(t *testing.T, m *mockAlertMonitor, success bool, destina
 	attempt := lastCall.Arguments[1].(alert.DeliveryAttempt)
 
 	assert.Equal(t, success, attempt.Success, "alert attempt success should match")
-	assert.Equal(t, destination, attempt.Destination, "alert attempt destination should match")
+	assert.Equal(t, destination.ID, attempt.Destination.ID, "alert attempt destination should match")
 	assert.NotNil(t, attempt.DeliveryEvent, "alert attempt should have delivery event")
 
 	if expectedData != nil {