Address comments from review

Author: hongkailiu

pkg/monitor/monitorapi/identification_operator.go

@@ -28,17 +28,17 @@ func GetOperatorConditionStatus(interval Interval) *configv1.ClusterOperatorStat
 	return condition
 }
 
-// GetOperatorConditionHumanMessage constructs a human-readable message from a given ClusterOperatorStatusCondition
-func GetOperatorConditionHumanMessage(s *configv1.ClusterOperatorStatusCondition) string {
+// GetOperatorConditionHumanMessage constructs a human-readable message from a given ClusterOperatorStatusCondition with a given prefix
+func GetOperatorConditionHumanMessage(s *configv1.ClusterOperatorStatusCondition, prefix string) string {
 	if s == nil {
 		return ""
 	}
 	switch {
 	case len(s.Reason) > 0 && len(s.Message) > 0:
-		return fmt.Sprintf("changed %s to %s: %s: %s", s.Type, s.Status, s.Reason, s.Message)
+		return fmt.Sprintf("%s%s=%s: %s: %s", prefix, s.Type, s.Status, s.Reason, s.Message)
 	case len(s.Message) > 0:
-		return fmt.Sprintf("changed %s to %s: %s", s.Type, s.Status, s.Message)
+		return fmt.Sprintf("%s%s=%s: %s", prefix, s.Type, s.Status, s.Message)
 	default:
-		return fmt.Sprintf("changed %s to %s", s.Type, s.Status)
+		return fmt.Sprintf("%s%s=%s", prefix, s.Type, s.Status)
 	}
 }

pkg/monitortests/clusterversionoperator/clusterversionchecker/monitortest.go

@@ -156,31 +156,25 @@ func (w *monitor) noFailingUnknownCondition(intervals monitorapi.Intervals) []*j
 
 	ret := []*junitapi.JUnitTestCase{noFailures}
 
-	except := func(coName string) string {
-		return ""
-	}
-
 	for _, coName := range sets.List(violations) {
-		if reason := except(coName); reason == "" {
-			bzComponent := platformidentification.GetBugzillaComponentForOperator(coName)
-			if bzComponent == "Unknown" {
-				bzComponent = coName
-			}
+		bzComponent := platformidentification.GetBugzillaComponentForOperator(coName)
+		if bzComponent == "Unknown" {
+			bzComponent = coName
+		}
 
-			m := 30
-			if coName == "machine-config" {
-				m = 3 * m
-			}
-			output := fmt.Sprintf("Cluster Operator %s has not completed version change after %d minutes", coName, m)
-			ret = append(ret, &junitapi.JUnitTestCase{
-				Name:     fmt.Sprintf("[bz-%v] clusteroperator/%v must complete version change under %d minutes", bzComponent, coName, m),
-				Duration: duration,
-				FailureOutput: &junitapi.FailureOutput{
-					Output:  output,
-					Message: output,
-				},
-			})
+		m := 30
+		if coName == "machine-config" {
+			m = 3 * m
 		}
+		output := fmt.Sprintf("Cluster Operator %s has not completed version change after %d minutes", coName, m)
+		ret = append(ret, &junitapi.JUnitTestCase{
+			Name:     fmt.Sprintf("[bz-%v] clusteroperator/%v must complete version change under %d minutes", bzComponent, coName, m),
+			Duration: duration,
+			FailureOutput: &junitapi.FailureOutput{
+				Output:  output,
+				Message: output,
+			},
+		})
 	}
 
 	return ret

pkg/monitortests/clusterversionoperator/clusterversionchecker/monitortest_test.go

@@ -25,12 +25,12 @@ func Test_parseClusterOperatorNames(t *testing.T) {
 			name:        "unexpected",
 			reason:      "reason",
 			message:     "unexpected",
-			expectedErr: fmt.Errorf("failed to parse cluster operator names from %q", "changed Some to Unknown: reason: unexpected"),
+			expectedErr: fmt.Errorf("failed to parse cluster operator names from %q", "changed to Some=Unknown: reason: unexpected"),
 		},
 		{
 			name:        "legit waiting on",
 			message:     "Working towards 1.2.3: waiting on co-not-timeout",
-			expectedErr: fmt.Errorf("failed to parse cluster operator names from %q", "changed Some to Unknown: Working towards 1.2.3: waiting on co-not-timeout"),
+			expectedErr: fmt.Errorf("failed to parse cluster operator names from %q", "changed to Some=Unknown: Working towards 1.2.3: waiting on co-not-timeout"),
 		},
 		{
 			name:     "one CO timeout",
@@ -78,7 +78,7 @@ func Test_parseClusterOperatorNames(t *testing.T) {
 				Status:  configv1.ConditionUnknown,
 				Message: tc.message,
 				Reason:  tc.reason,
-			})
+			}, "changed to ")
 			actual, actuallErr := parseClusterOperatorNames(msg)
 			if diff := cmp.Diff(tc.expectedErr, actuallErr, cmp.FilterValues(func(x, y interface{}) bool {
 				_, ok1 := x.(error)

pkg/monitortests/testframework/watchclusteroperators/operator.go

@@ -192,7 +192,7 @@ func startClusterOperatorMonitoring(ctx context.Context, m monitorapi.RecorderWr
 								monitorapi.AnnotationStatus:    string(s.Status),
 								monitorapi.AnnotationReason:    s.Reason,
 							}).
-							HumanMessage(monitorapi.GetOperatorConditionHumanMessage(s))).BuildNow())
+							HumanMessage(monitorapi.GetOperatorConditionHumanMessage(s, "changed to "))).BuildNow())
 				}
 			}
 			return intervals