#2293 Changed definition of FinishedAt to include errored scans

Reet00 · J12934 · commit 5dc41a4d5322 · 2024-08-30T14:25:58.000+02:00
to be able to use this to determine the deletion time for errored scans

Signed-off-by: Samreet Singh &lt;samreet.singh@iteratec.com&gt;
diff --git a/operator/apis/execution/v1/scan_types.go b/operator/apis/execution/v1/scan_types.go
@@ -170,7 +170,7 @@ const (
 type ScanStatus struct {
 	State ScanState `json:"state,omitempty"`
 
-	// FinishedAt contains the time where the scan (including parser & hooks) has been marked as "Done"
+	// FinishedAt contains the time where the scan (including parser & hooks) has been marked as "Done", or has errored
 	FinishedAt       *metav1.Time `json:"finishedAt,omitempty"`
 	ErrorDescription string       `json:"errorDescription,omitempty"`
 
diff --git a/operator/controllers/execution/scans/scan_controller.go b/operator/controllers/execution/scans/scan_controller.go
@@ -256,10 +256,12 @@ func updateScanStateMetrics(scan executionv1.Scan) {
 
 func (r *ScanReconciler) updateScanStatus(ctx context.Context, scan *executionv1.Scan) error {
 	updateScanStateMetrics(*scan)
-
-	if scan.Status.FinishedAt == nil {
-		scan.Status.FinishedAt = &metav1.Time{Time: time.Now()}
+	if scan.Status.State == executionv1.ScanStateDone || scan.Status.State == executionv1.ScanStateErrored {
+		if scan.Status.FinishedAt == nil {
+			scan.Status.FinishedAt = &metav1.Time{Time: time.Now()}
+		}
 	}
+
 	if err := r.Status().Update(ctx, scan); err != nil {
 		r.Log.Error(err, "unable to update Scan status")
 		return err
