Skip to content
This repository was archived by the owner on Oct 14, 2020. It is now read-only.

Commit dd3eb4a

Browse files
committed
Extract repeated error handling
1 parent c61aafe commit dd3eb4a

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

operator/controllers/execution/scan_controller.go

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,38 +87,26 @@ func (r *ScanReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
8787
if state == "" {
8888
state = "Init"
8989
}
90+
9091
log.V(5).Info("Scan Found", "Type", scan.Spec.ScanType, "State", state)
92+
93+
var err error
9194
switch state {
9295
case "Init":
93-
err := r.startScan(&scan)
94-
if err != nil {
95-
return ctrl.Result{}, err
96-
}
96+
err = r.startScan(&scan)
9797
case "Scanning":
98-
err := r.checkIfScanIsCompleted(&scan)
99-
if err != nil {
100-
return ctrl.Result{}, err
101-
}
98+
err = r.checkIfScanIsCompleted(&scan)
10299
case "ScanCompleted":
103-
err := r.startParser(&scan)
104-
if err != nil {
105-
return ctrl.Result{}, err
106-
}
100+
err = r.startParser(&scan)
107101
case "Parsing":
108-
err := r.checkIfParsingIsCompleted(&scan)
109-
if err != nil {
110-
return ctrl.Result{}, err
111-
}
102+
err = r.checkIfParsingIsCompleted(&scan)
112103
case "ParseCompleted":
113-
err := r.startPersistenceProvider(&scan)
114-
if err != nil {
115-
return ctrl.Result{}, err
116-
}
104+
err = r.startPersistenceProvider(&scan)
117105
case "Persisting":
118-
err := r.checkIfPersistingIsCompleted(&scan)
119-
if err != nil {
120-
return ctrl.Result{}, err
121-
}
106+
err = r.checkIfPersistingIsCompleted(&scan)
107+
}
108+
if err != nil {
109+
return ctrl.Result{}, err
122110
}
123111

124112
return ctrl.Result{}, nil

0 commit comments

Comments
 (0)