Respond to review

This commit is contained in:
Lucy Sweet 2023-02-21 16:29:38 +01:00
parent 9839ce96f5
commit 7a48c6e217

View File

@ -42,25 +42,37 @@ func objectString(object runtime.Object, includeObject bool) string {
) )
} }
func (f *FakeRecorder) Event(object runtime.Object, eventtype, reason, message string) { func annotationString(annotations map[string]string, includeAnnotations bool) string {
if f.Events != nil { if !includeAnnotations {
f.Events <- fmt.Sprintf("%s %s %s%s", eventtype, reason, message, objectString(object, f.IncludeObject)) return ""
} }
return " " + fmt.Sprint(annotations)
}
func (f *FakeRecorder) writeEvent(event string) {
if f.Events != nil {
f.Events <- event
}
}
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)))
} }
func (f *FakeRecorder) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) { func (f *FakeRecorder) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) {
if f.Events != nil { f.writeEvent(
f.Events <- fmt.Sprintf(eventtype+" "+reason+" "+messageFmt, args...) + objectString(object, f.IncludeObject) fmt.Sprintf(eventtype+" "+reason+" "+messageFmt, args...) +
} objectString(object, f.IncludeObject),
)
} }
func (f *FakeRecorder) AnnotatedEventf(object runtime.Object, annotations map[string]string, eventtype, reason, messageFmt string, args ...interface{}) { func (f *FakeRecorder) AnnotatedEventf(object runtime.Object, annotations map[string]string, eventtype, reason, messageFmt string, args ...interface{}) {
if f.IncludeAnnotations { f.writeEvent(
args = append(args, fmt.Sprint(annotations)) fmt.Sprintf(eventtype+" "+reason+" "+messageFmt, args...) +
f.Eventf(object, eventtype, reason, messageFmt+" %s", args...) objectString(object, f.IncludeObject) +
} else { annotationString(annotations, f.IncludeAnnotations),
f.Eventf(object, eventtype, reason, messageFmt, args...) )
}
} }
// NewFakeRecorder creates new fake event recorder with event channel with // NewFakeRecorder creates new fake event recorder with event channel with