move field reported to changed

pkg/skaffold/deploy/resource/deployment.go

@@ -54,11 +54,14 @@ func (d *Deployment) Deadline() time.Duration {
 
 func (d *Deployment) UpdateStatus(details string, err error) {
 	updated := newStatus(details, err)
-	if !d.status.Equal(updated) {
-		d.status = updated
-		if strings.Contains(details, rollOutSuccess) || isErrAndNotRetryAble(err) {
-			d.done = true
-		}
+	if d.status.Equal(updated) {
+		d.status.changed = false
+		return
+	}
+	d.status = updated
+	d.status.changed = true
+	if strings.Contains(details, rollOutSuccess) || isErrAndNotRetryAble(err) {
+		d.done = true
 	}
 }
 
@@ -111,7 +114,7 @@ func (d *Deployment) IsStatusCheckComplete() bool {
 }
 
 func (d *Deployment) ReportSinceLastUpdated() string {
-	if d.status.reported {
+	if d.status.reported && !d.status.changed {
 		return ""
 	}
 	d.status.reported = true

pkg/skaffold/deploy/resource/deployment_test.go

@@ -206,35 +206,47 @@ func TestReportSinceLastUpdated(t *testing.T) {
 			dep.UpdateStatus(test.message, test.err)
 
 			t.CheckDeepEqual(test.expected, dep.ReportSinceLastUpdated())
-			t.CheckTrue(dep.status.reported)
+			t.CheckTrue(dep.status.changed)
 		})
 	}
 }
 
 func TestReportSinceLastUpdatedMultipleTimes(t *testing.T) {
 	var tests = []struct {
-		description string
-		times       int
-		expected    string
+		description     string
+		statuses        []string
+		reportStatusSeq []bool
+		expected        string
 	}{
 		{
-			description: "report first time should return status",
-			times:       1,
-			expected:    "test-ns:deployment/test: cannot pull image",
+			description:     "report first time should return status",
+			statuses:        []string{"cannot pull image"},
+			reportStatusSeq: []bool{true},
+			expected:        "test-ns:deployment/test: cannot pull image",
+		},
+		{
+			description:     "report 2nd time should not return when same status",
+			statuses:        []string{"cannot pull image", "cannot pull image"},
+			reportStatusSeq: []bool{true, true},
+			expected:        "",
 		},
 		{
-			description: "report 2nd time should not return",
-			times:       2,
-			expected:    "",
+			description:     "report called after multiple changes but last status was not changed.",
+			statuses:        []string{"cannot pull image", "changed but not reported", "changed but not reported", "changed but not reported"},
+			reportStatusSeq: []bool{true, false, false, true},
+			expected:        "test-ns:deployment/test: changed but not reported",
 		},
 	}
 	for _, test := range tests {
 		testutil.Run(t, test.description, func(t *testutil.T) {
 			dep := NewDeployment("test", "test-ns", 1)
-			dep.UpdateStatus("cannot pull image", nil)
 			var actual string
-			for i := 0; i < test.times; i++ {
-				actual = dep.ReportSinceLastUpdated()
+			for i, status := range test.statuses {
+				// update to same status
+				dep.UpdateStatus(status, nil)
+				if test.reportStatusSeq[i] {
+					actual = dep.ReportSinceLastUpdated()
+				}
 			}
 			t.CheckDeepEqual(test.expected, actual)
 		})

pkg/skaffold/deploy/resource/status.go

@@ -19,6 +19,7 @@ package resource
 type Status struct {
 	err      error
 	details  string
+	changed  bool
 	reported bool
 }
 
@@ -47,5 +48,6 @@ func newStatus(msg string, err error) Status {
 	return Status{
 		details: msg,
 		err:     err,
+		changed: true,
 	}
 }