schwarzit.stackit-public/audit-go
1
0
Fork 0
mirror of https://dev.azure.com/schwarzit/schwarzit.stackit-public/_git/audit-go synced 2026-02-21 15:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix data and content-type in legacy apis

Browse source
This commit is contained in:
Christian Schaible 2024-10-01 14:36:10 +02:00
parent 6fd141e227
commit 0e6aac7370
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
audit/api/api_common.go
View file

@ -16,6 +16,7 @@ import (
// ContentTypeCloudEventsProtobuf the cloudevents protobuf content-type sent in metadata of messages // ContentTypeCloudEventsProtobuf the cloudevents protobuf content-type sent in metadata of messages
const ContentTypeCloudEventsProtobuf = "application/cloudevents+protobuf" const ContentTypeCloudEventsProtobuf = "application/cloudevents+protobuf"
const ContentTypeCloudEventsJson = "application/cloudevents+json; charset=UTF-8"
// ErrUnknownPluralType indicates that the given input is an unknown plural type // ErrUnknownPluralType indicates that the given input is an unknown plural type
var ErrUnknownPluralType = errors.New("unknown plural type") var ErrUnknownPluralType = errors.New("unknown plural type")

8
audit/api/api_legacy.go
View file

@ -2,11 +2,9 @@ package api
import ( import (
"context" "context"
"errors"
"fmt"
"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging" "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1" auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
"errors"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )
@ -136,8 +134,8 @@ func (a *LegacyAuditApi) ValidateAndSerializeWithTrace(
Source: event.ProtoPayload.ServiceName, Source: event.ProtoPayload.ServiceName,
Id: event.InsertId, Id: event.InsertId,
Time: event.ProtoPayload.RequestMetadata.RequestAttributes.Time.AsTime(), Time: event.ProtoPayload.RequestMetadata.RequestAttributes.Time.AsTime(),
DataContentType: ContentTypeCloudEventsProtobuf, DataContentType: ContentTypeCloudEventsJson,
DataType: fmt.Sprintf("%v", routableEvent.ProtoReflect().Descriptor().FullName()), DataType: "audit.v1.LegacyAuditEvent",
Subject: event.ProtoPayload.ResourceName, Subject: event.ProtoPayload.ResourceName,
Data: legacyBytes, Data: legacyBytes,
TraceParent: traceParent, TraceParent: traceParent,

4
audit/api/api_legacy_dynamic.go
View file

@ -119,8 +119,8 @@ func (a *DynamicLegacyAuditApi) ValidateAndSerializeWithTrace(
Source: event.ProtoPayload.ServiceName, Source: event.ProtoPayload.ServiceName,
Id: event.InsertId, Id: event.InsertId,
Time: event.ProtoPayload.RequestMetadata.RequestAttributes.Time.AsTime(), Time: event.ProtoPayload.RequestMetadata.RequestAttributes.Time.AsTime(),
DataContentType: ContentTypeCloudEventsProtobuf, DataContentType: ContentTypeCloudEventsJson,
DataType: fmt.Sprintf("%v", routableEvent.ProtoReflect().Descriptor().FullName()), DataType: "audit.v1.LegacyAuditEvent",
Subject: event.ProtoPayload.ResourceName, Subject: event.ProtoPayload.ResourceName,
Data: legacyBytes, Data: legacyBytes,
TraceParent: traceParent, TraceParent: traceParent,

2
audit/api/api_legacy_test.go
View file

@ -441,6 +441,8 @@ func validateSentMessageWithDetails(
// Check topic name // Check topic name
assert.Equal(t, topicName, *message.Properties.To) assert.Equal(t, topicName, *message.Properties.To)
assert.Equal(t, ContentTypeCloudEventsJson, message.ApplicationProperties["cloudEvents:datacontenttype"])
assert.Equal(t, "audit.v1.LegacyAuditEvent", message.ApplicationProperties["cloudEvents:type"])
assert.Equal(t, *traceParent, message.ApplicationProperties["cloudEvents:traceparent"]) assert.Equal(t, *traceParent, message.ApplicationProperties["cloudEvents:traceparent"])
assert.Equal(t, *traceState, message.ApplicationProperties["cloudEvents:tracestate"]) assert.Equal(t, *traceState, message.ApplicationProperties["cloudEvents:tracestate"])