From ed6d92ddf6205cdd95a6a1a07426cd1c91a3249f Mon Sep 17 00:00:00 2001
From: StekPerepolnen <arykov@ydb.tech>
Date: Mon, 29 Sep 2025 00:41:56 +0200
Subject: [PATCH] fix anonymous subject

---
 internal/audit/audit_event.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/internal/audit/audit_event.go b/internal/audit/audit_event.go
index 690390e5..72868336 100644
--- a/internal/audit/audit_event.go
+++ b/internal/audit/audit_event.go
@@ -7,7 +7,6 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
-	"strings"
 	"time"
 	"ydbcp/internal/server/grpcinfo"
 	"ydbcp/internal/util/xlog"
@@ -84,7 +83,7 @@ func (e *Event) MarshalJSON() ([]byte, error) {
 			Component:      e.Component,
 			MethodName:     e.MethodName,
 			ContainerID:    e.ContainerID,
-			Subject:        strings.Join([]string{e.Subject, "as"}, "@"),
+			Subject:        formatSubject(e.Subject),
 			SanitizedToken: e.SanitizedToken,
 			GRPCRequest:    marshalProtoMessage(e.GRPCRequest),
 			Status:         e.Status,
@@ -130,6 +129,15 @@ func getStatus(inProgress bool, err error) (string, string) {
 	return status, reason
 }
 
+func formatSubject(subject string) string {
+	switch subject {
+	case "", "{none}":
+		return "{none}"
+	default:
+		return subject + "@as"
+	}
+}
+
 func GRPCCallAuditEvent(
 	ctx context.Context,
 	methodName string,