fix(api): check err on as code (#3375)

ovh · Sep 28, 2018 · 924e808 · 924e808
1 parent e3b2366
commit 924e808
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/engine/api/workflow/repository.go b/engine/api/workflow/repository.go
@@ -65,12 +65,7 @@ func CreateFromRepository(ctx context.Context, db *gorp.DbMap, store cache.Store
 	if opts.Hook != nil {
 		uuid = opts.Hook.WorkflowNodeHookUUID
 	}
-	allMsg, errE := extractWorkflow(ctx, db, store, p, w, ope, u, decryptFunc, uuid)
-	if errE != nil {
-		return nil, sdk.WrapError(err, "CreateFromRepository> Unable to extract workflow")
-	}
-
-	return allMsg, nil
+	return extractWorkflow(ctx, db, store, p, w, ope, u, decryptFunc, uuid)
 }
 
 func extractWorkflow(ctx context.Context, db *gorp.DbMap, store cache.Store, p *sdk.Project, w *sdk.Workflow, ope sdk.Operation, u *sdk.User, decryptFunc keys.DecryptFunc, hookUUID string) ([]sdk.Message, error) {

diff --git a/engine/api/workflow_run.go b/engine/api/workflow_run.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -694,7 +695,11 @@ func (api *API) postWorkflowRunHandler() service.Handler {
 				var errCreate error
 				asCodeInfosMsg, errCreate = workflow.CreateFromRepository(ctx, api.mustDB(), api.Cache, proj, wf, *opts, u, project.DecryptWithBuiltinKey)
 				if errCreate != nil {
-					return sdk.WrapError(errCreate, "postWorkflowRunHandler> Unable to get workflow from repository")
+					var msgListString string
+					if len(asCodeInfosMsg) > 0 {
+						msgListString = strings.Join(translate(r, asCodeInfosMsg), " ")
+					}
+					return sdk.WrapError(errCreate, "postWorkflowRunHandler> Unable to get workflow from repository.%s", msgListString)
 				}
 			} else {
 				var errl error