fluxcd
/
cli-utils
mirror of https://github.com/fluxcd/cli-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing identifier in delete event

This commit is contained in:
Morten Torkildsen 2020-12-31 15:10:00 -08:00
parent 304deb6852
commit 32bf6f6404
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/apply/destroyer.go
View File

@ -139,9 +139,10 @@ func runPruneEventTransformer(eventChannel chan event.Event) (chan event.Event,
eventChannel <- event.Event{ eventChannel <- event.Event{
Type: event.DeleteType, Type: event.DeleteType,
DeleteEvent: event.DeleteEvent{ DeleteEvent: event.DeleteEvent{
Type: event.DeleteEventResourceUpdate, Type: event.DeleteEventResourceUpdate,
Operation: transformPruneOperation(msg.PruneEvent.Operation), Operation: transformPruneOperation(msg.PruneEvent.Operation),
Object: msg.PruneEvent.Object, Object: msg.PruneEvent.Object,
Identifier: msg.PruneEvent.Identifier,
}, },
} }
} }

6
test/e2e/crd_test.go
View File

@ -103,10 +103,8 @@ func crdTest(_ client.Client, inventoryName, namespaceName string) {
deleteEvent: &expDeleteEvent{ deleteEvent: &expDeleteEvent{
deleteEventType: event.DeleteEventResourceUpdate, deleteEventType: event.DeleteEventResourceUpdate,
operation: event.Deleted, operation: event.Deleted,
// TODO(mortent): The identifier isn't populated in the Delete identifier: object.UnstructuredToObjMeta(manifestToUnstructured(crd)),
// events. This should be fixed. error: nil,
// identifier: object.UnstructuredToObjMeta(manifestToUnstructured(crd)),
error: nil,
}, },
}, },
}, destroyerEvents) }, destroyerEvents)