Merge pull request #328 from mortent/FixPruneEventTransformer

Fix missing error property in PruneEventTransformer

Author: k8s-ci-robot

cmd/printers/events/formatter_test.go

@@ -55,6 +55,16 @@ func TestFormatter_FormatApplyEvent(t *testing.T) {
 			},
 			expected: "cronjob.batch/my-cron configured (preview-server)",
 		},
+		"apply event with error should display the error": {
+			previewStrategy: common.DryRunServer,
+			event: event.ApplyEvent{
+				Operation:  event.Failed,
+				Type:       event.ApplyEventResourceUpdate,
+				Identifier: createIdentifier("apps", "Deployment", "", "my-dep"),
+				Error:      fmt.Errorf("this is a test error"),
+			},
+			expected: "deployment.apps/my-dep failed: this is a test error (preview-server)",
+		},
 		"completed event": {
 			previewStrategy: common.DryRunNone,
 			event: event.ApplyEvent{
@@ -164,6 +174,15 @@ func TestFormatter_FormatPruneEvent(t *testing.T) {
 			},
 			expected: "deployment.apps/my-dep prune skipped (preview)",
 		},
+		"resource with prune error": {
+			previewStrategy: common.DryRunNone,
+			event: event.PruneEvent{
+				Type:       event.PruneEventFailed,
+				Identifier: createIdentifier("apps", "Deployment", "", "my-dep"),
+				Error:      fmt.Errorf("this is a test"),
+			},
+			expected: "deployment.apps/my-dep prune failed: this is a test",
+		},
 		"prune event with completed status": {
 			previewStrategy: common.DryRunNone,
 			event: event.PruneEvent{
@@ -215,6 +234,16 @@ func TestFormatter_FormatDeleteEvent(t *testing.T) {
 			},
 			expected: "deployment.apps/my-dep delete skipped (preview)",
 		},
+		"resource with delete error": {
+			previewStrategy: common.DryRunServer,
+			event: event.DeleteEvent{
+				Type:       event.DeleteEventFailed,
+				Object:     createObject("apps", "Deployment", "", "my-dep"),
+				Identifier: createIdentifier("apps", "Deployment", "", "my-dep"),
+				Error:      fmt.Errorf("this is a test"),
+			},
+			expected: "deployment.apps/my-dep deletion failed: this is a test (preview-server)",
+		},
 		"delete event with completed status": {
 			previewStrategy: common.DryRunNone,
 			event: event.DeleteEvent{

pkg/apply/destroyer.go

@@ -131,26 +131,29 @@ func runPruneEventTransformer(eventChannel chan event.Event) (chan event.Event,
 	go func() {
 		defer close(completedChannel)
 		for msg := range tempEventChannel {
-			if msg.PruneEvent.Type == event.PruneEventFailed {
+			// If it is not a Prune event, no need to make any transformation.
+			if msg.Type != event.PruneType {
+				eventChannel <- msg
+			} else {
+				var deleteEventType event.DeleteEventType
+				switch msg.PruneEvent.Type {
+				case event.PruneEventFailed:
+					deleteEventType = event.DeleteEventFailed
+				case event.PruneEventCompleted:
+					deleteEventType = event.DeleteEventCompleted
+				case event.PruneEventResourceUpdate:
+					deleteEventType = event.DeleteEventResourceUpdate
+				}
 				eventChannel <- event.Event{
 					Type: event.DeleteType,
 					DeleteEvent: event.DeleteEvent{
-						Type:       event.DeleteEventFailed,
+						Type:       deleteEventType,
 						Operation:  transformPruneOperation(msg.PruneEvent.Operation),
 						Object:     msg.PruneEvent.Object,
 						Identifier: msg.PruneEvent.Identifier,
+						Error:      msg.PruneEvent.Error,
 					},
 				}
-				continue
-			}
-			eventChannel <- event.Event{
-				Type: event.DeleteType,
-				DeleteEvent: event.DeleteEvent{
-					Type:       event.DeleteEventResourceUpdate,
-					Operation:  transformPruneOperation(msg.PruneEvent.Operation),
-					Object:     msg.PruneEvent.Object,
-					Identifier: msg.PruneEvent.Identifier,
-				},
 			}
 		}
 	}()