From 1fc8a8a5a7779bc0b9f898a0aa6ea3d530b16af2 Mon Sep 17 00:00:00 2001
From: Lucy Sweet <lucysweet@uber.com>
Date: Tue, 21 Feb 2023 20:35:54 +0100
Subject: [PATCH] Clean up FakeRecorder event emission

Kubernetes-commit: 191fe47b6ca537040b22e56776bb97d3d21737e3
---
 tools/record/fake.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tools/record/fake.go b/tools/record/fake.go
index a5b523fb..9cea1fb5 100644
--- a/tools/record/fake.go
+++ b/tools/record/fake.go
@@ -41,29 +41,31 @@ func objectString(object runtime.Object, includeObject bool) string {
 	)
 }
 
-func (f *FakeRecorder) writeEvent(event string) {
+func annotationsString(annotations map[string]string) string {
+	if len(annotations) == 0 {
+		return ""
+	} else {
+		return " " + fmt.Sprint(annotations)
+	}
+}
+
+func (f *FakeRecorder) writeEvent(object runtime.Object, annotations map[string]string, eventtype, reason, messageFmt string, args ...interface{}) {
 	if f.Events != nil {
-		f.Events <- event
+		f.Events <- fmt.Sprintf(eventtype+" "+reason+" "+messageFmt, args...) +
+			objectString(object, f.IncludeObject) + annotationsString(annotations)
 	}
 }
 
 func (f *FakeRecorder) Event(object runtime.Object, eventtype, reason, message string) {
-	f.writeEvent(fmt.Sprintf("%s %s %s%s", eventtype, reason, message, objectString(object, f.IncludeObject)))
+	f.writeEvent(object, map[string]string{}, eventtype, reason, "%s", message)
 }
 
 func (f *FakeRecorder) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) {
-	f.writeEvent(
-		fmt.Sprintf(eventtype+" "+reason+" "+messageFmt, args...) +
-			objectString(object, f.IncludeObject),
-	)
+	f.writeEvent(object, map[string]string{}, eventtype, reason, messageFmt, args)
 }
 
 func (f *FakeRecorder) AnnotatedEventf(object runtime.Object, annotations map[string]string, eventtype, reason, messageFmt string, args ...interface{}) {
-	f.writeEvent(
-		fmt.Sprintf(eventtype+" "+reason+" "+messageFmt, args...) +
-			objectString(object, f.IncludeObject) +
-			" " + fmt.Sprint(annotations),
-	)
+	f.writeEvent(object, annotations, eventtype, reason, messageFmt, args)
 }
 
 // NewFakeRecorder creates new fake event recorder with event channel with