ToSquash: Remove useless error from the AlertGetter's return

Author: hongkailiu

pkg/clusterconditions/promql/alerts.go

@@ -16,7 +16,7 @@ import (
 )
 
 type Getter interface {
-	Get(ctx context.Context) (prometheusv1.AlertsResult, error)
+	Get(ctx context.Context) prometheusv1.AlertsResult
 }
 
 func NewAlertGetter(promQLTarget clusterconditions.PromQLTarget) Getter {
@@ -38,13 +38,13 @@ type ocAlertGetter struct {
 	lastRefresh time.Time
 }
 
-func (o *ocAlertGetter) Get(ctx context.Context) (prometheusv1.AlertsResult, error) {
+func (o *ocAlertGetter) Get(ctx context.Context) prometheusv1.AlertsResult {
 	if time.Now().After(o.lastRefresh.Add(o.expiration)) {
 		if err := o.refresh(ctx); err != nil {
 			klog.Errorf("Failed to refresh alerts, using stale cache instead: %v", err)
 		}
 	}
-	return o.cached, nil
+	return o.cached
 }
 
 func (o *ocAlertGetter) refresh(ctx context.Context) error {

pkg/cvo/availableupdates.go

@@ -519,18 +519,15 @@ func calculateAvailableUpdatesStatus(ctx context.Context, clusterID string, tran
 }
 
 type AlertGetter interface {
-	Get(ctx context.Context) (prometheusv1.AlertsResult, error)
+	Get(ctx context.Context) prometheusv1.AlertsResult
 }
 
-func (u *availableUpdates) evaluateAlertRisks(ctx context.Context) ([]configv1.ConditionalUpdateRisk, error) {
+func (u *availableUpdates) evaluateAlertRisks(ctx context.Context) []configv1.ConditionalUpdateRisk {
 	if u == nil || u.AlertGetter == nil {
-		return nil, nil
-	}
-	alertsResult, err := u.AlertGetter.Get(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get alerts: %w", err)
+		return nil
 	}
-	return alertsToRisks(alertsResult.Alerts), nil
+	alertsResult := u.AlertGetter.Get(ctx)
+	return alertsToRisks(alertsResult.Alerts)
 }
 
 func alertsToRisks(alerts []prometheusv1.Alert) []configv1.ConditionalUpdateRisk {
@@ -683,12 +680,7 @@ func (u *availableUpdates) evaluateConditionalUpdates(ctx context.Context) {
 
 	var alertRisks []configv1.ConditionalUpdateRisk
 	if u.ShouldReconcileAcceptRisks() {
-		if evaluated, err := u.evaluateAlertRisks(ctx); err != nil {
-			klog.Errorf("Failed to evaluate alert conditions: %v", err)
-		} else {
-			alertRisks = evaluated
-		}
-
+		alertRisks = u.evaluateAlertRisks(ctx)
 	}
 	u.attachAlertRisksToUpdates(alertRisks)
 

pkg/cvo/availableupdates_test.go

@@ -960,22 +960,23 @@ func Test_loadRiskConditions(t *testing.T) {
 type mockAlertGetter struct {
 	ret      prometheusv1.AlertsResult
 	jsonFile string
+	t        *testing.T
 }
 
-func (m *mockAlertGetter) Get(_ context.Context) (prometheusv1.AlertsResult, error) {
+func (m *mockAlertGetter) Get(_ context.Context) prometheusv1.AlertsResult {
 	var ret prometheusv1.AlertsResult
 	if m.jsonFile != "" {
 		data, err := os.ReadFile(m.jsonFile)
 		if err != nil {
-			return ret, err
+			m.t.Fatal(err)
 		}
 		err = json.Unmarshal(data, &ret)
 		if err != nil {
-			return ret, err
+			m.t.Fatal(err)
 		}
-		return ret, nil
+		return ret
 	}
-	return m.ret, nil
+	return m.ret
 }
 
 func Test_evaluateAlertConditions(t *testing.T) {
@@ -995,6 +996,7 @@ func Test_evaluateAlertConditions(t *testing.T) {
 			name: "basic case",
 			u: &availableUpdates{
 				AlertGetter: &mockAlertGetter{
+					t: t,
 					ret: prometheusv1.AlertsResult{
 						Alerts: []prometheusv1.Alert{
 							{
@@ -1088,6 +1090,7 @@ func Test_evaluateAlertConditions(t *testing.T) {
 			name: "from file",
 			u: &availableUpdates{
 				AlertGetter: &mockAlertGetter{
+					t:        t,
 					jsonFile: filepath.Join("testdata", "alerts.json"),
 				},
 			},
@@ -1110,20 +1113,9 @@ func Test_evaluateAlertConditions(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			actual, actualError := tt.u.evaluateAlertRisks(context.TODO())
-			if diff := cmp.Diff(tt.expectedErr, actualError, cmp.Comparer(func(x, y error) bool {
-				if x == nil || y == nil {
-					return x == nil && y == nil
-				}
-				return x.Error() == y.Error()
-			})); diff != "" {
-				t.Errorf("error mismatch (-want +got):\n%s", diff)
-			}
-
-			if actualError == nil {
-				if diff := cmp.Diff(tt.expectedAlertRisks, actual); diff != "" {
-					t.Errorf("AlertRisks mismatch (-want +got):\n%s", diff)
-				}
+			actual := tt.u.evaluateAlertRisks(context.TODO())
+			if diff := cmp.Diff(tt.expectedAlertRisks, actual); diff != "" {
+				t.Errorf("AlertRisks mismatch (-want +got):\n%s", diff)
 			}
 		})
 	}
@@ -1515,7 +1507,7 @@ func Test_evaluateConditionalUpdates(t *testing.T) {
 				ConditionalUpdates:         tt.conditionUpdates,
 				ShouldReconcileAcceptRisks: tt.shouldReconcileAcceptRisks,
 				ConditionRegistry:          conditionRegistry,
-				AlertGetter:                &mockAlertGetter{jsonFile: filepath.Join("testdata", "alerts.json")},
+				AlertGetter:                &mockAlertGetter{t: t, jsonFile: filepath.Join("testdata", "alerts.json")},
 			}
 			u.evaluateConditionalUpdates(context.TODO())
 			if diff := cmp.Diff(tt.expected, u.Updates); diff != "" {