fix(api): reload old workflow just before update it (#5037)

Author: yesnault

cli/cdsctl/workflow_run.go

@@ -121,7 +121,7 @@ func workflowRunManualRun(v cli.Values) error {
 		}
 
 		// Check if we are on the same repository and if we have a git.branch in the default payload
-		if wf.WorkflowData != nil && wf.WorkflowData.Node.Context != nil && wf.WorkflowData.Node.Context.ApplicationID != 0 {
+		if wf.WorkflowData.Node.Context != nil && wf.WorkflowData.Node.Context.ApplicationID != 0 {
 			app := wf.GetApplication(wf.WorkflowData.Node.Context.ApplicationID)
 			if remoteURL != "" && strings.Contains(remoteURL, app.RepositoryFullname) && currentBranch != "" {
 				defaultPayload, err := wf.WorkflowData.Node.Context.DefaultPayloadToMap()

engine/api/application/dao_test.go

@@ -182,7 +182,7 @@ func TestLoadByWorkflowID(t *testing.T) {
 		Name:       "test_1",
 		ProjectID:  proj.ID,
 		ProjectKey: proj.Key,
-		WorkflowData: &sdk.WorkflowData{
+		WorkflowData: sdk.WorkflowData{
 			Node: sdk.Node{
 				Type: sdk.NodeTypePipeline,
 				Context: &sdk.NodeContext{

engine/api/ascode_test.go

@@ -356,7 +356,7 @@ vcs_ssh_key: proj-blabla
 		Name:       sdk.RandomString(10),
 		ProjectID:  p.ID,
 		ProjectKey: p.Key,
-		WorkflowData: &sdk.WorkflowData{
+		WorkflowData: sdk.WorkflowData{
 			Node: sdk.Node{
 				Name: "root",
 				Type: sdk.NodeTypePipeline,

engine/api/pipeline/pipeline_test.go

@@ -167,7 +167,7 @@ func TestLoadByWorkflowID(t *testing.T) {
 		Name:       "test_1",
 		ProjectID:  proj.ID,
 		ProjectKey: proj.Key,
-		WorkflowData: &sdk.WorkflowData{
+		WorkflowData: sdk.WorkflowData{
 			Node: sdk.Node{
 				Type: sdk.NodeTypePipeline,
 				Context: &sdk.NodeContext{

engine/api/project_group_test.go

@@ -30,7 +30,7 @@ func Test_ProjectPerms(t *testing.T) {
 
 	newWf := sdk.Workflow{
 		Name: sdk.RandomString(10),
-		WorkflowData: &sdk.WorkflowData{
+		WorkflowData: sdk.WorkflowData{
 			Node: sdk.Node{
 				Name: "root",
 				Type: sdk.NodeTypePipeline,

engine/api/repositories_manager.go

@@ -557,6 +557,7 @@ func (api *API) attachRepositoriesManagerHandler() service.Handler {
 					return err
 				}
 
+				// second load for publish the event below
 				wfOld, err := workflow.LoadByID(ctx, db, api.Cache, *proj, wf.ID, workflow.LoadOptions{})
 				if err != nil {
 					return err
@@ -585,7 +586,7 @@ func (api *API) attachRepositoriesManagerHandler() service.Handler {
 
 				wfDB.WorkflowData.Node.Context.DefaultPayload = defaultPayload
 
-				if err := workflow.Update(ctx, db, api.Cache, *proj, wfDB, workflow.UpdateOptions{DisableHookManagement: true, OldWorkflow: wfOld}); err != nil {
+				if err := workflow.Update(ctx, db, api.Cache, *proj, wfDB, workflow.UpdateOptions{DisableHookManagement: true}); err != nil {
 					return sdk.WrapError(err, "cannot update node context %d", wf.WorkflowData.Node.Context.ID)
 				}
 

engine/api/repositories_manager_test.go

@@ -139,6 +139,8 @@ func TestAPI_detachRepositoriesManagerHandler(t *testing.T) {
 				if err := enc.Encode(pr); err != nil {
 					return writeError(w, err)
 				}
+			case "/vcs/github/repos/sguiheux/demo/hooks?url=http%3A%2F%2Flolcat.host&id=666":
+				// do nothing
 			default:
 				t.Fatalf("UNKNOWN ROUTE: %s", r.URL.String())
 			}
@@ -194,7 +196,7 @@ vcs_ssh_key: proj-blabla
 		Name:       "test_1",
 		ProjectID:  proj.ID,
 		ProjectKey: proj.Key,
-		WorkflowData: &sdk.WorkflowData{
+		WorkflowData: sdk.WorkflowData{
 			Node: sdk.Node{
 				Name: "node1",
 				Ref:  "node1",

engine/api/test/assets/assets.go

@@ -534,7 +534,7 @@ func InsertTestWorkflow(t *testing.T, db gorp.SqlExecutor, store cache.Store, pr
 		Name:       name,
 		ProjectID:  proj.ID,
 		ProjectKey: proj.Key,
-		WorkflowData: &sdk.WorkflowData{
+		WorkflowData: sdk.WorkflowData{
 			Node: sdk.Node{
 				Name: "node1",
 				Ref:  "node1",

engine/api/worker_model_test.go

@@ -253,7 +253,7 @@ func Test_WorkerModelUsage(t *testing.T) {
 		Name:       "workflow1",
 		ProjectID:  proj.ID,
 		ProjectKey: proj.Key,
-		WorkflowData: &sdk.WorkflowData{
+		WorkflowData: sdk.WorkflowData{
 			Node: sdk.Node{
 				Name: "root",
 				Context: &sdk.NodeContext{

engine/api/workflow.go

@@ -368,10 +368,6 @@ func (api *API) postWorkflowHandler() service.Handler {
 			return err
 		}
 
-		if data.WorkflowData == nil {
-			return sdk.WrapError(sdk.ErrWrongRequest, "no node found")
-		}
-
 		if err := workflow.RenameNode(ctx, api.mustDB(), &data); err != nil {
 			return err
 		}
@@ -457,7 +453,7 @@ func (api *API) putWorkflowHandler() service.Handler {
 		}
 		defer tx.Rollback() // nolint
 
-		if err := workflow.Update(ctx, tx, api.Cache, *p, &wf, workflow.UpdateOptions{OldWorkflow: oldW}); err != nil {
+		if err := workflow.Update(ctx, tx, api.Cache, *p, &wf, workflow.UpdateOptions{}); err != nil {
 			return sdk.WrapError(err, "cannot update workflow")
 		}