`c3b4552`

actions/events: satisfy lifecycle lint (S41h)

Authored by mfwolffe <wolffemf@dukes.jmu.edu> yesterday

SHA: c3b4552d1c21a8b3cb697dc5bd6debe349440e6d
Parents: 06ca804
Tree: 38d6193

2 changed files

Status	File	+	-
M	`internal/actions/lifecycle/cancel.go`	2	3
M	`internal/web/handlers/api/runners.go`	4	3

internal/actions/lifecycle/cancel.gomodified


 		}
 	}()
 
-	run, err := q.GetWorkflowRunByID(ctx, tx, runID)
-	if err != nil {
+	if _, err := q.GetWorkflowRunByID(ctx, tx, runID); err != nil {
 		return CancelResult{}, err
 	}
 	changed, err := q.RequestWorkflowRunCancel(ctx, tx, runID)

 		if err != nil {
 			return CancelResult{}, err
 		}
-		run, err = q.GetWorkflowRunByID(ctx, tx, runID)
+		run, err := q.GetWorkflowRunByID(ctx, tx, runID)
 		if err != nil {
 			return CancelResult{}, err
 		}

internal/web/handlers/api/runners.gomodified

  		return actionsdb.ClaimQueuedWorkflowJobRow{}, nil, nil, false, nil
+ 	}
  	run, err := q.StartWorkflowRun(ctx, tx, job.RunID)
 -	if err == nil {
 +	switch {
 +	case err == nil:
  		if err := actionsevents.EmitRunTx(ctx, tx, run, actionsevents.ActionRunning); err != nil {
  			return actionsdb.ClaimQueuedWorkflowJobRow{}, nil, nil, false, err
+ 		}
 -	} else if errors.Is(err, pgx.ErrNoRows) {
 +	case errors.Is(err, pgx.ErrNoRows):
  		run, err = q.GetWorkflowRunByID(ctx, tx, job.RunID)
  		if err != nil {
  			return actionsdb.ClaimQueuedWorkflowJobRow{}, nil, nil, false, err
+ 		}
 -	} else {
 +	default:
  		return actionsdb.ClaimQueuedWorkflowJobRow{}, nil, nil, false, err
+ 	}
  	if err := actionsevents.EmitJobTx(ctx, tx, run, claimRowWorkflowJob(job), actionsevents.ActionRunning); err != nil {

`@@ -51,8 +51,7 @@` func CancelRun(ctx context.Context, deps Deps, runID int64, reason string) (Canc
51	51	}
52	52	}()
53	53
54		- run, err := q.GetWorkflowRunByID(ctx, tx, runID)
55		- if err != nil {
	54	+ if _, err := q.GetWorkflowRunByID(ctx, tx, runID); err != nil {
56	55	return CancelResult{}, err
57	56	}
58	57	changed, err := q.RequestWorkflowRunCancel(ctx, tx, runID)
`@@ -75,7 +74,7 @@` func CancelRun(ctx context.Context, deps Deps, runID int64, reason string) (Canc
75	74	if err != nil {
76	75	return CancelResult{}, err
77	76	}
78		- run, err = q.GetWorkflowRunByID(ctx, tx, runID)
	77	+ run, err := q.GetWorkflowRunByID(ctx, tx, runID)
79	78	if err != nil {
80	79	return CancelResult{}, err
81	80	}