Skip to content

Commit 4cf5d5b

Browse files
committed
fix lint issues
1 parent 8e06a06 commit 4cf5d5b

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

api/v1beta1/common_types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package v1beta1
2+
3+
const (
4+
// StatusTrue indicates the metric resource is considered ready/active.
5+
StatusTrue = "True"
6+
// StatusFalse indicates the metric resource is not ready/active.
7+
StatusFalse = "False"
8+
)

internal/controller/compoundmetric_controller.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,11 @@ func (r *CompoundMetricReconciler) Reconcile(ctx context.Context, req ctrl.Reque
151151
// TODO: Update status?
152152
return ctrl.Result{RequeueAfter: RequeueAfterError}, errCli
153153
}
154-
defer metricClient.Close(ctx) // Ensure exporter is shut down
154+
defer func() {
155+
if err := metricClient.Close(ctx); err != nil {
156+
l.Error(err, "Failed to close metric client during compound metric reconciliation", "metric", metric.Name)
157+
}
158+
}() // Ensure exporter is shut down
155159

156160
metricClient.SetMeter("compound")
157161

@@ -174,7 +178,7 @@ func (r *CompoundMetricReconciler) Reconcile(ctx context.Context, req ctrl.Reque
174178
result, errMon := orchestrator.Handler.Monitor(ctx)
175179

176180
if errMon != nil {
177-
metric.Status.Ready = "False"
181+
metric.Status.Ready = v1beta1.StatusFalse
178182
l.Error(errMon, fmt.Sprintf("compound metric '%s' re-queued for execution in %v minutes\n", metric.Spec.Name, RequeueAfterError))
179183
// Update status before returning
180184
_ = r.getClient().Status().Update(ctx, &metric) // Best effort status update on error
@@ -183,10 +187,10 @@ func (r *CompoundMetricReconciler) Reconcile(ctx context.Context, req ctrl.Reque
183187

184188
errExport := metricClient.ExportMetrics(ctx)
185189
if errExport != nil {
186-
metric.Status.Ready = "False"
190+
metric.Status.Ready = v1beta1.StatusFalse
187191
l.Error(errExport, fmt.Sprintf("compound metric '%s' failed to export, re-queued for execution in %v minutes\n", metric.Spec.Name, RequeueAfterError))
188192
} else {
189-
metric.Status.Ready = "True"
193+
metric.Status.Ready = v1beta1.StatusTrue
190194
}
191195

192196
/*

internal/controller/singlemetric_controller.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,11 @@ func (r *SingleMetricReconciler) Reconcile(ctx context.Context, req ctrl.Request
152152
// TODO: Update status?
153153
return ctrl.Result{RequeueAfter: RequeueAfterError}, errCli
154154
}
155-
defer metricClient.Close(ctx) // Ensure exporter is shut down
155+
defer func() {
156+
if err := metricClient.Close(ctx); err != nil {
157+
l.Error(err, "Failed to close metric client during single metric reconciliation", "metric", metric.Name)
158+
}
159+
}() // Ensure exporter is shut down
156160

157161
metricClient.SetMeter("single")
158162

@@ -175,7 +179,7 @@ func (r *SingleMetricReconciler) Reconcile(ctx context.Context, req ctrl.Request
175179
result, errMon := orchestrator.Handler.Monitor(ctx)
176180

177181
if errMon != nil {
178-
metric.Status.Ready = "False"
182+
metric.Status.Ready = v1beta1.StatusFalse
179183
l.Error(errMon, fmt.Sprintf("single metric '%s' re-queued for execution in %v minutes\n", metric.Spec.Name, RequeueAfterError))
180184
// Update status before returning
181185
_ = r.getClient().Status().Update(ctx, &metric) // Best effort status update on error
@@ -184,10 +188,10 @@ func (r *SingleMetricReconciler) Reconcile(ctx context.Context, req ctrl.Request
184188

185189
errExport := metricClient.ExportMetrics(ctx)
186190
if errExport != nil {
187-
metric.Status.Ready = "False"
191+
metric.Status.Ready = v1beta1.StatusFalse
188192
l.Error(errExport, fmt.Sprintf("single metric '%s' failed to export, re-queued for execution in %v minutes\n", metric.Spec.Name, RequeueAfterError))
189193
} else {
190-
metric.Status.Ready = "True"
194+
metric.Status.Ready = v1beta1.StatusTrue
191195
}
192196

193197
/*
@@ -208,7 +212,7 @@ func (r *SingleMetricReconciler) Reconcile(ctx context.Context, req ctrl.Request
208212

209213
// Override Ready status if export failed
210214
if errExport != nil {
211-
metric.Status.Ready = "False"
215+
metric.Status.Ready = v1beta1.StatusFalse
212216
}
213217
metric.Status.Observation = v1beta1.MetricObservation{Timestamp: result.Observation.GetTimestamp(), LatestValue: result.Observation.GetValue()}
214218

0 commit comments

Comments
 (0)