kv: implement redact.SafeValue for PushTxnType

This commit implements redact.SafeValue for PushTxnType with the goal of displaying the PushTxnType on PushTxnRequest with the redact. Fixes: #114475 Release note: None.
cockroachdb · Dec 5, 2023 · 12f06f8 · 12f06f8
1 parent 57f5963
commit 12f06f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/pkg/kv/kvpb/api.go b/pkg/kv/kvpb/api.go
@@ -2152,3 +2152,6 @@ type RangeFeedEventProducer interface {
 	// range needs to be restarted.
 	Recv() (*RangeFeedEvent, error)
 }
+
+// SafeValue implements the redact.SafeValue interface.
+func (PushTxnType) SafeValue() {}
diff --git a/pkg/kv/kvpb/string_test.go b/pkg/kv/kvpb/string_test.go
@@ -179,8 +179,8 @@ func TestRequestSafeFormat(t *testing.T) {
 				PusherTxn: pusherTxn,
 				PusheeTxn: pusheeTxn.TxnMeta,
 			},
-			redactable: "PushTxn(‹PUSH_TIMESTAMP›,00fbff58->00fbff59)",
-			redacted:   "PushTxn(‹×›,00fbff58->00fbff59)",
+			redactable: "PushTxn(PUSH_TIMESTAMP,00fbff58->00fbff59)",
+			redacted:   "PushTxn(PUSH_TIMESTAMP,00fbff58->00fbff59)",
 		},
 	}
 	for _, c := range testCases {

diff --git a/pkg/testutils/lint/passes/redactcheck/redactcheck.go b/pkg/testutils/lint/passes/redactcheck/redactcheck.go
@@ -87,6 +87,7 @@ func runAnalyzer(pass *analysis.Pass) (interface{}, error) {
 						"LeaseAppliedIndex": {},
 						"RaftIndex":         {},
 						"RaftTerm":          {},
+						"PushTxnType":       {},
 					},
 					"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb": {
 						"SeqNum": {},