#2293 Deletes a scan if TTLSecondsAfterFinished option was set

Reet00 · J12934 · commit 2ebb2ef2a546 · 2024-08-30T14:25:58.000+02:00
checkIfTTLSecondsAfterFinishedisCompleted checks if the option was
set and  if the time has exceeded

Signed-off-by: Samreet Singh &lt;samreet.singh@iteratec.com&gt;
diff --git a/operator/controllers/execution/scans/scan_controller.go b/operator/controllers/execution/scans/scan_controller.go
@@ -107,6 +107,14 @@ func (r *ScanReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		err = r.setHookStatus(&scan)
 	case executionv1.ScanStateHookProcessing:
 		err = r.executeHooks(&scan)
+	case executionv1.ScanStateErrored:
+		if r.checkIfTTLSecondsAfterFinishedisCompleted(&scan) {
+			err = r.deleteScan(&scan)
+		}
+	case executionv1.ScanStateDone:
+		if r.checkIfTTLSecondsAfterFinishedisCompleted(&scan) {
+			err = r.deleteScan(&scan)
+		}
 	case executionv1.ScanStateReadAndWriteHookProcessing:
 		fallthrough
 	case executionv1.ScanStateReadAndWriteHookCompleted:
diff --git a/operator/controllers/execution/scans/scan_reconciler.go b/operator/controllers/execution/scans/scan_reconciler.go
@@ -20,6 +20,7 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	resource "k8s.io/apimachinery/pkg/api/resource"
 
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -416,3 +417,34 @@ func (r *ScanReconciler) constructJobForScan(scan *executionv1.Scan, scanTypeSpe
 
 	return job, nil
 }
+
+func (r *ScanReconciler) checkIfTTLSecondsAfterFinishedisCompleted(scan *executionv1.Scan) bool {
+	if scan.Spec.TTLSecondsAfterFinished == nil {
+		return false
+	}
+	interval := time.Duration(*scan.Spec.TTLSecondsAfterFinished) * time.Second
+	r.Log.Info("TTLSecondsAfterFinished interval", "interval:", interval)
+	if scan.Status.FinishedAt != nil {
+		scanTimeout := scan.Status.FinishedAt
+		r.Log.Info("TTLSecondsAfterFinished scanTimeout", "scanTimeout", scanTimeout)
+		now := time.Now()
+		if now.After(scanTimeout.Add(interval)) {
+			return true
+		}
+	}
+	return false
+}
+
+func (r *ScanReconciler) deleteScan(scan *executionv1.Scan) error {
+	ctx := context.Background()
+	err := r.Client.Delete(ctx, scan)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			r.Log.V(1).Info("Scan was already deleted, nothing to do")
+		} else {
+			r.Log.Error(err, "Unexpected error while trying to delete Scan")
+			return err
+		}
+	}
+	return nil
+}
