Merge pull request rapidpro#241 from nyaruka/latest_goflow

Update to goflow v0.72.0
Ilhasoft · Feb 14, 2020 · bd08d4f · bd08d4f
2 parents 5c8c4b3 + 9dbbd44
commit bd08d4f
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 160 deletions.
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/nyaruka/ezconf v0.2.1
 	github.com/nyaruka/gocommon v1.2.0
-	github.com/nyaruka/goflow v0.71.2
+	github.com/nyaruka/goflow v0.72.0
 	github.com/nyaruka/librato v1.0.0
 	github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d
 	github.com/nyaruka/null v1.2.0

diff --git a/go.sum b/go.sum
@@ -77,8 +77,8 @@ github.com/nyaruka/ezconf v0.2.1 h1:TDXWoqjqYya1uhou1mAJZg7rgFYL98EB0Tb3+BWtUh0=
 github.com/nyaruka/ezconf v0.2.1/go.mod h1:ey182kYkw2MIi4XiWe1FR/mzI33WCmTWuceDYYxgnQw=
 github.com/nyaruka/gocommon v1.2.0 h1:gCmVCXYZFwKDMqQj8R1jNlK+7a06khKFq3zX8fBBbzw=
 github.com/nyaruka/gocommon v1.2.0/go.mod h1:9Y21Fd6iZXDLHWTRiZAc6b4LQSCi6HEEQK4SB45Yav4=
-github.com/nyaruka/goflow v0.71.2 h1:m9E5WHCXjVlkovSRyxDVT/2t0wsbkroHiQijAWmTKLM=
-github.com/nyaruka/goflow v0.71.2/go.mod h1:BqoPlvow3KH9fg08Qj1y821cw60CZmNqySZFJTl79SE=
+github.com/nyaruka/goflow v0.72.0 h1:VC2wGOJXCETvQsOkeZRFZ8/YlHSMjKrXYqkE7O9WbgY=
+github.com/nyaruka/goflow v0.72.0/go.mod h1:BqoPlvow3KH9fg08Qj1y821cw60CZmNqySZFJTl79SE=
 github.com/nyaruka/librato v1.0.0 h1:Vznj9WCeC1yZXbBYyYp40KnbmXLbEkjKmHesV/v2SR0=
 github.com/nyaruka/librato v1.0.0/go.mod h1:pkRNLFhFurOz0QqBz6/DuTFhHHxAubWxs4Jx+J7yUgg=
 github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d h1:hyp9u36KIwbTCo2JAJ+TuJcJBc+UZzEig7RI/S5Dvkc=

diff --git a/web/flow/flow_test.go b/web/flow/flow_test.go
@@ -19,8 +19,6 @@ func TestServer(t *testing.T) {
 		{URL: "/mr/flow/inspect", Method: "POST", Files: "inspect_invalid_legacy", Status: 200},
 		{URL: "/mr/flow/inspect", Method: "POST", Files: "inspect_valid", Status: 200},
 		{URL: "/mr/flow/inspect", Method: "POST", Files: "inspect_invalid", Status: 422},
-		{URL: "/mr/flow/inspect", Method: "POST", Files: "inspect_valid_without_org", Status: 200},
-		{URL: "/mr/flow/inspect", Method: "POST", Files: "inspect_invalid_without_org", Status: 200},
 		{URL: "/mr/flow/inspect", Method: "POST", Files: "inspect_legacy_single_msg", Status: 200},
 
 		{URL: "/mr/flow/clone", Method: "GET", Status: 405, Response: `{"error": "illegal method: GET"}`},

diff --git a/web/flow/testdata/inspect_invalid_legacy.response.json b/web/flow/testdata/inspect_invalid_legacy.response.json
@@ -4,22 +4,36 @@
       "key": "birthdate",
       "name": "",
       "type": "field",
-      "missing": true,
-      "nodes": {
-        "6fde1a09-3997-47dd-aff0-92e8aff3a642": [
-          "05a5cb7c-bb8a-4ad9-af90-ef9887cc370e"
-        ]
-      }
+      "missing": true
     },
     {
       "uuid": "1465eb20-066d-4933-a8b4-62fe7b19fd39",
       "name": "I Don't Exist",
       "type": "group",
-      "missing": true,
-      "nodes": {
-        "6fde1a09-3997-47dd-aff0-92e8aff3a642": [
-          "23337aa9-0d3d-4e70-876e-9a2633d1e5e4"
-        ]
+      "missing": true
+    }
+  ],
+  "issues": [
+    {
+      "type": "missing_dependency",
+      "node_uuid": "6fde1a09-3997-47dd-aff0-92e8aff3a642",
+      "action_uuid": "05a5cb7c-bb8a-4ad9-af90-ef9887cc370e",
+      "description": "missing field dependency 'birthdate'",
+      "dependency": {
+        "key": "birthdate",
+        "name": "",
+        "type": "field"
+      }
+    },
+    {
+      "type": "missing_dependency",
+      "node_uuid": "6fde1a09-3997-47dd-aff0-92e8aff3a642",
+      "action_uuid": "23337aa9-0d3d-4e70-876e-9a2633d1e5e4",
+      "description": "missing group dependency '1465eb20-066d-4933-a8b4-62fe7b19fd39'",
+      "dependency": {
+        "uuid": "1465eb20-066d-4933-a8b4-62fe7b19fd39",
+        "name": "I Don't Exist",
+        "type": "group"
       }
     }
   ],

diff --git a/web/flow/testdata/inspect_invalid_without_org.json b/web/flow/testdata/inspect_invalid_without_org.json
diff --git a/web/flow/testdata/inspect_invalid_without_org.response.json b/web/flow/testdata/inspect_invalid_without_org.response.json
diff --git a/web/flow/testdata/inspect_legacy_single_msg.response.json b/web/flow/testdata/inspect_legacy_single_msg.response.json
@@ -1,5 +1,6 @@
 {
   "dependencies": [],
+  "issues": [],
   "results": [],
   "waiting_exits": [],
   "parent_refs": []

diff --git a/web/flow/testdata/inspect_valid.response.json b/web/flow/testdata/inspect_valid.response.json
@@ -3,14 +3,10 @@
     {
       "uuid": "5e9d8fab-5e7e-4f51-b533-261af5dea70d",
       "name": "Testers",
-      "type": "group",
-      "nodes": {
-        "6fde1a09-3997-47dd-aff0-92e8aff3a642": [
-          "23337aa9-0d3d-4e70-876e-9a2633d1e5e4"
-        ]
-      }
+      "type": "group"
     }
   ],
+  "issues": [],
   "results": [
     {
       "key": "answer",

diff --git a/web/flow/testdata/inspect_valid_legacy.response.json b/web/flow/testdata/inspect_valid_legacy.response.json
@@ -3,14 +3,10 @@
     {
       "uuid": "5e9d8fab-5e7e-4f51-b533-261af5dea70d",
       "name": "Testers",
-      "type": "group",
-      "nodes": {
-        "6fde1a09-3997-47dd-aff0-92e8aff3a642": [
-          "23337aa9-0d3d-4e70-876e-9a2633d1e5e4"
-        ]
-      }
+      "type": "group"
     }
   ],
+  "issues": [],
   "results": [],
   "waiting_exits": [],
   "parent_refs": []

diff --git a/web/flow/testdata/inspect_valid_without_org.json b/web/flow/testdata/inspect_valid_without_org.json
diff --git a/web/flow/testdata/inspect_valid_without_org.response.json b/web/flow/testdata/inspect_valid_without_org.response.json