fix(api): import a workflow containing an app without a repository linked (#4085)

fsamin · richardlt · commit 89fe68b00a64 · 2019-03-25T11:56:34.000+01:00
diff --git a/engine/api/workflow/dao_data_hook.go b/engine/api/workflow/dao_data_hook.go
@@ -42,7 +42,7 @@ func insertNodeHookData(db gorp.SqlExecutor, w *sdk.Workflow, n *sdk.Node) error
 
 		if model.Name == sdk.RepositoryWebHookModelName || model.Name == sdk.GitPollerModelName {
 			if n.Context.ApplicationID == 0 || w.Applications[n.Context.ApplicationID].RepositoryFullname == "" || w.Applications[n.Context.ApplicationID].VCSServer == "" {
-				return sdk.WrapError(sdk.ErrForbidden, "insertNodeHookData> Cannot create a git poller or repository webhook on an application without a repository")
+				return sdk.NewErrorFrom(sdk.ErrForbidden, "cannot create a git poller or repository webhook on an application without a repository")
 			}
 			h.Config["vcsServer"] = sdk.WorkflowNodeHookConfigValue{
 				Value:        w.Applications[n.Context.ApplicationID].VCSServer,

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func insertNodeHookData(db gorp.SqlExecutor, w sdk.Workflow, n sdk.Node) error`
`42`	`42`
`43`	`43`	`if model.Name == sdk.RepositoryWebHookModelName \|\| model.Name == sdk.GitPollerModelName {`
`44`	`44`	`if n.Context.ApplicationID == 0 \|\| w.Applications[n.Context.ApplicationID].RepositoryFullname == "" \|\| w.Applications[n.Context.ApplicationID].VCSServer == "" {`
`45`		`- return sdk.WrapError(sdk.ErrForbidden, "insertNodeHookData> Cannot create a git poller or repository webhook on an application without a repository")`
	`45`	`+ return sdk.NewErrorFrom(sdk.ErrForbidden, "cannot create a git poller or repository webhook on an application without a repository")`
`46`	`46`	`}`
`47`	`47`	`h.Config["vcsServer"] = sdk.WorkflowNodeHookConfigValue{`
`48`	`48`	`Value: w.Applications[n.Context.ApplicationID].VCSServer,`