fix: go-staticcheck: break loop were not positionned at the correct l…

…evel (#301) * fix: go-staticcheck: break loop were not positionned at the correct level * fix: bump dependencies for Dockerfile Signed-off-by: Romain Beuque <[email protected]>
ovh · Dec 21, 2021 · 791d927 · 791d927
1 parent c2d696f
commit 791d927
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:latest AS js-builder
+FROM node:16 AS js-builder
 
 RUN npm install -g @angular/cli
 COPY ./ui /home/node/ui
@@ -11,7 +11,7 @@ RUN BASEHREF=___UTASK_DASHBOARD_BASEHREF___ PREFIX_API_BASE_URL=___UTASK_DASHBOA
 WORKDIR /home/node/ui/editor
 RUN BASEHREF=___UTASK_EDITOR_BASEHREF___ SENTRY_DSN=___UTASK_DASHBOARD_SENTRY_DSN___ make build-prod
 
-FROM golang:1.16-buster
+FROM golang:1.17-buster
 
 COPY .  /go/src/github.com/ovh/utask
 WORKDIR /go/src/github.com/ovh/utask

diff --git a/engine/engine.go b/engine/engine.go
@@ -385,6 +385,7 @@ func resolve(dbp zesty.DBProvider, res *resolution.Resolution, t *task.Task, sm
 
 	expectedMessages := runAvailableSteps(dbp, map[string]bool{}, res, t, stepChan, executedSteps, []string{}, wg, debugLogger)
 
+forLoop:
 	for expectedMessages > 0 {
 		debugLogger.Debugf("Engine: resolve() %s loop, %d expected steps", res.PublicID, expectedMessages)
 		select {
@@ -462,7 +463,7 @@ func resolve(dbp zesty.DBProvider, res *resolution.Resolution, t *task.Task, sm
 		case <-gracePeriodEnd:
 			// shutting down, time is up: exit the loop no matter how many steps might be pending
 			expectedMessages = 0
-			break
+			break forLoop
 		}
 	}