fix(api): missing group for template when loaded from audit (#5273)

ovh · Jun 23, 2020 · 511cb03 · 511cb03
1 parent c51b3b3
commit 511cb03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/engine/api/workflow/dao.go b/engine/api/workflow/dao.go
@@ -986,7 +986,7 @@ func checkApplication(db gorp.SqlExecutor, proj sdk.Project, w *sdk.Workflow, n
 		appDB, err := application.LoadByName(db, proj.Key, n.Context.ApplicationName, application.LoadOptions.WithDeploymentStrategies, application.LoadOptions.WithVariables)
 		if err != nil {
 			if sdk.ErrorIs(err, sdk.ErrNotFound) {
-				return sdk.WithData(sdk.ErrNotFound, n.Context.ApplicationName)
+				return sdk.NewErrorFrom(sdk.WithData(sdk.ErrNotFound, n.Context.ApplicationName), "cannot find application with name: %s", n.Context.ApplicationName)
 			}
 			return sdk.WrapError(err, "unable to load application %s", n.Context.ApplicationName)
 		}

diff --git a/engine/api/workflowtemplate/instance.go b/engine/api/workflowtemplate/instance.go
@@ -149,7 +149,7 @@ func CheckAndExecuteTemplate(ctx context.Context, db *gorp.DbMap, consumer sdk.A
 		return allMsgs, nil, sdk.NewErrorFrom(sdk.ErrWrongRequest, "could not find given workflow template")
 	}
 
-	wt, err := LoadBySlugAndGroupID(ctx, db, templateSlug, grp.ID, LoadOptions.Default)
+	wt, err := LoadBySlugAndGroupID(ctx, db, templateSlug, grp.ID)
 	if err != nil {
 		return allMsgs, nil, sdk.NewErrorFrom(err, "could not find a template with slug %s in group %s", templateSlug, grp.Name)
 	}
@@ -160,7 +160,9 @@ func CheckAndExecuteTemplate(ctx context.Context, db *gorp.DbMap, consumer sdk.A
 		}
 		wt = &wta.DataAfter
 	}
-
+	if err := LoadOptions.Default(ctx, db, wt); err != nil {
+		return allMsgs, nil, err
+	}
 	allMsgs = append(allMsgs, sdk.NewMessage(sdk.MsgWorkflowGeneratedFromTemplateVersion, wt.PathWithVersion()))
 
 	req := sdk.WorkflowTemplateRequest{