fix(sdk): ignore invalid notif type (#6153)

* fix(sdk): ignore invalid notif type Signed-off-by: Yvonnick Esnault <[email protected]>
ovh · Apr 25, 2022 · 156c3cf · 156c3cf
1 parent 607c015
commit 156c3cf
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/engine/api/workflow/workflow_parser.go b/engine/api/workflow/workflow_parser.go
@@ -32,7 +32,7 @@ func Parse(ctx context.Context, proj sdk.Project, oldW *sdk.Workflow, ew exporte
 	log.Debug(ctx, "Parse>> Workflow: %+v", ew)
 
 	//Parse workflow
-	w, errW := exportentities.ParseWorkflow(ew)
+	w, errW := exportentities.ParseWorkflow(ctx, ew)
 	if errW != nil {
 		return nil, sdk.NewError(sdk.ErrWrongRequest, errW)
 	}

diff --git a/sdk/exportentities/v1/workflow_test.go b/sdk/exportentities/v1/workflow_test.go
@@ -1,6 +1,7 @@
 package v1_test
 
 import (
+	"context"
 	"sort"
 	"strings"
 	"testing"
@@ -812,7 +813,7 @@ func TestWorkflow_GetWorkflow(t *testing.T) {
 				OneAtATime:             tt.fields.OneAtATime,
 			}
 
-			got, err := exportentities.ParseWorkflow(w)
+			got, err := exportentities.ParseWorkflow(context.TODO(), w)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Workflow.GetWorkflow() error = %v, wantErr %v", err, tt.wantErr)
 				return

diff --git a/sdk/exportentities/v2/workflow.go b/sdk/exportentities/v2/workflow.go
@@ -402,7 +402,7 @@ func (w Workflow) GetVersion() string {
 }
 
 // GetWorkflow returns a fresh sdk.Workflow
-func (w Workflow) GetWorkflow() (*sdk.Workflow, error) {
+func (w Workflow) GetWorkflow(ctx context.Context) (*sdk.Workflow, error) {
 	var wf = new(sdk.Workflow)
 	wf.Name = w.Name
 	wf.Description = w.Description
@@ -489,7 +489,7 @@ func (w Workflow) GetWorkflow() (*sdk.Workflow, error) {
 	}
 
 	//Compute notifications
-	if err := w.processNotifications(wf); err != nil {
+	if err := w.processNotifications(ctx, wf); err != nil {
 		return nil, err
 	}
 

diff --git a/sdk/exportentities/v2/workflow_notif_test.go b/sdk/exportentities/v2/workflow_notif_test.go
@@ -250,7 +250,7 @@ notifications:
 				t.Error("Unmarshal should return an error but it doesn't")
 				return
 			}
-			w, err := exportentities.ParseWorkflow(yamlWorkflow)
+			w, err := exportentities.ParseWorkflow(context.TODO(), yamlWorkflow)
 			if err != nil {
 				if !tst.wantErr {
 					t.Error("GetWorkflow raised an error", err)

diff --git a/sdk/exportentities/v2/workflow_notification.go b/sdk/exportentities/v2/workflow_notification.go
@@ -186,7 +186,7 @@ func ProcessNotificationValues(notif NotificationEntry) (sdk.WorkflowNotificatio
 	return n, nil
 }
 
-func (w *Workflow) processNotifications(wrkflw *sdk.Workflow) error {
+func (w *Workflow) processNotifications(ctx context.Context, wrkflw *sdk.Workflow) error {
 	for _, notif := range w.Notifications {
 		if notif.Type == sdk.EventsNotification {
 			if notif.Integration == "" {
@@ -199,7 +199,8 @@ func (w *Workflow) processNotifications(wrkflw *sdk.Workflow) error {
 		}
 		n, err := ProcessNotificationValues(notif)
 		if err != nil {
-			return sdk.WrapError(err, "unable to process notification")
+			log.Error(ctx, "unable to process notification err:", err)
+			continue
 		}
 		n.SourceNodeRefs = notif.Pipelines
 		wrkflw.Notifications = append(wrkflw.Notifications, n)

diff --git a/sdk/exportentities/v2/workflow_test.go b/sdk/exportentities/v2/workflow_test.go
@@ -642,7 +642,7 @@ func TestWorkflow_GetWorkflow(t *testing.T) {
 				HistoryLength:   &tt.fields.HistoryLength,
 				RetentionPolicy: &tt.fields.RetentionPolicy,
 			}
-			got, err := exportentities.ParseWorkflow(w)
+			got, err := exportentities.ParseWorkflow(context.TODO(), w)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Workflow.GetWorkflow() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -1077,7 +1077,7 @@ workflow:
 				t.Error("Unmarshal should return an error but it doesn't")
 				return
 			}
-			w, err := exportentities.ParseWorkflow(yamlWorkflow)
+			w, err := exportentities.ParseWorkflow(context.TODO(), yamlWorkflow)
 			if err != nil {
 				if !tst.wantErr {
 					t.Error("GetWorkflow raised an error", err)
@@ -1159,7 +1159,7 @@ notifications:
 	require.NoError(t, err)
 
 	t.Logf("yamlWorkflow> %+v", yamlWorkflow)
-	_, err = exportentities.ParseWorkflow(yamlWorkflow)
+	_, err = exportentities.ParseWorkflow(context.TODO(), yamlWorkflow)
 	require.Error(t, err)
 	t.Log(err)
 

diff --git a/sdk/exportentities/workflow.go b/sdk/exportentities/workflow.go
@@ -71,12 +71,12 @@ func UnmarshalWorkflow(body []byte, format Format) (Workflow, error) {
 	return nil, sdk.WrapError(sdk.ErrWrongRequest, "invalid workflow version: %s", workflowVersion.Version)
 }
 
-func ParseWorkflow(exportWorkflow Workflow) (*sdk.Workflow, error) {
+func ParseWorkflow(ctx context.Context, exportWorkflow Workflow) (*sdk.Workflow, error) {
 	switch exportWorkflow.GetVersion() {
 	case WorkflowVersion2:
 		workflowV2, ok := exportWorkflow.(v2.Workflow)
 		if ok {
-			return workflowV2.GetWorkflow()
+			return workflowV2.GetWorkflow(ctx)
 		}
 	case WorkflowVersion1:
 		workflowV1, ok := exportWorkflow.(v1.Workflow)