Less panics, more validation errors for invalid flow defs

flows/definition/flow.go

@@ -311,12 +311,12 @@ var _ flows.Flow = (*flow)(nil)
 type flowEnvelope struct {
 	migrations.Header13
 
-	Language           i18n.Language   `json:"language" validate:"required,language"`
-	Type               flows.FlowType  `json:"type" validate:"required,flow_type"`
+	Language           i18n.Language   `json:"language"             validate:"required,language"`
+	Type               flows.FlowType  `json:"type"                 validate:"required,flow_type"`
 	Revision           int             `json:"revision"`
 	ExpireAfterMinutes int             `json:"expire_after_minutes"`
 	Localization       localization    `json:"localization"`
-	Nodes              []*node         `json:"nodes"`
+	Nodes              []*node         `json:"nodes"                validate:"dive,required"`
 	UI                 json.RawMessage `json:"_ui,omitempty"`
 }
 

flows/definition/flow_test.go

@@ -39,6 +39,18 @@ func TestBrokenFlows(t *testing.T) {
 		path string
 		err  string
 	}{
+		{
+			"null_node.json",
+			"field 'nodes[1]' is required",
+		},
+		{
+			"null_exit.json",
+			"unable to read node: field 'exits[1]' is required",
+		},
+		{
+			"null_action.json",
+			"unable to read action: field 'type' is required",
+		},
 		{
 			"exitless_node.json",
 			"unable to read node: field 'exits' must have a minimum of 1 items",

flows/definition/node.go

@@ -12,7 +12,6 @@ import (
 	"github.com/nyaruka/goflow/flows/inspect"
 	"github.com/nyaruka/goflow/flows/routers"
 	"github.com/nyaruka/goflow/utils"
-
 	"github.com/pkg/errors"
 )
 
@@ -143,9 +142,9 @@ func (n *node) EnumerateLocalizables(include func(uuids.UUID, string, []string,
 
 type nodeEnvelope struct {
 	UUID    flows.NodeUUID    `json:"uuid"               validate:"required,uuid4"`
-	Actions []json.RawMessage `json:"actions,omitempty"`
+	Actions []json.RawMessage `json:"actions,omitempty"  validate:"dive,required"`
 	Router  json.RawMessage   `json:"router,omitempty"`
-	Exits   []*exit           `json:"exits"              validate:"required,min=1"`
+	Exits   []*exit           `json:"exits"              validate:"required,min=1,dive,required"`
 }
 
 // UnmarshalJSON unmarshals a flow node from the given JSON

flows/definition/testdata/broken_flows/null_action.json

@@ -0,0 +1,31 @@
+{
+    "flows": [
+        {
+            "uuid": "76f0a02f-3b75-4b86-9064-e9195e1b3a02",
+            "name": "Test Flow",
+            "spec_version": "13.2.0",
+            "language": "eng",
+            "type": "messaging",
+            "nodes": [
+                {
+                    "uuid": "a58be63b-907d-4a1a-856b-0bb5579d7507",
+                    "actions": [
+                        {
+                            "uuid": "ad154980-7bf7-4ab8-8728-545fd6378912",
+                            "type": "send_msg",
+                            "text": "Hi there @contact.name"
+                        },
+                        null
+                    ],
+                    "exits": [
+                        {
+                            "uuid": "37d8813f-1402-4ad2-9cc2-e9054a96525b",
+                            "name": "Default",
+                            "destination_uuid": null
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

flows/definition/testdata/broken_flows/null_exit.json

@@ -0,0 +1,24 @@
+{
+    "flows": [
+        {
+            "uuid": "76f0a02f-3b75-4b86-9064-e9195e1b3a02",
+            "name": "Test Flow",
+            "spec_version": "13.2.0",
+            "language": "eng",
+            "type": "messaging",
+            "nodes": [
+                {
+                    "uuid": "a58be63b-907d-4a1a-856b-0bb5579d7507",
+                    "exits": [
+                        {
+                            "uuid": "37d8813f-1402-4ad2-9cc2-e9054a96525b",
+                            "name": "Default",
+                            "destination_uuid": null
+                        },
+                        null
+                    ]
+                }
+            ]
+        }
+    ]
+}

flows/definition/testdata/broken_flows/null_node.json

@@ -0,0 +1,24 @@
+{
+    "flows": [
+        {
+            "uuid": "76f0a02f-3b75-4b86-9064-e9195e1b3a02",
+            "name": "Test Flow",
+            "spec_version": "13.2.0",
+            "language": "eng",
+            "type": "messaging",
+            "nodes": [
+                {
+                    "uuid": "a58be63b-907d-4a1a-856b-0bb5579d7507",
+                    "exits": [
+                        {
+                            "uuid": "37d8813f-1402-4ad2-9cc2-e9054a96525b",
+                            "name": "Default",
+                            "destination_uuid": null
+                        }
+                    ]
+                },
+                null
+            ]
+        }
+    ]
+}