Merge pull request #389 from floreks/events-fix

Fixed event warning icon not displayed in events table

Author: bryk

src/app/backend/events.go

@@ -35,7 +35,7 @@ type Events struct {
 
 // Single event representation.
 type Event struct {
-	// Event message.
+	// A human-readable description of the status of related object.
 	Message string `json:"message"`
 
 	// Component from which the event is generated.
@@ -59,7 +59,8 @@ type Event struct {
 	// The time at which the most recent occurrence of this event was recorded.
 	LastSeen unversioned.Time `json:"lastSeen"`
 
-	// Reason why this event was generated.
+	// Short, machine understandable string that gives the reason
+	// for this event being generated.
 	Reason string `json:"reason"`
 
 	// Event type (at the moment only normal and warning are supported).
@@ -78,19 +79,23 @@ func GetEvents(client *client.Client, namespace, replicationControllerName strin
 		return nil, err
 	}
 
-	events := AppendEvents(rsEvents, Events{
-		Namespace: namespace,
-		Events:    make([]Event, 0),
-	})
-
 	// Get events for pods in replication controller.
 	podEvents, err := GetReplicationControllerPodsEvents(client, namespace, replicationControllerName)
 
 	if err != nil {
 		return nil, err
 	}
 
-	events = AppendEvents(podEvents, events)
+	apiEvents := append(rsEvents, podEvents...)
+
+	if !isTypeFilled(apiEvents) {
+		apiEvents = fillEventsType(apiEvents)
+	}
+
+	events := AppendEvents(apiEvents, Events{
+		Namespace: namespace,
+		Events:    make([]Event, 0),
+	})
 
 	log.Printf("Found %d events related to %s replication controller in %s namespace", len(events.Events),
 		replicationControllerName, namespace)

src/app/backend/eventscommon.go

@@ -23,21 +23,11 @@ import (
 
 // Partial string to correctly filter warning events.
 // Has to be lower case for correct case insensitive comparison.
-const FAILED_REASON_PARTIAL = "failed"
-
-// Contains basic information about event related to a pod
-type PodEvent struct {
-	// Short, machine understandable string that gives the reason
-	// for this event being generated.
-	Reason string `json:"reason"`
-
-	// A human-readable description of the status of related pod.
-	Message string `json:"message"`
-}
+const FailedReasonPartial = "failed"
 
 // Returns warning pod events based on given list of pods.
 // TODO(floreks) : Import and use Set instead of custom function to get rid of duplicates
-func GetPodsEventWarnings(client client.Interface, pods []api.Pod) (result []PodEvent, err error) {
+func GetPodsEventWarnings(client client.Interface, pods []api.Pod) (result []Event, err error) {
 	for _, pod := range pods {
 		if !isRunningOrSucceeded(pod) {
 			log.Printf("Getting warning events from pod: %s", pod.Name)
@@ -56,20 +46,21 @@ func GetPodsEventWarnings(client client.Interface, pods []api.Pod) (result []Pod
 
 // Returns list of Pod Event model objects based on kubernetes API event list object
 // Event list object is filtered to get only warning events.
-func getPodsEventWarnings(eventList *api.EventList) []PodEvent {
-	result := make([]PodEvent, 0)
+func getPodsEventWarnings(eventList *api.EventList) []Event {
+	result := make([]Event, 0)
 
 	var events []api.Event
-	if isTypeFilled(eventList.Items) {
-		events = filterEventsByType(eventList.Items, api.EventTypeWarning)
-	} else {
-		events = filterEventsByReason(eventList.Items, FAILED_REASON_PARTIAL)
+	if !isTypeFilled(eventList.Items) {
+		eventList.Items = fillEventsType(eventList.Items)
 	}
 
+	events = filterEventsByType(eventList.Items, api.EventTypeWarning)
+
 	for _, event := range events {
-		result = append(result, PodEvent{
+		result = append(result, Event{
 			Message: event.Message,
 			Reason:  event.Reason,
+			Type:    event.Type,
 		})
 	}
 
@@ -93,23 +84,6 @@ func filterEventsByType(events []api.Event, eventType string) []api.Event {
 	return result
 }
 
-// Filters kubernetes API event objects based on reason property.
-// Empty string will return all events.
-func filterEventsByReason(events []api.Event, partial string) []api.Event {
-	if len(partial) == 0 || len(events) == 0 {
-		return events
-	}
-
-	result := make([]api.Event, 0)
-	for _, event := range events {
-		if strings.Contains(strings.ToLower(event.Reason), partial) {
-			result = append(result, event)
-		}
-	}
-
-	return result
-}
-
 // Returns true if all given events type is filled, false otherwise.
 // This is needed as some older versions of kubernetes do not have Type property filled.
 func isTypeFilled(events []api.Event) bool {
@@ -126,10 +100,23 @@ func isTypeFilled(events []api.Event) bool {
 	return true
 }
 
+// Based on event Reason fills event Type in order to allow correct filtering by Type.
+func fillEventsType(events []api.Event) []api.Event {
+	for i, _ := range events {
+		if strings.Contains(strings.ToLower(events[i].Reason), FailedReasonPartial) {
+			events[i].Type = api.EventTypeWarning
+		} else {
+			events[i].Type = api.EventTypeNormal
+		}
+	}
+
+	return events
+}
+
 // Removes duplicate strings from the slice
-func removeDuplicates(slice []PodEvent) []PodEvent {
+func removeDuplicates(slice []Event) []Event {
 	visited := make(map[string]bool, 0)
-	result := make([]PodEvent, 0)
+	result := make([]Event, 0)
 
 	for _, elem := range slice {
 		if !visited[elem.Reason] {

src/app/backend/replicationcontrollercommon.go

@@ -45,7 +45,7 @@ type ReplicationControllerPodInfo struct {
 	Failed int `json:"failed"`
 
 	// Unique warning messages related to pods in this Replication Controller.
-	Warnings []PodEvent `json:"warnings"`
+	Warnings []Event `json:"warnings"`
 }
 
 // Returns structure containing ReplicationController and Pods for the given replication controller.

src/app/backend/replicationcontrollerlist.go

@@ -25,7 +25,7 @@ import (
 )
 
 // Callback function in order to get the pod status errors
-type GetPodsEventWarningsFunc func(pods []api.Pod) ([]PodEvent, error)
+type GetPodsEventWarningsFunc func(pods []api.Pod) ([]Event, error)
 
 // Callback function in order to get node by name.
 type GetNodeFunc func(nodeName string) (*api.Node, error)
@@ -51,7 +51,7 @@ type ReplicationController struct {
 	// Label of this Replication Controller.
 	Labels map[string]string `json:"labels"`
 
-	// Aggregate information about pods belonging to this repolica set.
+	// Aggregate information about pods belonging to this Replication Controller.
 	Pods ReplicationControllerPodInfo `json:"pods"`
 
 	// Container images of the Replication Controller.
@@ -97,7 +97,7 @@ func GetReplicationControllerList(client *client.Client) (*ReplicationController
 	// Anonymous callback function to get pods warnings.
 	// Function fulfils GetPodsEventWarningsFunc type contract.
 	// Based on list of api pods returns list of pod related warning events
-	getPodsEventWarningsFn := func(pods []api.Pod) ([]PodEvent, error) {
+	getPodsEventWarningsFn := func(pods []api.Pod) ([]Event, error) {
 		errors, err := GetPodsEventWarnings(client, pods)
 
 		if err != nil {

src/app/externs/backendapi.js

@@ -106,22 +106,14 @@ backendApi.Event;
  */
 backendApi.ReplicationControllerList;
 
-/**
- * @typedef {{
- *   reason: string,
- *   message: string
- * }}
- */
-backendApi.PodEvent;
-
 /**
  * @typedef {{
  *   current: number,
  *   desired: number,
  *   running: number,
  *   pending: number,
  *   failed: number,
- *   warnings: !Array<!backendApi.PodEvent>
+ *   warnings: !Array<!backendApi.Event>
  * }}
  */
 backendApi.ReplicationControllerPodInfo;

src/test/backend/eventscommon_test.go

@@ -68,9 +68,9 @@ func TestGetPodsEventWarningsApi(t *testing.T) {
 func TestGetPodsEventWarnings(t *testing.T) {
 	cases := []struct {
 		events   *api.EventList
-		expected []PodEvent
+		expected []Event
 	}{
-		{&api.EventList{Items: nil}, []PodEvent{}},
+		{&api.EventList{Items: nil}, []Event{}},
 		{
 			&api.EventList{
 				Items: []api.Event{
@@ -81,10 +81,11 @@ func TestGetPodsEventWarnings(t *testing.T) {
 					},
 				},
 			},
-			[]PodEvent{
+			[]Event{
 				{
 					Message: "msg",
 					Reason:  "reason",
+					Type:    api.EventTypeWarning,
 				},
 			},
 		},
@@ -97,10 +98,11 @@ func TestGetPodsEventWarnings(t *testing.T) {
 					},
 				},
 			},
-			[]PodEvent{
+			[]Event{
 				{
 					Message: "msg",
 					Reason:  "failed",
+					Type:    api.EventTypeWarning,
 				},
 			},
 		},
@@ -113,7 +115,7 @@ func TestGetPodsEventWarnings(t *testing.T) {
 					},
 				},
 			},
-			[]PodEvent{},
+			[]Event{},
 		},
 	}
 
@@ -171,38 +173,38 @@ func TestFilterEventsByType(t *testing.T) {
 
 func TestRemoveDuplicates(t *testing.T) {
 	cases := []struct {
-		slice    []PodEvent
-		expected []PodEvent
+		slice    []Event
+		expected []Event
 	}{
-		{nil, []PodEvent{}},
+		{nil, []Event{}},
 		{
-			[]PodEvent{
+			[]Event{
 				{Reason: "test"},
 				{Reason: "test2"},
 				{Reason: "test"},
 			},
-			[]PodEvent{
+			[]Event{
 				{Reason: "test"},
 				{Reason: "test2"},
 			},
 		},
 		{
-			[]PodEvent{
+			[]Event{
 				{Reason: "test"},
 				{Reason: "test"},
 				{Reason: "test"},
 			},
-			[]PodEvent{
+			[]Event{
 				{Reason: "test"},
 			},
 		},
 		{
-			[]PodEvent{
+			[]Event{
 				{Reason: "test"},
 				{Reason: "test2"},
 				{Reason: "test3"},
 			},
-			[]PodEvent{
+			[]Event{
 				{Reason: "test"},
 				{Reason: "test2"},
 				{Reason: "test3"},
@@ -267,44 +269,6 @@ func TestIsRunningOrSucceeded(t *testing.T) {
 	}
 }
 
-func TestFilterEventsByReason(t *testing.T) {
-	cases := []struct {
-		events   []api.Event
-		partial  string
-		expected []api.Event
-	}{
-		{nil, "", nil},
-		{nil, "failed", nil},
-		{
-			[]api.Event{
-				{
-					Message: "msg",
-					Reason:  "reason",
-				},
-				{
-					Message: "msg-2",
-					Reason:  "failed",
-				},
-			},
-			"failed",
-			[]api.Event{
-				{
-					Message: "msg-2",
-					Reason:  "failed",
-				},
-			},
-		},
-	}
-
-	for _, c := range cases {
-		actual := filterEventsByReason(c.events, c.partial)
-		if !reflect.DeepEqual(actual, c.expected) {
-			t.Errorf("filterEventsByReason(%#v, %#v) == \n%#v\nexpected \n%#v\n",
-				c.events, c.partial, actual, c.expected)
-		}
-	}
-}
-
 func TestIsTypeFilled(t *testing.T) {
 	cases := []struct {
 		events   []api.Event
@@ -339,3 +303,31 @@ func TestIsTypeFilled(t *testing.T) {
 		}
 	}
 }
+
+func TestFillEventsType(t *testing.T) {
+	cases := []struct {
+		events   []api.Event
+		expected []api.Event
+	}{
+		{nil, nil},
+		{[]api.Event{}, []api.Event{}},
+		{
+			[]api.Event{
+				{Reason: "failed"},
+				{Reason: "test"},
+			},
+			[]api.Event{
+				{Reason: "failed", Type: api.EventTypeWarning},
+				{Reason: "test", Type: api.EventTypeNormal},
+			},
+		},
+	}
+
+	for _, c := range cases {
+		actual := fillEventsType(c.events)
+		if !reflect.DeepEqual(actual, c.expected) {
+			t.Errorf("fillEventsType(%#v) == \n%#v\nexpected \n%#v\n",
+				c.events, actual, c.expected)
+		}
+	}
+}