Skip to content

Commit 85d57a0

Browse files
committed
refactor(reflection): simplify tombstone unwrapping in reflector
1 parent 0b1145e commit 85d57a0

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

internal/crdReplicator/reflection/reflector.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,10 @@ func (r *Reflector) eventHandlers(gvr schema.GroupVersionResource) cache.Resourc
257257

258258
ehDelete := func(obj interface{}) {
259259
// Delete events may come wrapped in a tombstone; unwrap it if needed.
260-
if tombstone, ok := obj.(cache.DeletedFinalStateUnknown); ok {
260+
switch tombstone := obj.(type) {
261+
case cache.DeletedFinalStateUnknown:
261262
obj = tombstone.Obj
262-
} else if tombstone, ok := obj.(*cache.DeletedFinalStateUnknown); ok {
263+
case *cache.DeletedFinalStateUnknown:
263264
obj = tombstone.Obj
264265
}
265266
eh(obj)

pkg/virtualKubelet/reflection/generic/reflector.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,10 @@ func (gr *reflector) handlers(keyer options.Keyer, filters ...options.EventFilte
305305
// Unwrap tombstones for delete events. Informers may pass a
306306
// cache.DeletedFinalStateUnknown containing the last known object.
307307
if ev == watch.Deleted {
308-
if tombstone, ok := obj.(cache.DeletedFinalStateUnknown); ok {
308+
switch tombstone := obj.(type) {
309+
case cache.DeletedFinalStateUnknown:
309310
obj = tombstone.Obj
310-
} else if tombstone, ok := obj.(*cache.DeletedFinalStateUnknown); ok {
311+
case *cache.DeletedFinalStateUnknown:
311312
obj = tombstone.Obj
312313
}
313314
}

0 commit comments

Comments
 (0)