Use actual bracketing times to present duration. (#1033)

* Use actual bracketing times to present duration.

* Put in a comment on what to do if there's no status.completionTime

* Add unit tests for the duration calculator code.

Author: ericpromislow

pkg/resources/common/formatter.go

@@ -323,6 +323,14 @@ func convertMetadataTimestampFields(request *types.APIRequest, gvk schema2.Group
 		if !hasCRDDateField && !hasGVKDateFieldMapping {
 			continue
 		}
+		if col.Name == "Duration" {
+			humanDuration, ok := getHumanDurationFromActualStartEndTime(unstr)
+			if ok {
+				curValue[index] = humanDuration
+				changedFields = true
+				continue
+			}
+		}
 
 		timeValue, ok := curValue[index].(string)
 		if !ok {
@@ -363,6 +371,34 @@ func convertMetadataTimestampFields(request *types.APIRequest, gvk schema2.Group
 	}
 }
 
+func getHumanDurationFromActualStartEndTime(unstr *unstructured.Unstructured) (string, bool) {
+	startTime, found, err := unstructured.NestedString(unstr.Object, "status", "startTime")
+	if !found || err != nil {
+		return "", false
+	}
+	endTime, found, err := unstructured.NestedString(unstr.Object, "status", "completionTime")
+	if !found || err != nil {
+		// This is deliberate -- if there's no completionTime,
+		// Duration should be the same as Age, which is what will happen in the fallback code.
+		return "", false
+	}
+	startTimeRFC, err := time.Parse(time.RFC3339, startTime)
+	if err != nil {
+		return "", false
+	}
+	endTimeRFC, err := time.Parse(time.RFC3339, endTime)
+	if err != nil {
+		return "", false
+	}
+	durationTime := endTimeRFC.Sub(startTimeRFC)
+	humanDuration := duration.HumanDuration(durationTime)
+	if humanDuration == "<invalid>" {
+		logrus.Warnf(`couldn't convert value %v into human duration for "Duration" column`, durationTime)
+		return "", false
+	}
+	return humanDuration, true
+}
+
 func isDuration(value string) (time.Duration, bool) {
 	d, err := ParseTimestampOrHumanReadableDuration(value)
 	return d, err == nil

pkg/resources/common/formatter_test.go

@@ -1363,3 +1363,170 @@ func TestFormatterAddsResourcePermissions(t *testing.T) {
 		})
 	}
 }
+
+func Test_getHumanDurationFromActualStartEndTime(t *testing.T) {
+	tests := []struct {
+		name        string
+		unstr       *unstructured.Unstructured
+		wantStatus  bool
+		wantNewTime string
+	}{
+		{
+			name: "calculate duration from start and end time",
+			unstr: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"creationTimestamp": "2022-04-11T22:05:27Z",
+						"fields": []string{
+							"item1",
+							"Complete",
+							"1/1",
+							"63s",
+							"63s",
+							"item1",
+						},
+						"name": "item1",
+					},
+					"status": map[string]interface{}{
+						"startTime":      "2026-02-25T22:54:00Z",
+						"completionTime": "2026-02-25T22:54:05Z",
+					},
+				},
+			},
+			wantStatus:  true,
+			wantNewTime: "5s",
+		},
+		{
+			name: "fallback if no completion time is given",
+			unstr: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"creationTimestamp": "2022-04-11T22:05:27Z",
+						"fields": []string{
+							"item1",
+							"Complete",
+							"1/1",
+							"64s",
+							"64s",
+							"item1",
+						},
+						"name": "item1",
+					},
+					"status": map[string]interface{}{
+						"startTime": "2026-02-25T22:54:00Z",
+					},
+				},
+			},
+			wantStatus:  false,
+			wantNewTime: "",
+		},
+		{
+			name: "fallback if no start time is given",
+			unstr: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"creationTimestamp": "2022-04-11T22:05:27Z",
+						"fields": []string{
+							"item1",
+							"Complete",
+							"1/1",
+							"64s",
+							"64s",
+							"item1",
+						},
+						"name": "item1",
+					},
+				},
+			},
+			wantStatus:  false,
+			wantNewTime: "",
+		},
+		{
+			name: "fallback if no completion time is given",
+			unstr: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"creationTimestamp": "2022-04-11T22:05:27Z",
+						"fields": []string{
+							"item1",
+							"Complete",
+							"1/1",
+							"64s",
+							"64s",
+							"item1",
+						},
+						"name": "item1",
+					},
+					"status": map[string]interface{}{
+						"startTime": "2026-02-25T22:54:00Z",
+					},
+				},
+			},
+			wantStatus:  false,
+			wantNewTime: "",
+		},
+		{
+			name: "fallback if start time isn't processable",
+			unstr: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"creationTimestamp": "2022-04-11T22:05:27Z",
+						"fields": []string{
+							"item1",
+							"Complete",
+							"1/1",
+							"64s",
+							"64s",
+							"item1",
+						},
+						"name": "item1",
+					},
+					"status": map[string]interface{}{
+						"startTime": "Midnight!",
+					},
+				},
+			},
+			wantStatus:  false,
+			wantNewTime: "",
+		},
+		{
+			name: "fallback if end time isn't processable",
+			unstr: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"creationTimestamp": "2022-04-11T22:05:27Z",
+						"fields": []string{
+							"item1",
+							"Complete",
+							"1/1",
+							"64s",
+							"64s",
+							"item1",
+						},
+						"name": "item1",
+					},
+					"status": map[string]interface{}{
+						"completionTime": "Midnight!",
+					},
+				},
+			},
+			wantStatus:  false,
+			wantNewTime: "",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			duration, useDuration := getHumanDurationFromActualStartEndTime(test.unstr)
+			if test.wantStatus {
+				require.Equal(t, test.wantNewTime, duration)
+				require.True(t, useDuration)
+			} else {
+				require.Equal(t, "", duration)
+				require.False(t, useDuration)
+			}
+		})
+	}
+
+}