fix EventCertificateExpiringSoonMeta fields

Author: edsonmichaque

gateway/event_system.go

@@ -118,12 +118,12 @@ type EventTokenMeta struct {
 // EventCertificateExpiringSoonMeta is the metadata structure for certificate expiration events
 type EventCertificateExpiringSoonMeta struct {
 	EventMetaDefault
-	CertificateID   string    `json:"certificate_id"`
-	CertificateName string    `json:"certificate_name"`
-	ExpirationDate  time.Time `json:"expiration_date"`
-	DaysUntilExpiry int       `json:"days_until_expiry"`
-	APIID           string    `json:"api_id"`
-	OrgID           string    `json:"org_id"`
+	CertID        string    `json:"cert_id"`
+	CertName      string    `json:"cert_name"`
+	ExpiresAt     time.Time `json:"expires_at"`
+	DaysRemaining int       `json:"days_remaining"`
+	APIID         string    `json:"api_id"`
+	OrgID         string    `json:"org_id"`
 }
 
 // EventHandlerByName is a convenience function to get event handler instances from an API Definition

gateway/mw_certificate_check.go

@@ -344,12 +344,12 @@ func (m *CertificateCheckMW) fireCertificateExpiringSoonEvent(cert *tls.Certific
 		EventMetaDefault: EventMetaDefault{
 			Message: message,
 		},
-		CertificateID:   certID,
-		CertificateName: cert.Leaf.Subject.CommonName,
-		ExpirationDate:  cert.Leaf.NotAfter,
-		DaysUntilExpiry: daysUntilExpiry,
-		APIID:           m.Spec.APIID,
-		OrgID:           m.Spec.OrgID,
+		CertID:        certID,
+		CertName:      cert.Leaf.Subject.CommonName,
+		ExpiresAt:     cert.Leaf.NotAfter,
+		DaysRemaining: daysUntilExpiry,
+		APIID:         m.Spec.APIID,
+		OrgID:         m.Spec.OrgID,
 	}
 
 	log.Debugf("Certificate expiry monitor: Firing expiry event for certificate '%s' - expires in %dd %dh (ID: %s...)", cert.Leaf.Subject.CommonName, daysUntilExpiry, remainingHours, certID[:8])

gateway/mw_certificate_check_integration_test.go

@@ -306,7 +306,7 @@ func TestCertificateCheckMW_Integration_CoreFunctionality(t *testing.T) {
 		if len(events) > 0 {
 			eventMeta, ok := events[0].Meta.(EventCertificateExpiringSoonMeta)
 			assert.True(t, ok, "Event metadata should be EventCertificateExpiringSoonMeta")
-			assert.Equal(t, "expiring.example.com", eventMeta.CertificateName, "Certificate name should match")
+			assert.Equal(t, "expiring.example.com", eventMeta.CertName, "Certificate name should match")
 			assert.Equal(t, "integration-test-api-id", eventMeta.APIID, "API ID should match")
 			assert.Equal(t, "integration-test-org-id", eventMeta.OrgID, "Org ID should match")
 		}
@@ -344,7 +344,7 @@ func TestCertificateCheckMW_Integration_CoreFunctionality(t *testing.T) {
 		if len(events) > 0 {
 			eventMeta, ok := events[0].Meta.(EventCertificateExpiringSoonMeta)
 			assert.True(t, ok, "Event metadata should be EventCertificateExpiringSoonMeta")
-			assert.Equal(t, "critical.example.com", eventMeta.CertificateName, "Certificate name should match")
+			assert.Equal(t, "critical.example.com", eventMeta.CertName, "Certificate name should match")
 		}
 	})
 
@@ -378,7 +378,7 @@ func TestCertificateCheckMW_Integration_CoreFunctionality(t *testing.T) {
 		for _, e := range events {
 			eventMeta, ok := e.Meta.(EventCertificateExpiringSoonMeta)
 			assert.True(t, ok, "Event metadata should be EventCertificateExpiringSoonMeta")
-			certNames[eventMeta.CertificateName] = true
+			certNames[eventMeta.CertName] = true
 		}
 
 		// Should have events for expiring and critical certificates, but not valid