Add migrations to scans which had already finished.

Jop Zitman · Jop Zitman · commit 71293e1801e1 · 2021-11-01T14:06:48.000+01:00
Unfortunately can't set the field to `nil` as Kubernetes complains about missing fields priority and type (on non existing elements...)

Signed-off-by: Jop Zitman &lt;jop.zitman@secura.com&gt;
diff --git a/operator/controllers/execution/scans/hook_reconciler.go b/operator/controllers/execution/scans/hook_reconciler.go
@@ -81,6 +81,9 @@ func (r *ScanReconciler) migrateHookStatus(scan *executionv1.Scan) error {
 				// Had already started ReadOnly hooks and should now check status.
 				// No status for ReadOnly in old CRD, so mark everything as InProgress and let processInProgressHook update it later.
 				hookStatus.State = executionv1.InProgress
+			} else if scan.Status.State == "Done" {
+				// Had completely finished
+				hookStatus.State = executionv1.Completed
 			}
 
 			r.Log.Info("Retrieved new ReadOnly hook Status", "New", hookStatus)
@@ -90,7 +93,9 @@ func (r *ScanReconciler) migrateHookStatus(scan *executionv1.Scan) error {
 	}
 
 	scan.Status.OrderedHookStatuses = util.OrderHookStatusesInsideAPrioClass(append(readOnlyHooks, strSlice...))
-	scan.Status.State = "HookProcessing"
+	if scan.Status.State != "Done" {
+		scan.Status.State = "HookProcessing"
+	}
 
 	if err := r.Status().Update(ctx, scan); err != nil {
 		r.Log.Error(err, "unable to update Scan status")
diff --git a/operator/controllers/execution/scans/scan_controller.go b/operator/controllers/execution/scans/scan_controller.go
@@ -81,6 +81,12 @@ func (r *ScanReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 
 	// Handle Finalizer if the scan is getting deleted
 	if !scan.ObjectMeta.DeletionTimestamp.IsZero() {
+		// Check if this Scan has not yet been converted to new CRD
+		if scan.Status.OrderedHookStatuses == nil && scan.Status.ReadAndWriteHookStatus != nil && scan.Status.State == "Done" {
+			if err := r.migrateHookStatus(&scan); err != nil {
+				return ctrl.Result{}, err
+			}
+		}
 		if err := r.handleFinalizer(&scan); err != nil {
 			r.Log.Error(err, "Failed to run Scan Finalizer")
 			return ctrl.Result{}, err
